svn commit: samba r3477 - in branches/SAMBA_4_0/source/build/smb_build: .

[metze at samba.org]

Author: metze
Date: 2004-11-02 11:31:58 +0000 (Tue, 02 Nov 2004)
New Revision: 3477

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

Log:
add '--with-disable-ext-lib=LIB' option to be able to disable
the usage of external libraries.

(works currently only with the pkg-config detected libs)

metze

Modified:
   branches/SAMBA_4_0/source/build/smb_build/check_path.m4
   branches/SAMBA_4_0/source/build/smb_build/public.m4


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/check_path.m4
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/check_path.m4	2004-11-02 11:17:06 UTC (rev 3476)
+++ branches/SAMBA_4_0/source/build/smb_build/check_path.m4	2004-11-02 11:31:58 UTC (rev 3477)
@@ -155,6 +155,15 @@
     fi])
 
 
+dnl disable these external libs 
+AC_ARG_WITH(disable-ext-lib,
+[  --with-disable-ext-lib=LIB Comma-seperated list of external libraries],
+[ if test $withval; then
+	for i in `echo $withval | sed -e's/,/ /g'`
+	do
+		eval SMB_EXT_LIB_$i=NO
+	done
+fi ])
 
 dnl exclude these modules 
 AC_ARG_WITH(exclude-modules,

Modified: branches/SAMBA_4_0/source/build/smb_build/public.m4
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/public.m4	2004-11-02 11:17:06 UTC (rev 3476)
+++ branches/SAMBA_4_0/source/build/smb_build/public.m4	2004-11-02 11:31:58 UTC (rev 3477)
@@ -374,7 +374,10 @@
 		if $PKG_CONFIG --atleast-pkgconfig-version 0.9.0; then
         		AC_MSG_CHECKING(for $2)
 
-          		if $PKG_CONFIG --exists '$2' ; then
+          		if test "$SMB_EXT_LIB_$1"x = "NO"x ; then
+				SMB_EXT_LIB_ENABLE($1, NO)
+				AC_MSG_RESULT(disabled)		
+          		elif $PKG_CONFIG --exists '$2' ; then
             			AC_MSG_RESULT(yes)
 
 				SMB_EXT_LIB_ENABLE($1, YES)