diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-03-19 19:31:25 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:11:08 -0500 |
| commit | 105660d3f9b537fa47fe6e33c0418a1d8f85e0e9 (patch) | |
| tree | d2dc24b88f363ab04f63a48de22486de22629aa2 /source4/build | |
| parent | 63b5ad6d5403f97423af0e8c542714ed691e667f (diff) | |
| download | samba-105660d3f9b537fa47fe6e33c0418a1d8f85e0e9.tar.gz samba-105660d3f9b537fa47fe6e33c0418a1d8f85e0e9.tar.bz2 samba-105660d3f9b537fa47fe6e33c0418a1d8f85e0e9.zip | |
r5906: Fix the usage of the internal popt (make proto should ignore it)
Updated included popt to 1.7.
(This used to be commit d60cb643e8a46771f3d836307ea45b869f34dc9b)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/m4/rewrite.m4 | 2 | ||||
| -rw-r--r-- | source4/build/smb_build/main.pm | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4 index a6addcf91a..e1557da1f1 100644 --- a/source4/build/m4/rewrite.m4 +++ b/source4/build/m4/rewrite.m4 @@ -596,7 +596,7 @@ AC_TRY_COMPILE([ #define REPLACE_GETPASS 1 #define NO_CONFIG_H 1 #define main dont_declare_main -#include "${srcdir-.}/lib/getsmbpass.c" +#include "${srcdir-.}/lib/cmdline/getsmbpass.c" #undef main ],[],samba_cv_REPLACE_GETPASS=yes,samba_cv_REPLACE_GETPASS=no) CPPFLAGS="$SAVE_CPPFLAGS" diff --git a/source4/build/smb_build/main.pm b/source4/build/smb_build/main.pm index b6e29a7ace..0b57e5952d 100644 --- a/source4/build/smb_build/main.pm +++ b/source4/build/smb_build/main.pm @@ -37,6 +37,7 @@ sub smb_build_main($) "lib/registry/config.mk", "lib/messaging/config.mk", "lib/events/config.mk", + "lib/popt/config.mk", "smb_server/config.mk", "rpc_server/config.mk", "ldap_server/config.mk", |