Author: jelmer Date: 2007-05-06 15:31:03 +0000 (Sun, 06 May 2007) New Revision: 22697
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22697 Log: Support building with external talloc. Modified: branches/SAMBA_4_0/source/build/m4/public.m4 branches/SAMBA_4_0/source/configure.ac branches/SAMBA_4_0/source/lib/basic.mk Changeset: Modified: branches/SAMBA_4_0/source/build/m4/public.m4 =================================================================== --- branches/SAMBA_4_0/source/build/m4/public.m4 2007-05-06 15:17:14 UTC (rev 22696) +++ branches/SAMBA_4_0/source/build/m4/public.m4 2007-05-06 15:31:03 UTC (rev 22697) @@ -6,12 +6,14 @@ dnl dnl SMB_SUBSYSTEM(name,obj_files,required_subsystems) dnl -dnl SMB_EXT_LIB_FROM_PKGCONFIG(name,pkg-config name) +dnl SMB_EXT_LIB_FROM_PKGCONFIG(name,pkg-config name,[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) dnl dnl SMB_EXT_LIB(name,libs,cflags,cppflags,ldflags) dnl dnl SMB_ENABLE(name,default_build) dnl +dnl SMB_INCLUDE_MK(file) +dnl dnl ####################################################### dnl ### And now the implementation ### dnl ####################################################### @@ -32,7 +34,7 @@ " ]) -dnl SMB_EXT_LIB_FROM_PKGCONFIG(name,pkg-config name) +dnl SMB_EXT_LIB_FROM_PKGCONFIG(name,pkg-config name,[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG], [ dnl Figure out the correct variables and call SMB_EXT_LIB() @@ -46,8 +48,10 @@ echo "*** in your path, or set the PKG_CONFIG environment variable" echo "*** to the full path to pkg-config." echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - SMB_EXT_LIB($1) - SMB_ENABLE($1, NO) + SMB_EXT_LIB($1) + SMB_ENABLE($1, NO) + $4 + else if $PKG_CONFIG --atleast-pkgconfig-version 0.9.0; then AC_MSG_CHECKING(for $2) @@ -55,6 +59,7 @@ if test "$SMB_$1"x = "NO"x ; then SMB_ENABLE($1, NO) AC_MSG_RESULT(disabled) + $4 elif $PKG_CONFIG --exists '$2' ; then AC_MSG_RESULT(yes) @@ -76,22 +81,33 @@ [`$PKG_CONFIG --cflags-only-other '$2'`], [`$PKG_CONFIG --cflags-only-I '$2'`], [`$PKG_CONFIG --libs-only-other '$2'` `$PKG_CONFIG --libs-only-L '$2'`]) + $3 else SMB_EXT_LIB($1) SMB_ENABLE($1, NO) AC_MSG_RESULT(no) $PKG_CONFIG --errors-to-stdout --print-errors '$2' + $4 fi else echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." echo "*** See http://www.freedesktop.org/software/pkgconfig"; SMB_EXT_LIB($1) SMB_ENABLE($1, NO) + $4 fi fi ]) +dnl SMB_INCLUDE_MK(file) +AC_DEFUN([SMB_INCLUDE_MK], +[ +SMB_INFO_EXT_LIBS="$SMB_INFO_EXT_LIBS +include $1 +" +]) + dnl SMB_EXT_LIB(name,libs,cflags,cppflags,ldflags) AC_DEFUN([SMB_EXT_LIB], [ Modified: branches/SAMBA_4_0/source/configure.ac =================================================================== --- branches/SAMBA_4_0/source/configure.ac 2007-05-06 15:17:14 UTC (rev 22696) +++ branches/SAMBA_4_0/source/configure.ac 2007-05-06 15:31:03 UTC (rev 22697) @@ -25,7 +25,10 @@ m4_include(lib/popt/samba.m4) m4_include(lib/charset/config.m4) m4_include(lib/socket/config.m4) -m4_include(lib/talloc/libtalloc.m4) +SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.0, [], [ + m4_include(lib/talloc/libtalloc.m4) + SMB_INCLUDE_MK(lib/talloc/config.mk) +]) m4_include(lib/tdb/libtdb.m4) m4_include(lib/ldb/sqlite3.m4) m4_include(lib/ldb/libldb.m4) Modified: branches/SAMBA_4_0/source/lib/basic.mk =================================================================== --- branches/SAMBA_4_0/source/lib/basic.mk 2007-05-06 15:17:14 UTC (rev 22696) +++ branches/SAMBA_4_0/source/lib/basic.mk 2007-05-06 15:31:03 UTC (rev 22697) @@ -3,7 +3,6 @@ include socket/config.mk include charset/config.mk include ldb/config.mk -include talloc/config.mk include tdb/config.mk include tls/config.mk include registry/config.mk
