don't include proto.h during autoconf tests since it doesn't exist yet; fixed getsmbp...

diff --git a/source/configure.in b/source/configure.in
index 1bc23cf74f400c4ae49477c03daa3b922d07fe58..e16836dd830f0f6aa41c7d92f26809a70b9cb0af 100644 (file)
--- a/source/configure.in
+++ b/source/configure.in
@@ -1683,6 +1683,7 @@ SAVE_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/popt  -I${srcdir-.}/smbwrapper"
 AC_TRY_COMPILE([
 #define REPLACE_GETPASS 1
+#define NO_PROTO_H 1
 #define NO_CONFIG_H 1
 #define main dont_declare_main
 #include "${srcdir-.}/lib/getsmbpass.c"

diff --git a/source/include/includes.h b/source/include/includes.h
index 09c64d896d5c0722f457c4be63f9f05ca1636854..e8e0751cab25e3d483e6ec0eda3f8c627b4a886c 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -855,7 +855,9 @@ struct functable {
 struct printjob;
 
 /***** automatically generated prototypes *****/
+#ifndef NO_PROTO_H
 #include "proto.h"
+#endif
 
 /* String routines */