[Xfce4-commits] <xfce4-dev-tools:master> also recognize new-school AC_CONFIG_HEADERS() as requiring autoheader

[Brian J. Tarricone]

Updating branch refs/heads/master
         to c9fb4e83e98d829efa46a8f8123a4b2ae175bb17 (commit)
       from 0fcf0dd8a995ef116cbfcf12591ce52a42a36dcc (commit)

commit c9fb4e83e98d829efa46a8f8123a4b2ae175bb17
Author: Brian J. Tarricone <brian at tarricone.org>
Date:   Wed Aug 26 13:19:13 2009 -0700

    also recognize new-school AC_CONFIG_HEADERS() as requiring autoheader

 NEWS                      |    4 ++++
 scripts/xdt-autogen.in.in |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 8a8365a..757420e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+4.7.1
+=====
+- Also support the newer AC_CONFIG_HEADERS macro.
+
 4.7.0
 =====
 - Do @REVISION@ and @LINGUAS@ substitutions in xdt-autogen instead of
diff --git a/scripts/xdt-autogen.in.in b/scripts/xdt-autogen.in.in
index 20cc474..52b6277 100644
--- a/scripts/xdt-autogen.in.in
+++ b/scripts/xdt-autogen.in.in
@@ -402,7 +402,7 @@ EOF
 ##
 test -z "${XDT_PROG_AUTOHEADER}" &&
 for configure_file in $CONFIGURE_FILES; do
-  if grep -q "^AM_CONFIG_HEADER" "${configure_file}"; then
+  if grep -q -E "^A(M|C)_CONFIG_HEADER" "${configure_file}"; then
     for i in autoheader-2.61 autoheader-2.60 autoheader-2.59 autoheader-2.58 autoheader-2.57 autoheader-2.53 autoheader; do
       (${i} --version) </dev/null >/dev/null 2>&1 &&
       XDT_PROG_AUTOHEADER=${i} && break
@@ -534,7 +534,7 @@ XGETTEXT_ARGS = @XGETTEXT_ARGS@
    cd ${source_dir} &&
    ${XDT_PROG_ACLOCAL} ${ACLOCAL_FLAGS}) || exit 1
 
-  if grep -q "^AM_CONFIG_HEADER" "${configure_file}"; then
+  if grep -q -E "^A(M|C)_CONFIG_HEADER" "${configure_file}"; then
     (echo "Running ${XDT_PROG_AUTOHEADER}..." &&
      cd ${source_dir} &&
      ${XDT_PROG_AUTOHEADER}) || exit 1