Mercurial > pidgin
changeset 24341:a41e0d8ddae4
- 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.
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Thu, 30 Oct 2008 19:56:54 +0000 |
| parents | d38d854cd0bf |
| children | 3324f099a212 |
| files | autogen.sh |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/autogen.sh Thu Oct 30 19:53:55 2008 +0000 +++ b/autogen.sh Thu Oct 30 19:56:54 2008 +0000 @@ -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 @@ ############################################################################### 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 echo "found." printf "%s" "sourcing ${ARGS_FILE}: " - . ${ARGS_FILE} + . "`dirname "$0"`"/${ARGS_FILE} echo "done." else echo "not found." @@ -125,8 +127,8 @@ # 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};