[Gaim-commits] CVS: gaim autogen.sh,1.14.2.2,1.14.2.3

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv28942

Modified Files:
      Tag: gtk1-stable
	autogen.sh 
Log Message:
Syncing autogen.sh.


Index: autogen.sh
===================================================================
RCS file: /cvsroot/gaim/gaim/autogen.sh,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -d -r1.14.2.2 -r1.14.2.3
--- autogen.sh	26 Aug 2002 05:27:53 -0000	1.14.2.2
+++ autogen.sh	28 Sep 2002 22:13:48 -0000	1.14.2.3
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-(./setup-gettext --gettext-tool) < /dev/null > /dev/null 2>&1 || {
+SETUP_GETTEXT=./setup-gettext
+
+($SETUP_GETTEXT --gettext-tool) < /dev/null > /dev/null 2>&1 || {
 	echo;
 	echo "You must have gettext installed to compile Gaim";
 	echo;
@@ -47,13 +49,24 @@
 cp -p po/ChangeLog po/ChangeLog.save
 
 echo "Running gettextize, please ignore non-fatal messages...."
-./setup-gettext
+$SETUP_GETTEXT
 
 # Restore the po/ChangeLog file.
 mv po/ChangeLog.save po/ChangeLog
 
 echo "Running libtoolize, please ignore non-fatal messages...."
 echo n | libtoolize --copy --force || exit;
+
+# Add other directories to this list if people continue to experience
+# brokennesses ...  Obviously the real answer is for them to fix it
+# themselves, but for Luke's sake we have this.
+for dir in "/usr/local/share/aclocal" \
+           "/opt/gnome-1.4/share/aclocal"
+do
+	if test -d $dir ; then
+		ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $dir"
+	fi
+done
 
 aclocal -I m4 $ACLOCAL_FLAGS || exit;
 autoheader || exit;