gnome-common: Support for configure.ac?

[Sebastian Rittau <srittau jroger in-berlin de>]

Hi!

Since I don't know who's responsible for the gnome-common module, and
since there's no Bugzilla product for it, I'm sending this here.

I would really like to see for configure.ac autoconf source files in
gnome-autoconf.sh. I've attached a patch that works for me. Okay to
commit?

 - Sebastian

Index: macros2/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-common/macros2/ChangeLog,v
retrieving revision 1.34
diff -u -r1.34 ChangeLog
--- macros2/ChangeLog	10 May 2002 20:19:07 -0000	1.34
+++ macros2/ChangeLog	1 Aug 2002 19:46:03 -0000
@@ -1,3 +1,7 @@
+2002-08-01  Sebastian Rittau  <srittau jroger in-berlin de>
+
+	* autogen.sh: support for configure.ac
+
 2002-05-10  Chema Celorio  <chema celorio com>
 
 	* compiler-flags.m4: fix GNOME_COMPILE_WARNINGS to work when a parameter is
Index: macros2/autogen.sh
===================================================================
RCS file: /cvs/gnome/gnome-common/macros2/autogen.sh,v
retrieving revision 1.15
diff -u -r1.15 autogen.sh
--- macros2/autogen.sh	13 Feb 2002 20:52:39 -0000	1.15
+++ macros2/autogen.sh	1 Aug 2002 19:46:04 -0000
@@ -19,7 +19,15 @@
   DIE=1
 }
 
-(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
+# Determine whether to use configure.in or configure.ac
+
+if [ -f $srcdir/configure.ac ]; then
+  CONFIGURE="$srcdir/configure.ac"
+else
+  CONFIGURE="$srcdir/configure.in"
+fi
+
+(grep "^AC_PROG_INTLTOOL" "$CONFIGURE" >/dev/null) && {
   (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME."
@@ -29,7 +37,7 @@
   }
 }
 
-(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.in >/dev/null) && {
+(grep "^AM_PROG_XML_I18N_TOOLS" "$CONFIGURE" >/dev/null) && {
   (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`xml-i18n-toolize' installed to compile $PKG_NAME."
@@ -39,7 +47,7 @@
   }
 }
 
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
+(grep "^AM_PROG_LIBTOOL" "$CONFIGURE" >/dev/null) && {
   (libtool --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed to compile $PKG_NAME."
@@ -50,11 +58,11 @@
 }
 
 
-if grep "^AM_[A-Z0-9_]\{1,\}_GETTEXT" $srcdir/configure.in >/dev/null; then
-  if grep "sed.*POTFILES" $srcdir/configure.in >/dev/null; then
+if grep "^AM_[A-Z0-9_]\{1,\}_GETTEXT" "$CONFIGURE" >/dev/null; then
+  if grep "sed.*POTFILES" "$CONFIGURE" >/dev/null; then
     GETTEXTIZE=""
   else
-    if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then
+    if grep "^AM_GLIB_GNU_GETTEXT" "$CONFIGURE" >/dev/null; then
       GETTEXTIZE="glib-gettextize"
       GETTEXTIZE_URL="ftp://ftp.gtk.org/pub/gtk/v1.3/glib-1.3.11.tar.gz";
     else
@@ -109,9 +117,10 @@
   am_opt=--include-deps;;
 esac
 
-for coin in `find $srcdir -name configure.in -print`
+for coin in `find $srcdir -name configure.in -or -name configure.ac -print`
 do 
   dr=`dirname $coin`
+  bn=`basename $coin`
   if test -f $dr/NO-AUTO-GEN; then
     echo skipping $dr -- flagged as no auto-gen
   else
@@ -128,15 +137,15 @@
 	echo "Making $dr/aclocal.m4 writable ..."
 	test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
       fi
-      if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
+      if grep "^AC_PROG_INTLTOOL" $bn >/dev/null; then
         echo "Running intltoolize..."
 	intltoolize --copy --force --automake
       fi
-      if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then
+      if grep "^AM_PROG_XML_I18N_TOOLS" $bn >/dev/null; then
         echo "Running xml-i18n-toolize..."
 	xml-i18n-toolize --copy --force --automake
       fi
-      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
+      if grep "^AM_PROG_LIBTOOL" $bn >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
 	  echo "Running libtoolize..."
 	  libtoolize --force --copy
@@ -144,7 +153,7 @@
       fi
       echo "Running aclocal $aclocalinclude ..."
       aclocal $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
+      if grep "^AM_CONFIG_HEADER" $bn >/dev/null; then
 	echo "Running autoheader..."
 	autoheader
       fi