diff options
| author | Arch Librarian <arch@canonical.com> | 2005-07-14 13:06:53 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2005-07-14 13:06:53 +0000 |
| commit | 2374ab1c3e7855a7bb8e32531c609708d447b76b (patch) | |
| tree | 7a7545d73bff82505c674b275760273ca667cdf6 /pkg.m4 | |
| parent | 9fbcebd3541043117f4902e2a6a5f4c025287668 (diff) | |
2005-04-12 Tollef Fog Heen <tfheen@err.no>
Author: tfheen
Date: 2005-04-12 10:22:52 GMT
2005-04-12 Tollef Fog Heen <tfheen@err.no>
* pkg.m4: Patch from James Henstridge to evaluate second argument
again. (Freedesktop #2987, Gnome #300232, Debian #303878,
#303969)
Diffstat (limited to 'pkg.m4')
| -rw-r--r-- | pkg.m4 | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -69,9 +69,9 @@ AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no AC_CACHE_CHECK([for $1][_CFLAGS], [pkg_cv_][$1][_CFLAGS], - [_PKG_CONFIG([$1][_CFLAGS], [cflags], [[$2]])]) + [_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])]) AC_CACHE_CHECK([for $1][_LIBS], [pkg_cv_][$1][_LIBS], - [_PKG_CONFIG([$1][_LIBS], [libs], [[$2]])]) + [_PKG_CONFIG([$1][_LIBS], [libs], [$2])]) if test $pkg_failed = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` @@ -79,17 +79,17 @@ if test $pkg_failed = yes; then echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD ifelse([$4], , [AC_MSG_ERROR(dnl -[[Package requirements ($2) were not met. +[Package requirements ($2) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables to avoid the need to call pkg-config. See the pkg-config man page for -more details.]])], +more details.])], [$4]) elif test $pkg_failed = untried; then ifelse([$4], , [AC_MSG_FAILURE(dnl -[[The pkg-config script could not be found or is too old. Make sure it +[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. @@ -97,7 +97,7 @@ Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables to avoid the need to call pkg-config. See the pkg-config man page for more details. -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.]])], +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], [$4]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |