From ff43a292b9f8e0a39d19cb099913efd899de84fa Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 28 Mar 2003 02:02:32 +0000 Subject: [PATCH] don't include proto.h during autoconf tests since it doesn't exist yet; fixed getsmbpass replacement test --- source/configure.in | 1 + source/include/includes.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/source/configure.in b/source/configure.in index 1bc23cf74f4..e16836dd830 100644 --- 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 09c64d896d5..e8e0751cab2 100644 --- 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 */ -- 2.11.4.GIT