summaryrefslogtreecommitdiff
path: root/source4/aclocal.m4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-05-13 15:37:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:53:42 -0500
commit0048335d9e3e0c7db61f6a325a3d7f49037810c3 (patch)
treea96685acfe324f0b496a81a47832a9c0317de8fd /source4/aclocal.m4
parentd12e825042d1f108051eb6e205340dee444d5591 (diff)
downloadsamba-0048335d9e3e0c7db61f6a325a3d7f49037810c3.tar.gz
r686: - Add SMB_EXT_LIB_FROM_PKGCONFIG()
- Build gregedit and registry_gconf again if the required libs are found (gconf and gtk) (This used to be commit a63b704c36f2f5b52e932b6b2c99e7d664c9bdc7)
Diffstat (limited to 'source4/aclocal.m4')
-rw-r--r--source4/aclocal.m456
1 files changed, 0 insertions, 56 deletions
diff --git a/source4/aclocal.m4 b/source4/aclocal.m4
index 5d0d11cd581..4f42b50f841 100644
--- a/source4/aclocal.m4
+++ b/source4/aclocal.m4
@@ -624,61 +624,5 @@ AC_DEFUN([AC_DISABLE_STATIC],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_STATIC(no)])
-
-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN(PKG_CHECK_MODULES, [
- succeeded=no
-
- if test -z "$PKG_CONFIG"; then
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- fi
-
- if test "$PKG_CONFIG" = "no" ; then
- echo "*** The pkg-config script could not be found. Make sure it is"
- 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."
- else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- AC_MSG_CHECKING(for $2)
-
- if $PKG_CONFIG --exists "$2" ; then
- AC_MSG_RESULT(yes)
- succeeded=yes
-
- AC_MSG_CHECKING($1_CFLAGS)
- $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
- AC_MSG_RESULT($$1_CFLAGS)
-
- AC_MSG_CHECKING($1_LIBS)
- $1_LIBS=`$PKG_CONFIG --libs "$2"`
- AC_MSG_RESULT($$1_LIBS)
- else
- $1_CFLAGS=""
- $1_LIBS=""
- ## If we have a custom action on failure, don't print errors, but
- ## do set a variable so people can do so.
- $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- ifelse([$4], ,echo $$1_PKG_ERRORS,)
- fi
-
- AC_SUBST($1_CFLAGS)
- AC_SUBST($1_LIBS)
- 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"
- fi
- fi
-
- if test $succeeded = yes; then
- ifelse([$3], , :, [$3])
- else
- ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
- fi
-])
-
sinclude(build/smb_build/public.m4)
sinclude(build/smb_build/core.m4)