org.guifications.plugins.buildsystem_rewrite: dca1d43976c3ab8798b1da9a32c6abc577f19194

[grim at guifications.org]

-----------------------------------------------------------------
Revision: dca1d43976c3ab8798b1da9a32c6abc577f19194
Ancestor: 33488d8719a4a3032282b5d784a8369ce900bf1d
Author: grim at guifications.org
Date: 2008-03-31T03:43:55
Branch: org.guifications.plugins.buildsystem_rewrite

Modified files:
        configure.ac

ChangeLog: 

Cleaned up configure.ac a bit
Added a new variable 'DEPENDENCIES' to keep track of the dependencies we've found to pass later to plugin_pack.py


-----------------------------------------------------------------
This revision's diffstat output:
 configure.ac |   33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)
-------------- next part --------------
============================================================
--- configure.ac	3f4f9d1e1f84acb9e40cd16545420bf30a2302e0
+++ configure.ac	34aaf6f748b7ca1ce196b5a893e30b249507c0dd
@@ -12,6 +12,11 @@ dnl ####################################
 AC_DISABLE_STATIC
 
 dnl #######################################################################
+dnl # Initialize some variables that get passed to plugin_pack.py
+dnl #######################################################################
+DEPENDENCIES=""
+
+dnl #######################################################################
 dnl # Setup libtool
 dnl #######################################################################
 AM_PROG_LIBTOOL
@@ -72,6 +77,7 @@ AM_CONDITIONAL(HAVE_PURPLE, true)
 
 HAVE_PURPLE="yes"
 AM_CONDITIONAL(HAVE_PURPLE, true)
+DEPENDENCIES="$DEPENDENCIES purple"
 
 if test x"$prefix" = x"NONE" ; then
 	PURPLE_LIBDIR=`pkg-config --variable=libdir purple`
@@ -113,6 +119,7 @@ PKG_CHECK_MODULES(PIDGIN, pidgin,
 	AC_DEFINE(HAVE_PIDGIN, 1, [Define if we've found pidgin.])
 	HAVE_PIDGIN="yes"
 	AM_CONDITIONAL(HAVE_PIDGIN, true)
+	DEPENDENCIES="$DEPENDENCIES pidgin"
 ], [
 	AC_MSG_RESULT([no])
 	HAVE_PIDGIN="no"
@@ -152,6 +159,7 @@ PKG_CHECK_MODULES(FINCH, finch,
 	AC_DEFINE(HAVE_FINCH, 1, [Define if we've found finch.])
 	HAVE_FINCH="yes"
 	AM_CONDITIONAL(HAVE_FINCH, true)
+	DEPENDENCIES="$DEPENDENCIES finch"
 ], [
 	AC_MSG_RESULT([no])
 	HAVE_FINCH="no"
@@ -205,10 +213,8 @@ dnl ####################################
 AC_SUBST(GTK_LIBS)
 
 dnl #######################################################################
-dnl # Plugin dependency checking
+dnl # Check for talkfilters
 dnl #######################################################################
-
-# talkfilters
 AC_CHECK_HEADER(talkfilters.h, HAVE_TALKFILTERS=yes, AC_MSG_WARN([
 *** GNU Talk Filters is required to build the talkfilters plugin;
 *** please make sure you have the GNU Talk Filters development headers installed.
@@ -221,9 +227,13 @@ if test x"$HAVE_TALKFILTERS" = x"yes"; t
 	dnl work out that the library exists
 	AC_CHECK_LIB(talkfilters, gtf_filter_count, TALKFILTERS_LIBS="-ltalkfilters")
 	AC_SUBST(TALKFILTERS_LIBS)
+
+	DEPENDENCIES="$DEPENDENCIES talkfilters"
 fi
 
-# switchspell
+dnl #######################################################################
+dnl # Check for switchspell
+dnl #######################################################################
 gtkspell=yes
 PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.2, [], [gtkspell=no])
 AC_SUBST(GTKSPELL_CFLAGS)
@@ -238,9 +248,16 @@ fi
 		BUILD_SWITCH_SPELL=no
 	fi
 fi
+
 AM_CONDITIONAL(BUILD_SWITCH_SPELL, test x"$BUILD_SWITCH_SPELL" = x"yes")
 
-# xmmsremote
+if test x"$BUILD_SWITCH_SPELL" = x"yes" ; then
+	DEPENDENCIES="$DEPENDENCIES switchspell"
+fi
+
+dnl #######################################################################
+dnl # Check for xmms
+dnl #######################################################################
 XMMS_LIBS=""
 XMMS_CFLAGS=""
 HAVE_XMMS="no"
@@ -264,6 +281,8 @@ if test x"$XMMS_CONFIG" != x"no" ; then
 
 	if test x"$HAVE_XMMS" = x"yes" ; then
 		AC_MSG_RESULT([yes])
+
+		DEPENDENCIES="$DEPENDENCIES xmms"
 	else
 		AC_MSG_RESULT([no])
 	fi
@@ -272,6 +291,9 @@ AC_SUBST(XMMS_CFLAGS)
 AC_SUBST(XMMS_LIBS)
 AC_SUBST(XMMS_CFLAGS)
 
+dnl #######################################################################
+dnl # Check for some basic headers
+dnl #######################################################################
 AC_CHECK_HEADERS(regex.h)
 
 dnl #######################################################################
@@ -296,7 +318,6 @@ AC_SUBST(PP_DIST_DIRS)
 
 PP_DIST_DIRS="`$srcdir/plugin_pack.py -D`"
 AC_SUBST(PP_DIST_DIRS)
-echo $PP_DIST_DIRS
 
 dnl #######################################################################
 dnl # Finish up