From d9eef2fbc231a434c58ca4c25654680cfc40410d Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 28 Mar 2003 02:02:32 +0000
Subject: don't include proto.h during autoconf tests since it doesn't exist
 yet; fixed getsmbpass replacement test (This used to be commit
 ff43a292b9f8e0a39d19cb099913efd899de84fa)

---
 source3/configure.in       | 1 +
 source3/include/includes.h | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'source3')

diff --git a/source3/configure.in b/source3/configure.in
index 1bc23cf74f..e16836dd83 100644
--- a/source3/configure.in
+++ b/source3/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/source3/include/includes.h b/source3/include/includes.h
index 09c64d896d..e8e0751cab 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -855,7 +855,9 @@ struct functable {
 struct printjob;
 
 /***** automatically generated prototypes *****/
+#ifndef NO_PROTO_H
 #include "proto.h"
+#endif
 
 /* String routines */
 
-- 
cgit