org.guifications.plugins.buildsystem_rewrite: a30c55c47ce6e3b7763ece18d2e71de22b07a5f2

[grim at guifications.org]

-----------------------------------------------------------------
Revision: a30c55c47ce6e3b7763ece18d2e71de22b07a5f2
Ancestor: 26f2492739ac44a43d47c6388f4fb12c51863a15
Author: grim at guifications.org
Date: 2008-04-28T01:03:21
Branch: org.guifications.plugins.buildsystem_rewrite

Modified files:
        configure.ac plugin_pack.py

ChangeLog: 

PP_DIST_DIRS now gets thrown into plugin_pack.m4 during autogen
Other random stuff

-----------------------------------------------------------------
This revision's diffstat output:
 configure.ac   |   13 +++++--------
 plugin_pack.py |   13 +++++++++----
 2 files changed, 14 insertions(+), 12 deletions(-)
-------------- next part --------------
============================================================
--- configure.ac	d529ab9f7c3c2fb7739e6808b2950f0df30239ef
+++ configure.ac	26ec07bbc98b15c04a4397a65894f1b22e863d9a
@@ -326,21 +326,18 @@ dnl ####################################
 ])
 
 dnl #######################################################################
-dnl # We've looked for all our dependencies and everything, now we need
-dnl # to check for python, and pass everything on to plugin_pack.py
+dnl # plugin_pack.py has already done our heavy lifting from the boot
+dnl # strap.  So we'll include our config file it created and call it to
+dnl # determine our build directories
 dnl #######################################################################
 AC_PATH_PROG([PYTHON], [python], [no])
 
-PP_DIST_DIRS="`$PYTHON $srcdir/plugin_pack.py dist_dirs`"
-AC_SUBST(PP_DIST_DIRS)
+dnl # include the config file we created during bootstrapping
+m4_include([plugin_pack.m4])
 
 dnl #######################################################################
 dnl # Finish up
 dnl #######################################################################
-
-dnl #include the list of plugins that was created by autogen
-m4_include([plugin_pack.m4])
-
 AC_OUTPUT([Makefile
 		   common/Makefile
 		   doc/Makefile
============================================================
--- plugin_pack.py	02c6eda2523296d03d3d8a748c54cf6e336a4393
+++ plugin_pack.py	7db0359c5344e55a38ed0e6e3148bd13654d6487
@@ -207,10 +207,15 @@ class PluginPack:
 
 	def config_file(self, args):
 		"""Outputs the contents for the file to be m4_include()'d from configure"""
-		print "AC_CONFIG_FILES(["
-		for dir in self.unique_dirs():
-			print "\t%s/Makefile" % (dir)
-		print "])"
+		uniqdirs = self.unique_dirs()
+
+		print 'PP_DIST_DIRS="%s"' % (string.join(uniqdirs, ' '))
+		print 'AC_SUBST(PP_DIST_DIRS)'
+		print
+		print 'AC_CONFIG_FILES(['
+		for dir in uniqdirs:
+			print '\t%s/Makefile' % (dir)
+		print '])'
 	commands['config_file'] = config_file
 
 	def dependency_graph(self, args):