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 b55a2b185e11cc0e848f06c87346b46b02613364..67cd4cbab8437dd77d6194abeebed42ac91e6303 100644 (file)
--- a/source/configure.in
+++ b/source/configure.in
@@ -1765,6 +1765,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 168256fd56768cecccb577264f2dd23806a9755e..41f6075a20c09733b627f38d9f16f60cc8515a15 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -828,7 +828,9 @@ struct functable {
 struct printjob;
 
 /***** automatically generated prototypes *****/
+#ifndef NO_PROTO_H
 #include "proto.h"
+#endif
 
 /* String routines */