summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-04-28 21:55:32 +0000
committerMike Frysinger <vapier@gentoo.org>2013-04-28 21:55:32 +0000
commit97bdb3afd72b64a18ab8ddd86c3d79fddece4eed (patch)
tree9607721996dd1bb1a863893991135e8b43c0bc72 /eclass/autotools.eclass
parentpunt unneeded glu dep (bug #467796) (diff)
downloadhistorical-97bdb3afd72b64a18ab8ddd86c3d79fddece4eed.tar.gz
historical-97bdb3afd72b64a18ab8ddd86c3d79fddece4eed.tar.bz2
historical-97bdb3afd72b64a18ab8ddd86c3d79fddece4eed.zip
check for AM_CONFIG_HEADER and AC_CONFIG_HEADER when testing for autoheader usage #424195
Diffstat (limited to 'eclass/autotools.eclass')
-rw-r--r--eclass/autotools.eclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 5343d909467e..f8d575ad94eb 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.155 2013/04/28 18:59:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.156 2013/04/28 21:55:32 vapier Exp $
# @ECLASS: autotools.eclass
# @MAINTAINER:
@@ -245,7 +245,7 @@ _at_uses_pkg() {
egrep -q "${args[@]}" configure.??
fi
}
-_at_uses_autoheader() { _at_uses_pkg AC_CONFIG_HEADERS; }
+_at_uses_autoheader() { _at_uses_pkg A{C,M}_CONFIG_HEADER{S,}; }
_at_uses_automake() { _at_uses_pkg AM_INIT_AUTOMAKE; }
_at_uses_gettext() { _at_uses_pkg AM_GNU_GETTEXT_VERSION; }
_at_uses_glibgettext() { _at_uses_pkg AM_GLIB_GNU_GETTEXT; }
@@ -488,8 +488,8 @@ autotools_run_tool() {
# Keep a list of all the macros we might use so that we only
# have to run the trace code once. Order doesn't matter.
ALL_AUTOTOOLS_MACROS=(
- AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT
- AC_CONFIG_HEADERS
+ A{C,M}_PROG_LIBTOOL LT_INIT
+ A{C,M}_CONFIG_HEADER{S,}
AC_CONFIG_SUBDIRS
AC_CONFIG_AUX_DIR AC_CONFIG_MACRO_DIR
AM_INIT_AUTOMAKE