← Back to branch summary

~ubuntu-desktop/unity-lens-files/ubuntu

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Didier Roche
  • Date: 2011-08-11 08:52:55 UTC
  • mfrom: (14.4.24 upstream)
  • Revision ID: didier.roche@canonical.com-20110811085255-jiqd2j7uf549mj24
* New upstream release.
* Fix some conflicts in src/config.vala and src/daemon.vala after
  merge-upstream. Get it back to sane values (no home dir)

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'.])])
513
513
# ----------------------------------
514
514
AC_DEFUN([PKG_PROG_PKG_CONFIG],
515
515
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
516
 
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
 
516
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
 
517
m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
517
518
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
518
519
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
519
520
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
559
560
    pkg_cv_[]$1="$$1"
560
561
 elif test -n "$PKG_CONFIG"; then
561
562
    PKG_CHECK_EXISTS([$3],
562
 
                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
 
563
                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
 
564
                      test "x$?" != "x0" && pkg_failed=yes ],
563
565
                     [pkg_failed=yes])
564
566
 else
565
567
    pkg_failed=untried
607
609
        AC_MSG_RESULT([no])
608
610
        _PKG_SHORT_ERRORS_SUPPORTED
609
611
        if test $_pkg_short_errors_supported = yes; then
610
 
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
 
612
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
611
613
        else 
612
 
                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
 
614
                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
613
615
        fi
614
616
        # Put the nasty error message in config.log where it belongs
615
617
        echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD