diff options
| author | Gerald Carter <jerry@samba.org> | 2003-03-28 02:02:32 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-03-28 02:02:32 +0000 |
| commit | d9eef2fbc231a434c58ca4c25654680cfc40410d (patch) | |
| tree | 8191c05b72d438af7c576b4ea23866afe2621b43 /source3 | |
| parent | 0995fb1eef32938294c76011a5d5b170ae963ec0 (diff) | |
| download | samba-d9eef2fbc231a434c58ca4c25654680cfc40410d.tar.gz samba-d9eef2fbc231a434c58ca4c25654680cfc40410d.tar.bz2 samba-d9eef2fbc231a434c58ca4c25654680cfc40410d.zip | |
don't include proto.h during autoconf tests since it doesn't exist yet; fixed getsmbpass replacement test
(This used to be commit ff43a292b9f8e0a39d19cb099913efd899de84fa)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/configure.in | 1 | ||||
| -rw-r--r-- | source3/include/includes.h | 2 |
2 files changed, 3 insertions, 0 deletions
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 */ |