← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/nux/oneiric-proposed

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2011-07-04 18:34:48 UTC
  • mfrom: (1.1.22 upstream)
  • Revision ID: james.westby@ubuntu.com-20110704183448-wzm2936r4xyob3d9
Tags: 1.0.4-0ubuntu1
* New upstream release.
* debian/rules:
  - bump shlib

Show diffs side-by-side

added added

removed removed

Lines of Context:
aclocal.m4
13
13
 
14
14
m4_ifndef([AC_AUTOCONF_VERSION],
15
15
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
16
 
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
17
 
[m4_warning([this file was generated for autoconf 2.67.
 
16
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
 
17
[m4_warning([this file was generated for autoconf 2.68.
18
18
You have another version of autoconf.  It may work, but is not guaranteed to.
19
19
If you have problems, you may need to regenerate the build system entirely.
20
20
To do so, use the procedure documented by the package, typically `autoreconf'.])])
47
47
# ----------------------------------
48
48
AC_DEFUN([PKG_PROG_PKG_CONFIG],
49
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
52
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
52
53
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
53
54
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
93
94
    pkg_cv_[]$1="$$1"
94
95
 elif test -n "$PKG_CONFIG"; then
95
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
99
                     [pkg_failed=yes])
98
100
 else
99
101
    pkg_failed=untried
141
143
        AC_MSG_RESULT([no])
142
144
        _PKG_SHORT_ERRORS_SUPPORTED
143
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
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
149
        fi
148
150
        # Put the nasty error message in config.log where it belongs
149
151
        echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD