org.guifications.plugins.buildsystem_rewrite: 2b2795450e06a0a278d1b664bad92bc9092f8b51

[grim at guifications.org]

-----------------------------------------------------------------
Revision: 2b2795450e06a0a278d1b664bad92bc9092f8b51
Ancestor: bb213ab0dd13c157983c938e87543dd046926b21
Author: grim at guifications.org
Date: 2008-04-26T23:00:22
Branch: org.guifications.plugins.buildsystem_rewrite

Modified files:
        Makefile.am autogen.sh configure.ac

ChangeLog: 

A better fix for dynamic AC_OUTPUTS, this could use some cleanup, but works as is


-----------------------------------------------------------------
This revision's diffstat output:
 Makefile.am  |    1 +
 autogen.sh   |   24 +++++++++++++++++++++++-
 configure.ac |   18 +++---------------
 3 files changed, 27 insertions(+), 16 deletions(-)
-------------- next part --------------
============================================================
--- Makefile.am	4b9cefcaf21ba87d73d4219b6fd7c5451f0dcace
+++ Makefile.am	bce5851ba39ad66c7700046d8b3c3b02b26fa648
@@ -14,6 +14,7 @@ EXTRA_DIST = \
 	intltool-merge.in \
 	intltool-update.in \
 	menuconfig \
+	plugin_pack.m4 \
 	plugin_pack.py \
 	plugin_pack.spec \
 	po/AUTHORS \
============================================================
--- autogen.sh	3f0a0621283a72ddf5352e2c9028d48d383b8889
+++ autogen.sh	0ba3b7ee3b2d8c0251364182c16e982778e22cc8
@@ -53,9 +53,11 @@ check () {
 ###############################################################################
 check () {
 	CMD=$1
+	shift
+	ARGS=$@
 
 	echo -n "checking for ${CMD}... "
-	BIN=`which ${CMD} 2>/dev/null`
+	BIN=`which ${CMD} $@ 2>/dev/null`
 
 	if [ x"${BIN}" = x"" ] ; then
 		echo "not found."
@@ -123,8 +125,28 @@ check "autoconf";		AUTOCONF=${BIN};
 check "autoheader";		AUTOHEADER=${BIN};
 check "automake";		AUTOMAKE=${BIN};
 check "autoconf";		AUTOCONF=${BIN};
+check "python" -V;		PYTHON=${BIN};
 
 ###############################################################################
+# Build pluginpack.m4
+###############################################################################
+CONFIG_FILE="plugin_pack.m4"
+
+if [ -f ${CONFIG_FILE} ]
+then
+	rm -f ${CONFIG_FILE}
+fi
+
+echo -n "creating ${CONFIG_FILE} ..."
+printf "AC_CONFIG_FILES([\n" >> ${CONFIG_FILE}
+for DIR in `${PYTHON} plugin_pack.py dist_dirs`
+do
+	printf "\t%s\n" ${DIR}/Makefile >> ${CONFIG_FILE}
+done
+printf "])\n" >> ${CONFIG_FILE}
+echo " done."
+
+###############################################################################
 # Run all of our helpers
 ###############################################################################
 run_or_die ${LIBTOOLIZE} -c -f --automake ${LIBTOOLIZE_FLAGS}
============================================================
--- configure.ac	0d36106c62417864129cd1d4b1c05ff2f507442f
+++ configure.ac	b114bd6f30b667d01440f606d403a67af15f0e2b
@@ -334,25 +334,13 @@ AC_SUBST(PP_DIST_DIRS)
 PP_DIST_DIRS="`$srcdir/plugin_pack.py dist_dirs`"
 AC_SUBST(PP_DIST_DIRS)
 
-PP_DIST_MAKE=""
-for dir in $PP_DIST_DIRS
-do
-	PP_DIST_MAKE="$PP_DIST_MAKE $dir/Makefile"
-done
-
 dnl #######################################################################
 dnl # Finish up
 dnl #######################################################################
-dnl # This is a hack to have a dynamically generated list of files for
-dnl # AC_OUTPUT.  AC_OUTPUT still needs to be called, but as long as this
-dnl # is tweaked before hand everything is fine.
-dnl #
-dnl # So to make this work, we call AC_OUTPUT with our static config files
-dnl # after we've updated ac_config_files to have our dynamic list, we do
-dnl # our normal AC_OUTPUT and all is well.
-dnl #######################################################################
-ac_config_files="$ac_config_files ${PP_DIST_MAKE}"
 
+dnl #include the list of plugins that was created by autogen
+m4_include([plugin_pack.m4])
+
 AC_OUTPUT([Makefile
 		   common/Makefile
 		   doc/Makefile