diff options
| author | Sebastian Rittau <srittau@src.gnome.org> | 2002-08-10 12:45:30 +0000 |
|---|---|---|
| committer | Sebastian Rittau <srittau@src.gnome.org> | 2002-08-10 12:45:30 +0000 |
| commit | 5c24c70e10b30418a562cda2b79a41fa696b5ba5 (patch) | |
| tree | e3dc992d668bf23c18eb1c67ee148ede17a143b9 | |
| parent | c81581c186792d605e56aeec8d4e5a4f8a00c772 (diff) | |
| download | gnome-common-5c24c70e10b30418a562cda2b79a41fa696b5ba5.tar.gz | |
Added support for configure.ac.
svn path=/trunk/; revision=2562
| -rw-r--r-- | macros2/ChangeLog | 4 | ||||
| -rw-r--r-- | macros2/autogen.sh | 31 |
2 files changed, 24 insertions, 11 deletions
diff --git a/macros2/ChangeLog b/macros2/ChangeLog index b0eeadb..c300231 100644 --- a/macros2/ChangeLog +++ b/macros2/ChangeLog @@ -1,3 +1,7 @@ +2002-08-10 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 diff --git a/macros2/autogen.sh b/macros2/autogen.sh index 9e5e9ed..81012ca 100644 --- a/macros2/autogen.sh +++ b/macros2/autogen.sh @@ -19,7 +19,15 @@ fi 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 @@ fi } } -(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 @@ fi } } -(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 @@ fi } -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 @@ xlc ) 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 @@ do 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 @@ do 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 |