Index: source/aclocal.m4 |
diff --git a/source/aclocal.m4 b/source/aclocal.m4 |
index 1a1680690a4ad11804a449499bac4c05251dec5d..f0ae29f5a81ccd90dc9def422ece39e26a56b93f 100644 |
--- a/source/aclocal.m4 |
+++ b/source/aclocal.m4 |
@@ -1,7 +1,7 @@ |
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*- |
+# generated automatically by aclocal 1.15 -*- Autoconf -*- |
+ |
+# Copyright (C) 1996-2014 Free Software Foundation, Inc. |
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
# This file is free software; the Free Software Foundation |
# gives unlimited permission to copy and/or distribute it, |
# with or without modifications, as long as this notice is preserved. |
@@ -11,7 +11,9 @@ |
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
# PARTICULAR PURPOSE. |
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) |
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
+# serial 1 (pkg-config-0.24) |
# |
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. |
# |
@@ -38,8 +40,12 @@ |
# ---------------------------------- |
AC_DEFUN([PKG_PROG_PKG_CONFIG], |
[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) |
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) |
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl |
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) |
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) |
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) |
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) |
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) |
+ |
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) |
fi |
@@ -52,7 +58,6 @@ if test -n "$PKG_CONFIG"; then |
AC_MSG_RESULT([no]) |
PKG_CONFIG="" |
fi |
- |
fi[]dnl |
])# PKG_PROG_PKG_CONFIG |
@@ -61,21 +66,20 @@ fi[]dnl |
# Check to see whether a particular set of modules exists. Similar |
# to PKG_CHECK_MODULES(), but does not set variables or print errors. |
# |
-# |
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of |
-# this or PKG_CHECK_MODULES is called, or make sure to call |
-# PKG_CHECK_EXISTS manually |
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
+# only at the first occurence in configure.ac, so if the first place |
+# it's called might be skipped (such as if it is within an "if", you |
+# have to call PKG_CHECK_EXISTS manually |
# -------------------------------------------------------------- |
AC_DEFUN([PKG_CHECK_EXISTS], |
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
if test -n "$PKG_CONFIG" && \ |
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then |
- m4_ifval([$2], [$2], [:]) |
+ m4_default([$2], [:]) |
m4_ifvaln([$3], [else |
$3])dnl |
fi]) |
- |
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) |
# --------------------------------------------- |
m4_define([_PKG_CONFIG], |
@@ -83,7 +87,8 @@ m4_define([_PKG_CONFIG], |
pkg_cv_[]$1="$$1" |
elif test -n "$PKG_CONFIG"; then |
PKG_CHECK_EXISTS([$3], |
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], |
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` |
+ test "x$?" != "x0" && pkg_failed=yes ], |
[pkg_failed=yes]) |
else |
pkg_failed=untried |
@@ -128,16 +133,17 @@ and $1[]_LIBS to avoid the need to call pkg-config. |
See the pkg-config man page for more details.]) |
if test $pkg_failed = yes; then |
+ AC_MSG_RESULT([no]) |
_PKG_SHORT_ERRORS_SUPPORTED |
if test $_pkg_short_errors_supported = yes; then |
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` |
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` |
else |
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` |
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` |
fi |
# Put the nasty error message in config.log where it belongs |
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |
- ifelse([$4], , [AC_MSG_ERROR(dnl |
+ m4_default([$4], [AC_MSG_ERROR( |
[Package requirements ($2) were not met: |
$$1_PKG_ERRORS |
@@ -145,26 +151,81 @@ $$1_PKG_ERRORS |
Consider adjusting the PKG_CONFIG_PATH environment variable if you |
installed software in a non-standard prefix. |
-_PKG_TEXT |
-])], |
- [AC_MSG_RESULT([no]) |
- $4]) |
+_PKG_TEXT])[]dnl |
+ ]) |
elif test $pkg_failed = untried; then |
- ifelse([$4], , [AC_MSG_FAILURE(dnl |
+ AC_MSG_RESULT([no]) |
+ m4_default([$4], [AC_MSG_FAILURE( |
[The pkg-config script could not be found or is too old. Make sure it |
is in your PATH or set the PKG_CONFIG environment variable to the full |
path to pkg-config. |
_PKG_TEXT |
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], |
- [$4]) |
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl |
+ ]) |
else |
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS |
AC_MSG_RESULT([yes]) |
- ifelse([$3], , :, [$3]) |
+ $3 |
fi[]dnl |
])# PKG_CHECK_MODULES |
+ |
+# PKG_INSTALLDIR(DIRECTORY) |
+# ------------------------- |
+# Substitutes the variable pkgconfigdir as the location where a module |
+# should install pkg-config .pc files. By default the directory is |
+# $libdir/pkgconfig, but the default can be changed by passing |
+# DIRECTORY. The user can override through the --with-pkgconfigdir |
+# parameter. |
+AC_DEFUN([PKG_INSTALLDIR], |
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) |
+m4_pushdef([pkg_description], |
+ [pkg-config installation directory @<:@]pkg_default[@:>@]) |
+AC_ARG_WITH([pkgconfigdir], |
+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, |
+ [with_pkgconfigdir=]pkg_default) |
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) |
+m4_popdef([pkg_default]) |
+m4_popdef([pkg_description]) |
+]) dnl PKG_INSTALLDIR |
+ |
+ |
+# PKG_NOARCH_INSTALLDIR(DIRECTORY) |
+# ------------------------- |
+# Substitutes the variable noarch_pkgconfigdir as the location where a |
+# module should install arch-independent pkg-config .pc files. By |
+# default the directory is $datadir/pkgconfig, but the default can be |
+# changed by passing DIRECTORY. The user can override through the |
+# --with-noarch-pkgconfigdir parameter. |
+AC_DEFUN([PKG_NOARCH_INSTALLDIR], |
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) |
+m4_pushdef([pkg_description], |
+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) |
+AC_ARG_WITH([noarch-pkgconfigdir], |
+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, |
+ [with_noarch_pkgconfigdir=]pkg_default) |
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) |
+m4_popdef([pkg_default]) |
+m4_popdef([pkg_description]) |
+]) dnl PKG_NOARCH_INSTALLDIR |
+ |
+ |
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, |
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
+# ------------------------------------------- |
+# Retrieves the value of the pkg-config variable for the given module. |
+AC_DEFUN([PKG_CHECK_VAR], |
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl |
+ |
+_PKG_CONFIG([$1], [variable="][$3]["], [$2]) |
+AS_VAR_COPY([$1], [pkg_cv_][$1]) |
+ |
+AS_VAR_IF([$1], [""], [$5], [$4])dnl |
+])# PKG_CHECK_VAR |
+ |
+m4_include([config/m4/icu-conditional.m4]) |
m4_include([acinclude.m4]) |