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

tridge at samba.org tridge at samba.org
Tue Sep 5 23:48:06 GMT 2006


Author: tridge
Date: 2006-09-05 23:48:05 +0000 (Tue, 05 Sep 2006)
New Revision: 18110

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

Log:

renamed config.m4 for popt

Added:
   branches/SAMBA_4_0/source/lib/popt/libpopt.m4
Removed:
   branches/SAMBA_4_0/source/lib/popt/config.m4


Changeset:
Deleted: branches/SAMBA_4_0/source/lib/popt/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/popt/config.m4	2006-09-05 23:32:35 UTC (rev 18109)
+++ branches/SAMBA_4_0/source/lib/popt/config.m4	2006-09-05 23:48:05 UTC (rev 18110)
@@ -1,38 +0,0 @@
-#################################################
-# Check to see if we should use the included popt
-
-INCLUDED_POPT=auto
-AC_ARG_WITH(included-popt,
-[  --with-included-popt    use bundled popt library, not from system],
-[ 
-case "$withval" in
-	yes)
-		INCLUDED_POPT=yes
-		;;
-        no)
-        	INCLUDED_POPT=no
-		;;
-esac ],
-)
-if test x"$INCLUDED_POPT" != x"yes"; then
-	AC_CHECK_HEADERS(popt.h)
-	AC_CHECK_LIB_EXT(popt, TMP_LIBPOPT_LIBS, poptGetContext, [], [], INCLUDED_POPT=no)
-	if test x"$ac_cv_header_popt_h" = x"no"; then
-		INCLUDED_POPT=yes
-		TMP_LIBPOPT_LIBS=""
-	fi
-fi
-
-AC_MSG_CHECKING(whether to use included popt)
-if test x"$INCLUDED_POPT" != x"no"; then
-	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])
-
-	AC_MSG_RESULT(yes)
-else
-	SMB_EXT_LIB(LIBPOPT, [${TMP_LIBPOPT_LIBS}])
-	SMB_ENABLE(LIBPOPT,YES)
-	AC_MSG_RESULT(no)
-fi
-
-AC_CHECK_HEADERS([float.h alloca.h])

Copied: branches/SAMBA_4_0/source/lib/popt/libpopt.m4 (from rev 18107, branches/SAMBA_4_0/source/lib/popt/config.m4)
===================================================================
--- branches/SAMBA_4_0/source/lib/popt/config.m4	2006-09-05 21:11:08 UTC (rev 18107)
+++ branches/SAMBA_4_0/source/lib/popt/libpopt.m4	2006-09-05 23:48:05 UTC (rev 18110)
@@ -0,0 +1,14 @@
+dnl find the popt sources. This is meant to work both for 
+dnl popt standalone builds, and builds of packages using popt
+poptdir=""
+for d in "$srcdir" "$srcdir/lib/popt" "$srcdir/popt" "$srcdir/../popt"; do
+	if test -f "$d/popt.c"; then
+		poptdir="$d"		
+		AC_SUBST(poptdir)
+		break;
+	fi
+done
+POPTOBJ="popt.o findme.o poptconfig.o popthelp.o poptparse.o"
+AC_SUBST(POPTOBJ)
+
+AC_CHECK_HEADERS([float.h alloca.h])



More information about the samba-cvs mailing list