Index: autogen.sh
===================================================================
RCS file: /cvs/gnome/gimp/autogen.sh,v
retrieving revision 1.77
diff -u -r1.77 autogen.sh
--- autogen.sh	19 Sep 2005 13:15:30 -0000	1.77
+++ autogen.sh	6 Dec 2005 04:28:33 -0000
@@ -1,4 +1,4 @@
-#!/bin/sh 
+#!/bin/sh
 
 # This script does all the magic calls to automake/autoconf and
 # friends that are needed to configure a cvs checkout.  As described in
@@ -9,6 +9,20 @@
 # tools and you shouldn't use this script.  Just call ./configure
 # directly.
 
+ACLOCAL=aclocal
+AUTOCONF=autoconf
+AUTOHEADER=autoheader
+AUTOMAKE=automake
+LIBTOOLISE=libtoolize
+
+# Values for FreeBSD
+#ACLOCAL=aclocal19
+#AUTOCONF=autoconf259
+#AUTOHEADER=autoheader259
+#AUTOMAKE=automake19
+#LIBTOOLIZE=libtoolize15
+## This can be different depending on where you install XFree86/Xorg
+#ACLOCAL_FLAGS="-I /usr/X11R6/share/aclocal/ -I /usr/local/gnu-autotools/share/aclocal/ -I /usr/local/share/aclocal/"
 
 PROJECT="GNU Image Manipulation Program"
 TEST_TYPE=-d
@@ -58,8 +72,8 @@
 
 
 echo -n "checking for libtool >= $LIBTOOL_REQUIRED_VERSION ... "
-if (libtoolize --version) < /dev/null > /dev/null 2>&1; then
-   LIBTOOLIZE=libtoolize
+if ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1; then
+   LIBTOOLIZE=$LIBTOOLIZE
 elif (glibtoolize --version) < /dev/null > /dev/null 2>&1; then
    LIBTOOLIZE=glibtoolize
 else
@@ -107,8 +121,8 @@
 fi
 
 echo -n "checking for autoconf >= $AUTOCONF_REQUIRED_VERSION ... "
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-    VER=`autoconf --version \
+if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1; then
+    VER=`$AUTOCONF --version \
          | grep -iw autoconf | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"`
     check_version $VER $AUTOCONF_REQUIRED_VERSION
 else
@@ -122,7 +136,10 @@
 
 
 echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
-if (automake-1.9 --version) < /dev/null > /dev/null 2>&1; then
+if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=$AUTOMAKE
+   ACLOCAL=$ACLOCAL
+elif (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
@@ -260,14 +277,12 @@
 fi
 
 # optionally feature autoheader
-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader || exit 1
-
-$AUTOMAKE --add-missing || exit $?
-autoconf || exit $?
-
-glib-gettextize --force || exit $?
-intltoolize --force --automake || exit $?
+($AUTOHEADER --version)  < /dev/null > /dev/null 2>&1 && $AUTOHEADER || exit 1
 
+$AUTOMAKE --add-missing || exit 1
+$AUTOCONF || exit 1
+glib-gettextize --force || exit 1
+intltoolize --force --automake || exit 1
 
 cd $ORIGDIR