Less logging verbiage.

[~andy/gtk] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index c298ddee64fda3d0cc2e6afeb6b811259021aa9d..fa0fabfa2e443ac26c10235a7f534183f0131f8a 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,27 +1,28 @@
 #!/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
+
 DIE=0
 
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
        echo
-       echo "You must have autoconf installed to compile GTK+."
+       echo "You must have autoconf installed to compile $PROJECT."
        echo "Download the appropriate package for your distribution,"
        echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
        DIE=1
 }
 
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
-       echo
-       echo "You must have libtool installed to compile GTK+."
-       echo "Get ftp://alpha.gnu.org/gnu/libtool-1.0h.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 GTK+."
+       echo "You must have automake installed to compile $PROJECT."
        echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz"
        echo "(or a newer version if it is available)"
        DIE=1
@@ -31,8 +32,8 @@ if test "$DIE" -eq 1; then
        exit 1
 fi
 
-(test -d gtk && test -d glib) || {
-       echo "You must run this script in the top-level GTK+ directory"
+test $TEST_TYPE $FILE || {
+       echo "You must run this script in the top-level $PROJECT directory"
        exit 1
 }
 
@@ -41,12 +42,45 @@ if test -z "$*"; then
         echo "to pass any to it, please specify them on the $0 command line."
 fi
 
-for i in glib .
-do 
-  echo processing $i
-  (cd $i; aclocal; automake; autoconf)
-done
-./configure "$@"
+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.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
+
+aclocal $ACLOCAL_FLAGS
+
+# optionally feature autoheader
+(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
+
+automake -a $am_opt
+autoconf
+cd $ORIGDIR
+
+$srcdir/configure "$@"
 
 echo 
-echo "Now type 'make' to compile GTK+."
+echo "Now type 'make' to compile $PROJECT."