Mercurial > masqmail

comparison aclocal.m4 @ 419:d209b4846f2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
The pid files goes to /var/run/masqmail.pid now. Added --with-piddir. Now we can change the pid dir to /run on system that did this transition.
author markus schnalke <meillo@marmaro.de>
date Tue, 29 May 2012 21:35:17 +0200
parents e6864daf89f4
children
comparison
equal deleted inserted replaced
418:4cbaf6d6793f 419:d209b4846f2b
45 45
46 # PKG_PROG_PKG_CONFIG([MIN-VERSION]) 46 # PKG_PROG_PKG_CONFIG([MIN-VERSION])
47 # ---------------------------------- 47 # ----------------------------------
48 AC_DEFUN([PKG_PROG_PKG_CONFIG], 48 AC_DEFUN([PKG_PROG_PKG_CONFIG],
49 [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) 49 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
50 m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) 50 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
51 m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
51 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) 52 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
52 AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) 53 AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
53 AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) 54 AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
54 55
55 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then 56 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
91 m4_define([_PKG_CONFIG], 92 m4_define([_PKG_CONFIG],
92 [if test -n "$$1"; then 93 [if test -n "$$1"; then
93 pkg_cv_[]$1="$$1" 94 pkg_cv_[]$1="$$1"
94 elif test -n "$PKG_CONFIG"; then 95 elif test -n "$PKG_CONFIG"; then
95 PKG_CHECK_EXISTS([$3], 96 PKG_CHECK_EXISTS([$3],
96 [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], 97 [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
98 test "x$?" != "x0" && pkg_failed=yes ],
97 [pkg_failed=yes]) 99 [pkg_failed=yes])
98 else 100 else
99 pkg_failed=untried 101 pkg_failed=untried
100 fi[]dnl 102 fi[]dnl
101 ])# _PKG_CONFIG 103 ])# _PKG_CONFIG
139 141
140 if test $pkg_failed = yes; then 142 if test $pkg_failed = yes; then
141 AC_MSG_RESULT([no]) 143 AC_MSG_RESULT([no])
142 _PKG_SHORT_ERRORS_SUPPORTED 144 _PKG_SHORT_ERRORS_SUPPORTED
143 if test $_pkg_short_errors_supported = yes; then 145 if test $_pkg_short_errors_supported = yes; then
144 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` 146 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
145 else 147 else
146 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` 148 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
147 fi 149 fi
148 # Put the nasty error message in config.log where it belongs 150 # Put the nasty error message in config.log where it belongs
149 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD 151 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
150 152
151 m4_default([$4], [AC_MSG_ERROR( 153 m4_default([$4], [AC_MSG_ERROR(