pidgin: 7c0b396d: - Make autogen.sh find autogen.args when...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 7c0b396dd7d10b1652d6ae3bfc861dbfde761301
Ancestor: 8e8e913ff6040c262bb364188317b5567707317a
Author: rlaager at pidgin.im
Date: 2008-10-30T19:56:54
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7c0b396dd7d10b1652d6ae3bfc861dbfde761301

Modified files:
        autogen.sh

ChangeLog: 

- Make autogen.sh find autogen.args when /bin/sh is not bash.
- Export CFLAGS and LDFLAGS so that doesn't have to be done in autogen.args.
- Fix a typo and some whitespace inconsistency.

-------------- next part --------------
============================================================
--- autogen.sh	6e72d2655a90947eb5ed33742d4cd7be7101683b
+++ autogen.sh	a40ee56d03ce4ed637034232086564ac2b9f4f8a
@@ -37,7 +37,7 @@
 #   INTLTOOLIZE_FLAGS - command line arguments to pass to intltoolize
 #   LIBTOOLIZE_FLAGS - command line arguments to pass to libtoolize
 #
-# Other helpfull notes:
+# Other helpful notes:
 #   If you're using a different c compiler, you can override the environment
 #   variable in 'autogen.args'.  For example, say you're using distcc, just add
 #   the following to 'autogen.args':
@@ -48,6 +48,8 @@ ARGS_FILE="autogen.args"
 ###############################################################################
 PACKAGE="Pidgin"
 ARGS_FILE="autogen.args"
+export CFLAGS
+export LDFLAGS
 
 libtoolize="libtoolize"
 case $(uname -s) in
@@ -115,7 +117,7 @@ if [ -f ${ARGS_FILE} ] ; then
 if [ -f ${ARGS_FILE} ] ; then
 	echo "found."
 	printf "%s" "sourcing ${ARGS_FILE}: "
-	. ${ARGS_FILE}
+	. "`dirname "$0"`"/${ARGS_FILE}
 	echo "done."
 else
 	echo "not found."
@@ -125,8 +127,8 @@ check "$libtoolize";		LIBTOOLIZE=${BIN};
 # Check for our required helpers
 ###############################################################################
 check "$libtoolize";		LIBTOOLIZE=${BIN};
-check "glib-gettextize"; GLIB_GETTEXTIZE=${BIN};
-check "intltoolize";	INTLTOOLIZE=${BIN};
+check "glib-gettextize";	GLIB_GETTEXTIZE=${BIN};
+check "intltoolize";		INTLTOOLIZE=${BIN};
 check "aclocal";		ACLOCAL=${BIN};
 check "autoheader";		AUTOHEADER=${BIN};
 check "automake";		AUTOMAKE=${BIN};