← Back to branch summary

~matttbe/ubuntu/raring/alacarte/lp1086369

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Bazaar Package Importer
  • Author(s): Josselin Mouette
  • Date: 2010-04-03 12:56:08 UTC
  • mfrom: (1.1.19 upstream)
  • mto: (2.2.1 sid)
  • mto: This revision was merged to the branch mainline in revision 50.
  • Revision ID: james.westby@ubuntu.com-20100403125608-vfpbetzo5n801afz
http://bugs.debian.org/574003
* Stop recommending gnome-panel. Closes: #574003.
* New upstream release.
* 03-bind_textdomain_codeset.patch: updated to apply again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
aclocal.m4
1
 
# generated automatically by aclocal 1.11 -*- Autoconf -*-
 
1
# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
2
2
 
3
3
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4
4
# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
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.63],,
17
 
[m4_warning([this file was generated for autoconf 2.63.
 
16
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
 
17
[m4_warning([this file was generated for autoconf 2.65.
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'.])])
849
849
[am__api_version='1.11'
850
850
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
851
851
dnl require some minimum version.  Point them to the right macro.
852
 
m4_if([$1], [1.11], [],
 
852
m4_if([$1], [1.11.1], [],
853
853
      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
854
854
])
855
855
 
865
865
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
866
866
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
867
867
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
868
 
[AM_AUTOMAKE_VERSION([1.11])dnl
 
868
[AM_AUTOMAKE_VERSION([1.11.1])dnl
869
869
m4_ifndef([AC_AUTOCONF_VERSION],
870
870
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
871
871
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
1721
1721
       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
1722
1722
       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
1723
1723
       ;;
 
1724
     *)
 
1725
       case $am_py_prefix in
 
1726
         /usr|/System*) ;;
 
1727
         *)
 
1728
          am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
 
1729
          ;;
 
1730
       esac
 
1731
       ;;
1724
1732
     esac
1725
1733
    ])
1726
1734
  AC_SUBST([pythondir], [$am_cv_python_pythondir])
1751
1759
       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
1752
1760
       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
1753
1761
       ;;
 
1762
     *)
 
1763
       case $am_py_exec_prefix in
 
1764
         /usr|/System*) ;;
 
1765
         *)
 
1766
           am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
 
1767
           ;;
 
1768
       esac
 
1769
       ;;
1754
1770
     esac
1755
1771
    ])
1756
1772
  AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])