From a59706f721c70e9a4f78eb2296bb746b912ce9d0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 6 Sep 2006 01:36:02 +0000
Subject: r18121: Simplify m4 code, hopefully fix Samba4 build problems. (This
 used to be commit 1adf65b4d7c5d2d4f65d4b28575bdf2368a42139)

---
 source4/lib/popt/samba.m4 | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

(limited to 'source4/lib/popt/samba.m4')

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])
-- 
cgit