changeset 442:94c531f0c0a4

.. and more fixes. :|
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 06 Jan 2007 11:05:05 +0000
parents 7a1e7fac56c0
children 62fc59951eda
files bootstrap.sh
diffstat 1 files changed, 12 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/bootstrap.sh	Sat Jan 06 09:22:05 2007 +0000
+++ b/bootstrap.sh	Sat Jan 06 11:05:05 2007 +0000
@@ -57,7 +57,16 @@
 fi
 }
 
-# Check and run autotools
+# Check available m4 macro paths
+aclocal_opts=$ACLOCAL_FLAGS
+for i in /usr /usr/local /usr/sfw /opt/gnome; do
+	j="$i/share/aclocal"
+	if test -d "$j"; then
+		aclocal_opts="$aclocal_opts -I $j"
+	fi
+done
+
+# Check if gettext is used
 for i in configure.ac configure.in; do
 	if test -e "$i"; then
 		k=`grep AM_GNU_GETTEXT $i`
@@ -71,18 +80,13 @@
 	echo "* GNU gettext not used by the package, skipping."
 fi
 
-aclocal_opts=""
-for i in /usr/share/aclocal /usr/local/share/aclocal; do
-	if test -d "$i"; then
-		aclocal_opts="$aclocal_opts -I $i"
-	fi
-done
-
+# Check and run autotools
 ftest_am_package "aclocal" "-I . $aclocal_opts"
 ftest_ac_package "libtoolize" "--automake --force"
 ftest_am_package "automake" "-a -c -f --foreign"
 ftest_ac_package "autoconf" ""
 
+# Check if Glade is used and run it for each file
 k=`echo *.glade`
 if test "x$k" != "x*.glade"; then
 	echo "* Glade XML files found, processing ..."