diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-09-06 01:36:02 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:17:35 -0500 |
| commit | a59706f721c70e9a4f78eb2296bb746b912ce9d0 (patch) | |
| tree | 6a0744113bec965cfec156f6c68cb905ee1ebe5c /source4/lib/popt | |
| parent | a83286d91cd3ff61b276955b1e0998f9e8ebc527 (diff) | |
| download | samba-a59706f721c70e9a4f78eb2296bb746b912ce9d0.tar.gz samba-a59706f721c70e9a4f78eb2296bb746b912ce9d0.tar.bz2 samba-a59706f721c70e9a4f78eb2296bb746b912ce9d0.zip | |
r18121: Simplify m4 code, hopefully fix Samba4 build problems.
(This used to be commit 1adf65b4d7c5d2d4f65d4b28575bdf2368a42139)
Diffstat (limited to 'source4/lib/popt')
| -rw-r--r-- | source4/lib/popt/samba.m4 | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/source4/lib/popt/samba.m4 b/source4/lib/popt/samba.m4 index cd0de5e826..d940075f86 100644 --- a/source4/lib/popt/samba.m4 +++ b/source4/lib/popt/samba.m4 @@ -1,27 +1,3 @@ -SAVE_LIBS="$LIBS" -SAVE_CFLAGS="$CFLAGS" -SAVE_CPPFLAGS="$CPPFLAGS" -SAVE_LDFLAGS="$LDFLAGS" - -LIBS="" -CFLAGS="" -CPPFLAGS="" -LDFLAGS="" - m4_include(lib/popt/libpopt.m4) - -POPT_EXT_LIBS="$LIBS $POPTOBJ" -POPT_EXT_CFLAGS="$CFLAGS" -POPT_EXT_CPPFLAGS="$CPPFLAGS" -POPT_EXT_LDFLAGS="$LDFLAGS" - -LIBS="$SAVE_LIBS" -CFLAGS="$SAVE_CFLAGS" -CPPFLAGS="$SAVE_CPPFLAGS" -LDFLAGS="$SAVE_LDFLAGS" - -SMB_EXT_LIB(POPT_EXT, - [${POPT_EXT_LIBS}], - [${POPT_EXT_CFLAGS}], - [${POPT_EXT_CPPFLAGS}], - [${POPT_EXT_LDFLAGS}]) +SMB_SUBSYSTEM(LIBPOPT, + [lib/popt/findme.o lib/popt/popt.o lib/popt/poptconfig.o lib/popt/popthelp.o lib/popt/poptparse.o], [], [-I$srcdir/lib/popt]) |