← Back to branch summary

~ubuntu-branches/ubuntu/precise/nbd/precise-security

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Bazaar Package Importer
  • Author(s): Stéphane Graber
  • Date: 2011-06-21 19:17:59 UTC
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: james.westby@ubuntu.com-20110621191759-fcsuw8152l0yqf9r
Tags: upstream-2.9.22
Import upstream version 2.9.22

Show diffs side-by-side

added added

removed removed

Lines of Context:
aclocal.m4
259
259
# ----------------------------------
260
260
AC_DEFUN([PKG_PROG_PKG_CONFIG],
261
261
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
262
 
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
 
262
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
 
263
m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
263
264
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
264
265
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
265
266
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
305
306
    pkg_cv_[]$1="$$1"
306
307
 elif test -n "$PKG_CONFIG"; then
307
308
    PKG_CHECK_EXISTS([$3],
308
 
                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
 
309
                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
 
310
                      test "x$?" != "x0" && pkg_failed=yes ],
309
311
                     [pkg_failed=yes])
310
312
 else
311
313
    pkg_failed=untried
353
355
        AC_MSG_RESULT([no])
354
356
        _PKG_SHORT_ERRORS_SUPPORTED
355
357
        if test $_pkg_short_errors_supported = yes; then
356
 
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
 
358
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
357
359
        else 
358
 
                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
 
360
                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
359
361
        fi
360
362
        # Put the nasty error message in config.log where it belongs
361
363
        echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD