← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/rhythmbox/oneiric

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Bazaar Package Importer
  • Author(s): Rico Tzschichholz
  • Date: 2011-07-29 16:41:38 UTC
  • mto: This revision was merged to the branch mainline in revision 191.
  • Revision ID: james.westby@ubuntu.com-20110729164138-wwicy8nqalm18ck7
Tags: upstream-2.90.1~20110802
Import upstream version 2.90.1~20110802

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'.])])
498
498
 
499
499
 
500
500
# gnome-common.m4
 
501
#
 
502
# serial 3
501
503
# 
502
504
 
503
505
dnl GNOME_COMMON_INIT
504
506
 
505
 
AC_DEFUN([GNOME_COMMON_INIT],
 
507
AU_DEFUN([GNOME_COMMON_INIT],
506
508
[
507
509
  dnl this macro should come after AC_CONFIG_MACRO_DIR
508
510
  AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
515
517
  fi
516
518
 
517
519
  AC_SUBST([ACLOCAL_AMFLAGS])
518
 
])
 
520
],
 
521
[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}"
 
522
in your top-level Makefile.am, instead, where "m4" is the macro directory set
 
523
with AC_CONFIG_MACRO_DIR() in your configure.ac]])
519
524
 
520
525
AC_DEFUN([GNOME_DEBUG_CHECK],
521
526
[
704
709
# ----------------------------------
705
710
AC_DEFUN([PKG_PROG_PKG_CONFIG],
706
711
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
707
 
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
 
712
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
 
713
m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
708
714
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
709
715
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
710
716
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
750
756
    pkg_cv_[]$1="$$1"
751
757
 elif test -n "$PKG_CONFIG"; then
752
758
    PKG_CHECK_EXISTS([$3],
753
 
                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
 
759
                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
 
760
                      test "x$?" != "x0" && pkg_failed=yes ],
754
761
                     [pkg_failed=yes])
755
762
 else
756
763
    pkg_failed=untried
798
805
        AC_MSG_RESULT([no])
799
806
        _PKG_SHORT_ERRORS_SUPPORTED
800
807
        if test $_pkg_short_errors_supported = yes; then
801
 
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
 
808
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
802
809
        else 
803
 
                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
 
810
                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
804
811
        fi
805
812
        # Put the nasty error message in config.log where it belongs
806
813
        echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
1642
1649
  dnl Find a Python interpreter.  Python versions prior to 2.0 are not
1643
1650
  dnl supported. (2.0 was released on October 16, 2000).
1644
1651
  m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
1645
 
                    [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl
 
1652
                    [python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl
1646
1653
python2.1 python2.0])
1647
1654
 
1648
1655
  m4_if([$1],[],[
1813
1820
sys.exit(sys.hexversion < minverhex)"
1814
1821
  AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
1815
1822
 
1816
 
# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
1817
 
#
1818
 
# This file is free software; the Free Software Foundation
1819
 
# gives unlimited permission to copy and/or distribute it,
1820
 
# with or without modifications, as long as this notice is preserved.
1821
 
 
1822
 
# AM_RUN_LOG(COMMAND)
1823
 
# -------------------
1824
 
# Run COMMAND, save the exit status in ac_status, and log it.
1825
 
# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
1826
 
AC_DEFUN([AM_RUN_LOG],
1827
 
[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
1828
 
   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
1829
 
   ac_status=$?
1830
 
   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
1831
 
   (exit $ac_status); }])
1832
 
 
1833
1823
# Check to make sure that the build environment is sane.    -*- Autoconf -*-
1834
1824
 
1835
1825
# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
2096
2086
])
2097
2087
 
2098
2088
m4_include([macros/gnome-doc-utils.m4])
 
2089
m4_include([macros/gsettings.m4])
2099
2090
m4_include([macros/gtk-doc.m4])
2100
2091
m4_include([macros/intltool.m4])
2101
2092
m4_include([macros/libtool.m4])