[Gaim-commits] CVS: gaim configure.ac,1.300,1.301

[Piotr Z. <zi...@us...>]

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23404

Modified Files:
	configure.ac 
Log Message:


Gaim-DBUS signal export works with DBUS >= 0.35

Various gaim API functions available through DBUS


Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -d -p -r1.300 -r1.301
--- configure.ac	13 Jul 2005 00:59:28 -0000	1.300
+++ configure.ac	22 Jul 2005 19:47:26 -0000	1.301
@@ -310,12 +310,12 @@ dnl ####################################
 
 AC_ARG_ENABLE(dbus,     [  --enable-dbus           enable DBUS support],,enable_dbus=no)
 
-if test "x$enable_dbus" = "xyes"; then
+if test "x$enable_dbus" = "xyes" ; then
    AC_CHECK_PROG(enable_dbus, dbus-binding-tool, yes, no)
 fi
 
-if test "x$enable_dbus" = "xyes"; then
-   	PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.34 dbus-glib-1 >= 0.34],
+if test "x$enable_dbus" = "xyes" ; then
+   	PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.35 dbus-glib-1 >= 0.35],
 	[
 		AC_SUBST(DBUS_CFLAGS)
 		AC_SUBST(DBUS_LIBS)
@@ -331,7 +331,35 @@ if test "x$enable_dbus" = "xyes"; then
 	fi
 fi
 
-if test "x$enable_dbus" = "xyes"; then
+dnl  Why do we need python?  
+
+dnl  Python scripts are used to auto-generate about 3000 lines of C
+dnl  and XML code that wraps (part of) the existing Gaim API so that
+dnl  it is now accessible through DBUS.
+
+dnl  Python is only required if --enable-dbus is used, and only for
+dnl  the build process to generate the code, not for running gaim.
+dnl  This autogenerated code is system-independent, so in principle we
+dnl  can generate all of it before shipping.  But I thought adding
+dnl  auto-generated stuff to the CVS is inelegant.  Alternatively,
+dnl  these python scripts could be rewritten in C (brrrr ...).
+
+if test "x$enable_dbus" = "xyes" ; then
+        AC_PATH_PROG([PYTHON], [python], [no])
+	if test "x$PYTHON" = "xno" ; then
+		AC_MSG_WARN([python interpreter not found in your path])
+		enable_dbus=no
+	fi
+fi
+
+if test "x$enable_dbus" = "xyes" ; then
+	if $PYTHON -c "import sys; sys.exit(sys.version[[:3]] >= '2.4')" ; then
+		AC_MSG_WARN([python version >= 2.4 required])
+		enable_dbus=no
+	fi	
+fi
+
+if test "x$enable_dbus" = "xyes" ; then
    	AC_DEFINE(HAVE_DBUS, 1, [Define if we're using DBUS.])
 	echo "Building with DBUS support"
 else