svn commit: samba r22699 - in branches/SAMBA_4_0/source/lib/popt: .

jelmer at samba.org jelmer at samba.org
Sun May 6 15:58:12 GMT 2007


Author: jelmer
Date: 2007-05-06 15:58:12 +0000 (Sun, 06 May 2007)
New Revision: 22699

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22699

Log:
Reduce amount of magic required for popt detection.
Added:
   branches/SAMBA_4_0/source/lib/popt/config.mk
Modified:
   branches/SAMBA_4_0/source/lib/popt/samba.m4


Changeset:
Added: branches/SAMBA_4_0/source/lib/popt/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/popt/config.mk	2007-05-06 15:46:24 UTC (rev 22698)
+++ branches/SAMBA_4_0/source/lib/popt/config.mk	2007-05-06 15:58:12 UTC (rev 22699)
@@ -0,0 +1,7 @@
+[SUBSYSTEM::LIBPOPT]
+OBJ_FILES = findme.o \
+			popt.o \
+			poptconfig.o \
+			popthelp.o \
+			poptparse.o
+CFLAGS = -Ilib/popt

Modified: branches/SAMBA_4_0/source/lib/popt/samba.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/popt/samba.m4	2007-05-06 15:46:24 UTC (rev 22698)
+++ branches/SAMBA_4_0/source/lib/popt/samba.m4	2007-05-06 15:58:12 UTC (rev 22699)
@@ -2,9 +2,7 @@
 
 if test x"$POPT_OBJ" = "x"; then
 	SMB_EXT_LIB(LIBPOPT, [${POPT_LIBS}])
-	SMB_ENABLE(LIBPOPT,YES)
 else
-	SMB_SUBSYSTEM(LIBPOPT,
-	[lib/popt/findme.o lib/popt/popt.o lib/popt/poptconfig.o lib/popt/popthelp.o lib/popt/poptparse.o], [], [-Ilib/popt])
+	SMB_INCLUDE_MK(lib/popt/config.mk)
 fi
 



More information about the samba-cvs mailing list