pidgin: 35800b68: Make the new autogen.sh behave more like...
nosnilmot at pidgin.im
nosnilmot at pidgin.im
Mon Mar 31 12:10:48 EDT 2008
-----------------------------------------------------------------
Revision: 35800b680594b4a9a13085c006dbde401d9ab541
Ancestor: 4a3f8db7fb70f078e5dc1a6837efcac4b8733ebd
Author: nosnilmot at pidgin.im
Date: 2008-03-31T16:03:53
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/35800b680594b4a9a13085c006dbde401d9ab541
Modified files:
autogen.sh
ChangeLog:
Make the new autogen.sh behave more like the old one - run glib-gettextize,
and don't force updates to files when running autoconf and automake. I also
made it so any custom AUTO*_FLAGS specified will override the default
arguments instead of just appending to them.
-------------- next part --------------
============================================================
--- autogen.sh 6a1327239ae865d54779b4d9f124c47ce4de1e0e
+++ autogen.sh d1a7cb26c5bc9185f827952969fd70b3268bd4b3
@@ -33,6 +33,7 @@
# AUTOHEADER_FLAGS - command line arguments to pass to autoheader
# AUTOMAKE_FLAGS - command line arguments to pass to automake flags
# CONFIGURE_FLAGS - command line arguments to pass to configure
+# GLIB_GETTEXTIZE_FLAGS - command line arguments to pass to glib-gettextize
# INTLTOOLIZE_FLAGS - command line arguments to pass to intltoolize
# LIBTOOLIZE_FLAGS - command line arguments to pass to libtoolize
#
@@ -112,6 +113,7 @@ check "libtoolize"; LIBTOOLIZE=${BIN};
# Check for our required helpers
###############################################################################
check "libtoolize"; LIBTOOLIZE=${BIN};
+check "glib-gettextize"; GLIB_GETTEXTIZE=${BIN};
check "intltoolize"; INTLTOOLIZE=${BIN};
check "aclocal"; ACLOCAL=${BIN};
check "autoheader"; AUTOHEADER=${BIN};
@@ -121,12 +123,13 @@ check "autoconf"; AUTOCONF=${BIN};
###############################################################################
# Run all of our helpers
###############################################################################
-run_or_die ${LIBTOOLIZE} -c -f --automake ${LIBTOOLIZE_FLAGS}
-run_or_die ${INTLTOOLIZE} -c -f --automake ${INTLTOOLIZE_FLAGS}
-run_or_die ${ACLOCAL} -I m4macros ${ACLOCAL_FLAGS}
+run_or_die ${LIBTOOLIZE} ${LIBTOOLIZE_FLAGS-"-c -f --automake"}
+run_or_die ${GLIB_GETTEXTIZE} ${GLIB_GETTEXTIZE_FLAGS-"--force --copy"}
+run_or_die ${INTLTOOLIZE} ${INTLTOOLIZE_FLAGS-"-c -f --automake"}
+run_or_die ${ACLOCAL} ${ACLOCAL_FLAGS-"-I m4macros"}
run_or_die ${AUTOHEADER} ${AUTOHEADER_FLAGS}
-run_or_die ${AUTOMAKE} -a -c -f --gnu ${AUTOMAKE_FLAGS}
-run_or_die ${AUTOCONF} -f ${AUTOCONF_FLAGS}
+run_or_die ${AUTOMAKE} ${AUTOMAKE_FLAGS-"-a -c --gnu"}
+run_or_die ${AUTOCONF} ${AUTOCONF_FLAGS}
###############################################################################
# Run configure
More information about the Commits
mailing list