# HG changeset patch # User Stu Tomlinson # Date 1206979433 0 # Node ID 34111ec2a6eb314e8f8d523a5f7d796f8993eaff # Parent bc8768537a85858acd2d0d08fa182e51d4b57fd1 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. diff -r bc8768537a85 -r 34111ec2a6eb autogen.sh --- a/autogen.sh Mon Mar 31 14:55:42 2008 +0000 +++ b/autogen.sh Mon Mar 31 16:03:53 2008 +0000 @@ -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 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 @@ ############################################################################### # 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