org.guifications.plugins: 209405345caa4f42e579ed04b37cd8d7f23be0d1

[grim at guifications.org]

-----------------------------------------------------------------
Revision: 209405345caa4f42e579ed04b37cd8d7f23be0d1
Ancestor: 773e504567036121705fba5d0878dbf8153aceda
Author: grim at guifications.org
Date: 2008-03-13T01:50:29
Branch: org.guifications.plugins

Modified files:
        ChangeLog m4/pluginpack.m4

ChangeLog: 

And i give you a full working --with-plugins=(all,default,comma separated list of plugins)


-----------------------------------------------------------------
This revision's diffstat output:
 ChangeLog        |    2 +
 m4/pluginpack.m4 |   69 +++++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 54 insertions(+), 17 deletions(-)
-------------- next part --------------
============================================================
--- ChangeLog	b4413483a340e9dfd2fb07f10f871b838dba2bff
+++ ChangeLog	e9538e4dba47a25be8941ba63b752d2295d1e485
@@ -13,6 +13,8 @@ Version 2.3.0mtn:
 	* Napster plugin now builds by default.
 	* Removed the broadcast plugin.
 	* Memory leak fixes
+	* Fixed the --with-plugins configure argument.  It now correctly handles
+	  all, default, and a comma separated list of plugins.
 
 Version 2.2.0: 10/25/07
 	* Added 'menuconfig' script to make it easier to select what plugins to
============================================================
--- m4/pluginpack.m4	be84013d2d831b140578fc651d9a4d15dce5cffa
+++ m4/pluginpack.m4	013d44a9bd3c420e40ad14a21a070736353b3571
@@ -96,30 +96,65 @@ AC_DEFUN([AM_BUILD_PLUGIN_LIST],
 	dnl #######################################################################
 	AC_ARG_WITH(plugins,
 				AC_HELP_STRING([--with-plugins], [what plugins to build]),
-				,with_plugins=all)
+				,with_plugins=default)
 
 	dnl #######################################################################
 	dnl # Now determine which ones have been selected
 	dnl #######################################################################
-	if test "x$with_plugins" = "xdefault" ; then
-		tmp_SUB="$PP_AVAILABLE"
-	else
-		exp_plugins=`echo "$with_plugins" | sed 's/,/ /g'`
-		for p in "$PP_AVAILABLE $PP_ABUSIVE"; do
-			for r in $exp_plugins; do
-				if test x"$r" = x"$p" ; then
-					tmp_SUB="$tmp_SUB $p"
-				fi
-			done
-		done
-	fi
+	case "$with_plugins" in
+		all)
+			PP_FINCH_BUILD="$PP_FINCH_ABUSIVE $PP_FINCH_BUILD"
+			PP_PIDGIN_BUILD="$PP_PIDGIN_ABUSIVE $PP_PIDGIN_BUILD"
+			PP_PURPLE_BUILD="$PP_PURPLE_ABUSIVE $PP_PURPLE_BUILD"
+			;;
+		default)
+			dnl # we don't do anything if the defaults are selected, they're
+			dnl # already set up :)
+			;;
+		*)
+			dnl # clear out the build variables
+			PP_FINCH_BUILD=""
+			PP_PIDGIN_BUILD=""
+			PP_PURPLE_BUILD=""
 
-	dnl # remove duplicates
-	PP_BUILD=`echo $tmp_SUB | awk '{for (i = 1; i <= NF; i++) { print $i } }' | sort | uniq | xargs echo `
+			dnl # turn the with plugins variable into a space delimited list
+			exp_plugins=`echo "$with_plugins" | sed 's/,/ /g'`
 
-	dnl # add the abusive plugins to the dist
-	PP_DIST="$PP_AVAILABLE $PP_ABUSIVE"
+			dnl # loop through the with plugins list and update the build variables
+			dnl # as we find the plugins in each type.
+			for w in $exp_plugins
+			do
+				for p in $PP_FINCH
+				do
+					if test x"$w" = x"$p"
+					then
+						PP_FINCH_BUILD="$PP_FINCH_BUILD $p"
+					fi
+				done
 
+				for p in $PP_PIDGIN
+				do
+					if test x"$w" = x"$p"
+					then
+						PP_PIDGIN_BUILD="$PP_PIDGIN_BUILD $p"
+					fi
+				done
+
+				for p in $PP_PURPLE
+				do
+					if test x"$w" = x"$p"
+					then
+						PP_PURPLE_BUILD="$PP_PURPLE_BUILD $p"
+					fi
+				done
+			done
+	esac
+
+	dnl # sort everything
+	PP_FINCH_BUILD=`echo $PP_FINCH_BUILD | awk '{for (i = 1; i <=NF; i++) { print $i } }' | sort | uniq | xargs echo`
+	PP_PIDGIN_BUILD=`echo $PP_PIDGIN_BUILD | awk '{for (i = 1; i <=NF; i++) { print $i } } ' | sort | uniq | xargs echo`
+	PP_PURPLE_BUILD=`echo $PP_PURPLE_BUILD | awk '{for (i = 1; i <=NF; i++) { print $i } } ' | sort | uniq | xargs echo`
+
 	dnl #######################################################################
 	dnl # substitue our sub dirs
 	dnl #######################################################################