← Back to branch summary

~ubuntu-branches/ubuntu/quantal/rhythmbox/quantal-proposed

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Package Import Robot
  • Author(s): Didier Roche
  • Date: 2012-01-17 16:56:40 UTC
  • mfrom: (1.1.62)
  • Revision ID: package-import@ubuntu.com-20120117165640-pr034mkhmti3efh6
Tags: 2.95-0ubuntu1
https://launchpad.net/bugs/461279
* New upstream release:
  - wrong shortcut for Show / Hide the Queue Sidebar (LP: #461279)
* debian/watch:
  - update to latest url    
* debian/patches/00_fix_for_glib_2.32.patch:
  - was taken upstream, removed

Show diffs side-by-side

added added

removed removed

Lines of Context:
aclocal.m4
713
713
# ----------------------------------
714
714
AC_DEFUN([PKG_PROG_PKG_CONFIG],
715
715
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
716
 
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
717
 
m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
 
716
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
718
717
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
719
718
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
720
719
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
760
759
    pkg_cv_[]$1="$$1"
761
760
 elif test -n "$PKG_CONFIG"; then
762
761
    PKG_CHECK_EXISTS([$3],
763
 
                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
764
 
                      test "x$?" != "x0" && pkg_failed=yes ],
 
762
                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
765
763
                     [pkg_failed=yes])
766
764
 else
767
765
    pkg_failed=untried
809
807
        AC_MSG_RESULT([no])
810
808
        _PKG_SHORT_ERRORS_SUPPORTED
811
809
        if test $_pkg_short_errors_supported = yes; then
812
 
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
 
810
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
813
811
        else 
814
 
                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
 
812
                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
815
813
        fi
816
814
        # Put the nasty error message in config.log where it belongs
817
815
        echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
824
822
Consider adjusting the PKG_CONFIG_PATH environment variable if you
825
823
installed software in a non-standard prefix.
826
824
 
827
 
_PKG_TEXT])[]dnl
 
825
_PKG_TEXT])
828
826
        ])
829
827
elif test $pkg_failed = untried; then
830
828
        AC_MSG_RESULT([no])
835
833
 
836
834
_PKG_TEXT
837
835
 
838
 
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
 
836
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
839
837
        ])
840
838
else
841
839
        $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
1653
1651
  dnl Find a Python interpreter.  Python versions prior to 2.0 are not
1654
1652
  dnl supported. (2.0 was released on October 16, 2000).
1655
1653
  m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
1656
 
                    [python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl
 
1654
                    [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl
1657
1655
python2.1 python2.0])
1658
1656
 
1659
1657
  m4_if([$1],[],[