svn commit: samba r15043 - branches/SAMBA_3_0/source trunk/source

[gd at samba.org]

Author: gd
Date: 2006-04-11 16:57:16 +0000 (Tue, 11 Apr 2006)
New Revision: 15043

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

Log:
Only build our copy of iniparser when the system doesn't have one.

Guenther

Modified:
   branches/SAMBA_3_0/source/Makefile.in
   branches/SAMBA_3_0/source/configure.in
   trunk/source/Makefile.in
   trunk/source/configure.in


Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in	2006-04-11 16:30:42 UTC (rev 15042)
+++ branches/SAMBA_3_0/source/Makefile.in	2006-04-11 16:57:16 UTC (rev 15043)
@@ -116,7 +116,7 @@
 LIBSMBSHAREMODES_MINOR=2
 
 FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/tdb @SMBWRAP_INC@ -I. $(CPPFLAGS) -I$(srcdir) -D_SAMBA_BUILD_
-FLAGS2 = -I$(srcdir)/iniparser/src 
+FLAGS2 =
 FLAGS3 = 
 FLAGS4 = 
 FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4)
@@ -512,7 +512,7 @@
 	     $(SMBLDAP_OBJ) $(DCUTIL_OBJ)
 
 PAM_WINBIND_OBJ = nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
-		  lib/replace1.o $(SNPRINTF_OBJ) $(INIPARSER_OBJ)
+		  lib/replace1.o $(SNPRINTF_OBJ)
 
 PAM_WINBIND_PICOBJ = $(PAM_WINBIND_OBJ:.o=. at PICSUFFIX@)
 
@@ -1209,10 +1209,10 @@
 		$(LDAP_LIBS) $(KRB5LIBS) \
 		@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
 
-bin/pam_winbind. at SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
+bin/pam_winbind. at SHLIBEXT@: $(PAM_WINBIND_PICOBJ) @BUILD_INIPARSER@ bin/.dummy
 	@echo "Linking shared library $@"
 	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_PICOBJ) \
-		@SONAMEFLAG@`basename $@` $(LIBS) -lpam
+		@SONAMEFLAG@`basename $@` $(LIBS) @INIPARSERLIBS@ -lpam
 
 bin/rhosts. at SHLIBEXT@: $(AUTH_RHOSTS_OBJ:.o=. at PICSUFFIX@)
 	@echo "Building plugin $@"

Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in	2006-04-11 16:30:42 UTC (rev 15042)
+++ branches/SAMBA_3_0/source/configure.in	2006-04-11 16:57:16 UTC (rev 15043)
@@ -5314,6 +5314,43 @@
 AC_SUBST(FLAGS1)
 
 #################################################
+# Check to see if we should use the included iniparser 
+
+AC_ARG_WITH(included-iniparser,
+[  --with-included-iniparser    use bundled iniparser library, not from system],
+[ 
+  case "$withval" in
+	yes)
+		INCLUDED_INIPARSER=yes
+		;;
+        no)
+		INCLUDED_INIPARSER=no
+                ;;
+  esac ],
+)
+if test x"$INCLUDED_INIPARSER" != x"yes"; then
+    AC_CHECK_LIB(iniparser, iniparser_load,
+	         INCLUDED_INIPARSER=no, INCLUDED_INIPARSER=yes)
+fi
+
+AC_MSG_CHECKING(whether to use included iniparser)
+if test x"$INCLUDED_INIPARSER" = x"yes"; then
+    AC_MSG_RESULT(yes)
+    BUILD_INIPARSER='$(INIPARSER_OBJ)'
+	INIPARSERLIBS='$(INIPARSER_OBJ)'
+    FLAGS1="$FLAGS1 -I$srcdir/iniparser/src"
+else
+    AC_MSG_RESULT(no)
+	BUILD_INIPARSER=""
+    INIPARSERLIBS="-liniparser"
+fi
+AC_SUBST(BUILD_INIPARSER)
+AC_SUBST(INIPARSERLIBS)
+AC_SUBST(FLAGS1)
+
+
+
+#################################################
 # Check if the user wants Python
 
 # At the moment, you can use this to set which Python binary to link

Modified: trunk/source/Makefile.in
===================================================================
--- trunk/source/Makefile.in	2006-04-11 16:30:42 UTC (rev 15042)
+++ trunk/source/Makefile.in	2006-04-11 16:57:16 UTC (rev 15043)
@@ -116,7 +116,7 @@
 LIBSMBSHAREMODES_MINOR=2
 
 FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/tdb @SMBWRAP_INC@ -I. $(CPPFLAGS) -I$(srcdir) -D_SAMBA_BUILD_
-FLAGS2 = -I$(srcdir)/iniparser/src 
+FLAGS2 =
 FLAGS3 = 
 FLAGS4 = 
 FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4)
@@ -521,7 +521,7 @@
 	     $(SMBLDAP_OBJ) $(DCUTIL_OBJ)
 
 PAM_WINBIND_OBJ = nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
-		  lib/replace1.o $(SNPRINTF_OBJ) $(INIPARSER_OBJ)
+		  lib/replace1.o $(SNPRINTF_OBJ)
 
 PAM_WINBIND_PICOBJ = $(PAM_WINBIND_OBJ:.o=. at PICSUFFIX@)
 
@@ -1238,10 +1238,10 @@
 		$(LDAP_LIBS) $(KRB5LIBS) \
 		@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
 
-bin/pam_winbind. at SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
+bin/pam_winbind. at SHLIBEXT@: $(PAM_WINBIND_PICOBJ) @BUILD_INIPARSER@ bin/.dummy
 	@echo "Linking shared library $@"
 	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_PICOBJ) \
-		@SONAMEFLAG@`basename $@` $(LIBS) -lpam
+		@SONAMEFLAG@`basename $@` $(LIBS) @INIPARSERLIBS@ -lpam
 
 bin/rhosts. at SHLIBEXT@: $(AUTH_RHOSTS_OBJ:.o=. at PICSUFFIX@)
 	@echo "Building plugin $@"

Modified: trunk/source/configure.in
===================================================================
--- trunk/source/configure.in	2006-04-11 16:30:42 UTC (rev 15042)
+++ trunk/source/configure.in	2006-04-11 16:57:16 UTC (rev 15043)
@@ -5314,6 +5314,43 @@
 AC_SUBST(FLAGS1)
 
 #################################################
+# Check to see if we should use the included iniparser 
+
+AC_ARG_WITH(included-iniparser,
+[  --with-included-iniparser    use bundled iniparser library, not from system],
+[ 
+  case "$withval" in
+	yes)
+		INCLUDED_INIPARSER=yes
+		;;
+        no)
+		INCLUDED_INIPARSER=no
+                ;;
+  esac ],
+)
+if test x"$INCLUDED_INIPARSER" != x"yes"; then
+    AC_CHECK_LIB(iniparser, iniparser_load,
+	         INCLUDED_INIPARSER=no, INCLUDED_INIPARSER=yes)
+fi
+
+AC_MSG_CHECKING(whether to use included iniparser)
+if test x"$INCLUDED_INIPARSER" = x"yes"; then
+    AC_MSG_RESULT(yes)
+    BUILD_INIPARSER='$(INIPARSER_OBJ)'
+	INIPARSERLIBS='$(INIPARSER_OBJ)'
+    FLAGS1="$FLAGS1 -I$srcdir/iniparser/src"
+else
+    AC_MSG_RESULT(no)
+	BUILD_INIPARSER=""
+    INIPARSERLIBS="-liniparser"
+fi
+AC_SUBST(BUILD_INIPARSER)
+AC_SUBST(INIPARSERLIBS)
+AC_SUBST(FLAGS1)
+
+
+
+#################################################
 # Check if the user wants Python
 
 # At the moment, you can use this to set which Python binary to link