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

[jelmer at samba.org]

Author: jelmer
Date: 2006-04-29 14:01:49 +0000 (Sat, 29 Apr 2006)
New Revision: 15323

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

Log:
Fix internal popt build

Removed:
   branches/SAMBA_4_0/source/lib/popt/config.mk
Modified:
   branches/SAMBA_4_0/source/lib/basic.mk
   branches/SAMBA_4_0/source/lib/popt/config.m4


Changeset:
Modified: branches/SAMBA_4_0/source/lib/basic.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/basic.mk	2006-04-29 12:55:19 UTC (rev 15322)
+++ branches/SAMBA_4_0/source/lib/basic.mk	2006-04-29 14:01:49 UTC (rev 15323)
@@ -10,7 +10,6 @@
 include registry/config.mk
 include messaging/config.mk
 include events/config.mk
-include popt/config.mk
 include cmdline/config.mk
 include socket_wrapper/config.mk
 include appweb/config.mk

Modified: branches/SAMBA_4_0/source/lib/popt/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/popt/config.m4	2006-04-29 12:55:19 UTC (rev 15322)
+++ branches/SAMBA_4_0/source/lib/popt/config.m4	2006-04-29 14:01:49 UTC (rev 15323)
@@ -27,8 +27,8 @@
 if test x"$INCLUDED_POPT" != x"no"; then
 	CPPFLAGS="$CPPFLAGS -I$srcdir/lib/popt"
 	SMB_SUBSYSTEM(LIBPOPT,
-		[],
-		[INT_LIB_POPT])
+		[lib/popt/findme.o lib/popt/popt.o lib/popt/poptconfig.o lib/popt/popthelp.o lib/popt/poptparse.o], [])
+
 	AC_MSG_RESULT(yes)
 else
 	SMB_EXT_LIB(LIBPOPT, [${TMP_LIBPOPT_LIBS}])

Deleted: branches/SAMBA_4_0/source/lib/popt/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/popt/config.mk	2006-04-29 12:55:19 UTC (rev 15322)
+++ branches/SAMBA_4_0/source/lib/popt/config.mk	2006-04-29 14:01:49 UTC (rev 15323)
@@ -1,10 +0,0 @@
-##############################
-# Start SUBSYSTEM INT_LIB_POPT
-[SUBSYSTEM::INT_LIB_POPT]
-OBJ_FILES = findme.o \
-				popt.o \
-				poptconfig.o \
-				popthelp.o \
-				poptparse.o
-# End SUBSYSTEM INT_LIB_POPT
-##############################