When doing sanity checking on ACLOCAL_FLAGS, look for glib-2.0.m4 not

[~andy/gtk] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index d2c55586db1f708c0a4135ecaa98e599242833ad..f756f1caf224c87b208f50ca2e0151b0799f4f7d 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
 PROJECT=Gtk+
 TEST_TYPE=-d
 FILE=gdk
@@ -15,14 +20,6 @@ DIE=0
        DIE=1
 }
 
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
-       echo
-       echo "You must have libtool installed to compile $PROJECT."
-       echo "Get ftp://alpha.gnu.org/gnu/libtool-1.2b.tar.gz"
-       echo "(or a newer version if it is available)"
-       DIE=1
-}
-
 (automake --version) < /dev/null > /dev/null 2>&1 || {
        echo
        echo "You must have automake installed to compile $PROJECT."
@@ -49,15 +46,47 @@ case $CC in
 *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
 esac
 
+if test -z "$ACLOCAL_FLAGS"; then
+
+       acdir=`aclocal --print-ac-dir`
+        m4list="glib-2.0.m4 gettext.m4"
+
+       for file in $m4list
+       do
+               if [ ! -f "$acdir/$file" ]; then
+                       echo "WARNING: aclocal's directory is $acdir, but..."
+                       echo "         no file $acdir/$file"
+                       echo "         You may see fatal macro warnings below."
+                       echo "         If these files are installed in /some/dir, set the ACLOCAL_FLAGS "
+                       echo "         environment variable to \"-I /some/dir\", or install"
+                       echo "         $acdir/$file."
+                       echo ""
+               fi
+       done
+fi
+
+echo "Running gettextize...  Ignore non-fatal messages."
+# Hmm, we specify --force here, since otherwise things dont'
+# get added reliably, but we don't want to overwrite intl
+# while making dist.
+echo "no" | gettextize --copy --force
+
+#
+# Really bad hack
+echo "Munging po/Makefile.in.in"
+sed s%@PACKAGE@%@GETTEXT_PACKAGE@% < po/Makefile.in.in > po/Makefile.in.in.new
+mv po/Makefile.in.in.new po/Makefile.in.in
+
 aclocal $ACLOCAL_FLAGS
 
 # optionally feature autoheader
 (autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
 
-automake $am_opt
+automake -a $am_opt
 autoconf
+cd $ORIGDIR
 
-./configure "$@"
+$srcdir/configure --enable-maintainer-mode "$@"
 
 echo 
 echo "Now type 'make' to compile $PROJECT."