summaryrefslogtreecommitdiff
path: root/source4/build/m4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-05-06 15:31:03 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:52:02 -0500
commit30baa7f39ec053cfcc2b5a6cf1471c1d5ca15137 (patch)
tree440d907057c567d65df0a63e3e680c5552c0f011 /source4/build/m4
parent31d28c5b8cc22fb158a808a1f9d3d0c8ed5d2090 (diff)
downloadsamba-30baa7f39ec053cfcc2b5a6cf1471c1d5ca15137.tar.gz
samba-30baa7f39ec053cfcc2b5a6cf1471c1d5ca15137.tar.bz2
samba-30baa7f39ec053cfcc2b5a6cf1471c1d5ca15137.zip
r22697: Support building with external talloc.
(This used to be commit 3a2f9e0977bc311daa8171ea709a9cbcdd0a0c85)
Diffstat (limited to 'source4/build/m4')
-rw-r--r--source4/build/m4/public.m424
1 files changed, 20 insertions, 4 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index afb707e81d..003605c401 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -6,12 +6,14 @@ dnl Published under the GPL
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 @@ ENABLE = YES
"
])
-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 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG],
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 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG],
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 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG],
[`$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],
[