masqmail-0.2
diff aclocal.m4 @ 1:af25f5c39d90
added diff from debian (masqmail-0.2.21-4)
author | meillo@marmaro.de |
---|---|
date | Fri, 26 Sep 2008 20:56:23 +0200 |
parents | 08114f7dcc23 |
children | 9cb4031fa5e0 |
line diff
1.1 --- a/aclocal.m4 Fri Sep 26 17:05:23 2008 +0200 1.2 +++ b/aclocal.m4 Fri Sep 26 20:56:23 2008 +0200 1.3 @@ -859,31 +859,6 @@ 1.4 Usually this means the macro was only invoked conditionally.]) 1.5 fi])]) 1.6 1.7 -# isc-posix.m4 serial 2 (gettext-0.11.2) 1.8 -dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. 1.9 -dnl This file is free software; the Free Software Foundation 1.10 -dnl gives unlimited permission to copy and/or distribute it, 1.11 -dnl with or without modifications, as long as this notice is preserved. 1.12 - 1.13 -# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. 1.14 - 1.15 -# This test replaces the one in autoconf. 1.16 -# Currently this macro should have the same name as the autoconf macro 1.17 -# because gettext's gettext.m4 (distributed in the automake package) 1.18 -# still uses it. Otherwise, the use in gettext.m4 makes autoheader 1.19 -# give these diagnostics: 1.20 -# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX 1.21 -# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX 1.22 - 1.23 -undefine([AC_ISC_POSIX]) 1.24 - 1.25 -AC_DEFUN([AC_ISC_POSIX], 1.26 - [ 1.27 - dnl This test replaces the obsolescent AC_ISC_POSIX kludge. 1.28 - AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) 1.29 - ] 1.30 -) 1.31 - 1.32 # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- 1.33 # 1.34 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 1.35 @@ -917,7 +892,7 @@ 1.36 AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) 1.37 fi 1.38 if test -n "$PKG_CONFIG"; then 1.39 - _pkg_min_version=m4_ifval([$1], [$1], [0.9.0]) 1.40 + _pkg_min_version=m4_default([$1], [0.9.0]) 1.41 AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) 1.42 if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then 1.43 AC_MSG_RESULT([yes]) 1.44 @@ -953,14 +928,30 @@ 1.45 # --------------------------------------------- 1.46 m4_define([_PKG_CONFIG], 1.47 [if test -n "$PKG_CONFIG"; then 1.48 + if test -n "$$1"; then 1.49 + pkg_cv_[]$1="$$1" 1.50 + else 1.51 PKG_CHECK_EXISTS([$3], 1.52 [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], 1.53 [pkg_failed=yes]) 1.54 + fi 1.55 else 1.56 pkg_failed=untried 1.57 fi[]dnl 1.58 ])# _PKG_CONFIG 1.59 1.60 +# _PKG_SHORT_ERRORS_SUPPORTED 1.61 +# ----------------------------- 1.62 +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], 1.63 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 1.64 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 1.65 + _pkg_short_errors_supported=yes 1.66 +else 1.67 + _pkg_short_errors_supported=no 1.68 +fi[]dnl 1.69 +])# _PKG_SHORT_ERRORS_SUPPORTED 1.70 + 1.71 + 1.72 # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], 1.73 # [ACTION-IF-NOT-FOUND]) 1.74 # 1.75 @@ -982,31 +973,41 @@ 1.76 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) 1.77 _PKG_CONFIG([$1][_LIBS], [libs], [$2]) 1.78 1.79 +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS 1.80 +and $1[]_LIBS to avoid the need to call pkg-config. 1.81 +See the pkg-config man page for more details.]) 1.82 + 1.83 if test $pkg_failed = yes; then 1.84 - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` 1.85 + _PKG_SHORT_ERRORS_SUPPORTED 1.86 + if test $_pkg_short_errors_supported = yes; then 1.87 + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` 1.88 + else 1.89 + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` 1.90 + fi 1.91 # Put the nasty error message in config.log where it belongs 1.92 - echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD 1.93 + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD 1.94 1.95 ifelse([$4], , [AC_MSG_ERROR(dnl 1.96 -[Package requirements ($2) were not met. 1.97 +[Package requirements ($2) were not met: 1.98 + 1.99 +$$1_PKG_ERRORS 1.100 + 1.101 Consider adjusting the PKG_CONFIG_PATH environment variable if you 1.102 installed software in a non-standard prefix. 1.103 1.104 -Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables 1.105 -to avoid the need to call pkg-config. See the pkg-config man page for 1.106 -more details.])], 1.107 - [$4]) 1.108 +_PKG_TEXT 1.109 +])], 1.110 + [AC_MSG_RESULT([no]) 1.111 + $4]) 1.112 elif test $pkg_failed = untried; then 1.113 ifelse([$4], , [AC_MSG_FAILURE(dnl 1.114 [The pkg-config script could not be found or is too old. Make sure it 1.115 is in your PATH or set the PKG_CONFIG environment variable to the full 1.116 path to pkg-config. 1.117 1.118 -Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables 1.119 -to avoid the need to call pkg-config. See the pkg-config man page for 1.120 -more details. 1.121 +_PKG_TEXT 1.122 1.123 -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], 1.124 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], 1.125 [$4]) 1.126 else 1.127 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS