diff options
| author | Gerald Carter <jerry@samba.org> | 2003-03-28 02:03:31 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-03-28 02:03:31 +0000 |
| commit | a50e82cac2212f4aa1e40dc74892e9398682daf1 (patch) | |
| tree | ccf9e5fbf87b8083d553563d5b2b8c43085ddc18 | |
| parent | 567fcd81ed7e8cda0640d100f501083632b130f3 (diff) | |
| download | samba-a50e82cac2212f4aa1e40dc74892e9398682daf1.tar.gz samba-a50e82cac2212f4aa1e40dc74892e9398682daf1.tar.bz2 samba-a50e82cac2212f4aa1e40dc74892e9398682daf1.zip | |
don't include proto.h during autoconf tests since it doesn't exist yet; fixed getsmbpass replacement test
(This used to be commit 2aa2767ed5dc5290d6f71174bbf1be7d75a97d8b)
| -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 b55a2b185e..67cd4cbab8 100644 --- a/source3/configure.in +++ b/source3/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/source3/include/includes.h b/source3/include/includes.h index 168256fd56..41f6075a20 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -828,7 +828,9 @@ struct functable { struct printjob; /***** automatically generated prototypes *****/ +#ifndef NO_PROTO_H #include "proto.h" +#endif /* String routines */ |