From ba1e888cbadda9faf445f14f919d9aed85e011e6 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Tue, 25 Apr 2006 21:04:57 +0000 Subject: Nuke the old version, copy one from gcalctool that uses gnome-autogen.sh. 2006-04-25 Elijah Newren * autogen.sh: Nuke the old version, copy one from gcalctool that uses gnome-autogen.sh. Seems to fix the translations-aren't-included-in-the-tarball problem. Fix from Rodney in IRC. --- ChangeLog | 7 +++ autogen.sh | 146 +++++-------------------------------------------------------- 2 files changed, 19 insertions(+), 134 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef87128a..10df26c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-04-25 Elijah Newren + + * autogen.sh: Nuke the old version, copy one from gcalctool that + uses gnome-autogen.sh. Seems to fix the + translations-aren't-included-in-the-tarball problem. Fix from + Rodney in IRC. + 2006-04-25 Elijah Newren * configure.in: post-release version bump to 2.15.2 diff --git a/autogen.sh b/autogen.sh index 8079212e..eff8b964 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,140 +4,18 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -ORIGDIR=`pwd` -cd $srcdir -PROJECT=metacity -TEST_TYPE=-f -FILE=src/display.c - -DIE=0 - -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $PROJECT." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/" - DIE=1 -} - -if automake-1.9 --version < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.9 - ACLOCAL=aclocal-1.9 -elif automake-1.8 --version < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.8 - ACLOCAL=aclocal-1.8 -elif automake-1.7 --version < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.7 - ACLOCAL=aclocal-1.7 -else - echo - echo "You must have automake >= 1.7 installed to compile $PROJECT." - echo "Get http://ftp.gnu.org/gnu/automake/automake-1.9.3.tar.bz2" - echo "(or a newer version if it is available)" - DIE=1 -fi - -(grep "^AM_PROG_LIBTOOL" configure.in >/dev/null) && { - (libtool --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`libtool' installed to compile $PROJECT." - echo "Get http://ftp.gnu.org/gnu/libtool/libtool-1.5.10.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 - } +PKG_NAME="metacity" +REQUIRED_AUTOMAKE_VERSION=1.7 + +(test -f $srcdir/configure.in \ + && test -d $srcdir/src) || { + echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" + echo " top-level metacity directory" + exit 1 } -CONFIGURE=configure.in -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" >/dev/null; then - GETTEXTIZE="glib-gettextize" - GETTEXTIZE_URL="ftp://ftp.gtk.org/pub/gtk/v2.0/glib-2.0.0.tar.gz" - else - GETTEXTIZE="gettextize" - GETTEXTIZE_URL="ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz" - fi - - $GETTEXTIZE --version < /dev/null > /dev/null 2>&1 - if test $? -ne 0; then - echo - echo "**Error**: You must have \`$GETTEXTIZE' installed to compile $PKG_NAME." - echo "Get $GETTEXTIZE_URL" - echo "(or a newer version if it is available)" - DIE=1 - fi - fi -fi - -if test "$DIE" -eq 1; then - exit 1 -fi - -test $TEST_TYPE $FILE || { - echo "You must run this script in the top-level $PROJECT directory" - exit 1 +which gnome-autogen.sh || { + echo "You need to install gnome-common from the GNOME CVS" + exit 1 } - -if test -z "$*"; then - echo "I am going to run ./configure with no arguments - if you wish " - echo "to pass any to it, please specify them on the $0 command line." -fi - -topdir=`pwd` -for coin in . -do - dr=`dirname $coin` - if test -f $dr/NO-AUTO-GEN; then - echo skipping $dr -- flagged as no auto-gen - else - echo processing $dr - cd $dr - if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then - if grep "sed.*POTFILES" configure.in >/dev/null; then - : do nothing -- we still have an old unmodified configure.in - else - echo "Creating $dr/aclocal.m4 ..." - test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 - echo "Running glib-gettextize... Ignore non-fatal messages." - echo "no" | glib-gettextize --force --copy || exit $? - echo "Making $dr/aclocal.m4 writable ..." - test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 - fi - fi - if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then - echo "Running intltoolize..." - intltoolize --force --copy --automake || exit $? - fi - if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then - echo "Running libtoolize..." - libtoolize --force --copy || exit $? - fi - - echo "Running $ACLOCAL $ACLOCAL_FLAGS ..." - $ACLOCAL $ACLOCAL_FLAGS || exit $? - echo "Running autoconf ..." - autoconf || exit $? - if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then - echo "Running autoheader..." - autoheader || exit $? - fi - echo "Running $AUTOMAKE..." - $AUTOMAKE --add-missing --force --gnu || exit $? - - cd $topdir - fi -done - -conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c - -cd "$ORIGDIR" - -if test x$NOCONFIGURE = x; then - echo Running $srcdir/configure $conf_flags "$@" ... - $srcdir/configure $conf_flags "$@" \ - && echo Now type \`make\' to compile $PROJECT || exit $? -else - echo Skipping configure process. -fi +USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh -- cgit v1.2.1