conduit r1889 - in trunk: . conduit

[tobiasmue svn gnome org]

Author: tobiasmue
Date: Sun Feb 22 01:25:33 2009
New Revision: 1889
URL: http://svn.gnome.org/viewvc/conduit?rev=1889&view=rev

Log:
2009-02-22  Tobias Mueller  <tobiasmue svn gnome org>

    * configure.ac:
    * conduit/defs.py.in: Allow the file-impl to be selectable with a
    parameter to ./configure. Patch by Andrew Stormont.
    Fixes bug 572005.



Modified:
   trunk/ChangeLog
   trunk/conduit/defs.py.in
   trunk/configure.ac

Modified: trunk/conduit/defs.py.in
==============================================================================
--- trunk/conduit/defs.py.in	(original)
+++ trunk/conduit/defs.py.in	Sun Feb 22 01:25:33 2009
@@ -12,7 +12,7 @@
 #
 
 #{GnomeVfs, GIO, Python}
-FILE_IMPL = "GIO"
+FILE_IMPL = "@FILE_IMPL@"
 
 #{gtkmozembed, webkit, system}
 BROWSER_IMPL = "webkit"

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Feb 22 01:25:33 2009
@@ -25,13 +25,32 @@
 AM_PATH_PYTHON(2.4)
 
 ################################################################################
+# File Implementation
+################################################################################
+FILE_IMPL="GIO"
+
+AC_ARG_WITH([file_impl],
+            AC_HELP_STRING([--with-file-impl], [GIO, GnomeVfs, Python]))
+
+if test "$with_file_impl" = "GnomeVfs" || test "$with_file_impl" = "Python" ; then
+	FILE_IMPL=$with_file_impl
+fi
+
+AC_SUBST(FILE_IMPL)
+
+################################################################################
 # Check for neccessary python modules (that dont install pc files)
 ################################################################################
 AM_CHECK_PYMOD([vobject], , , AC_MSG_ERROR([Python module vobject required to run Conduit]))
 AM_CHECK_PYMOD([dateutil], , , AC_MSG_ERROR([Python module dateutil required to run Conduit]))
 AM_CHECK_PYMOD_VERSION([goocanvas], [pygoocanvas_version], [0.9.0], , AC_MSG_ERROR([Python module goocanvas >= 0.9.0 required to run Conduit]))
 AM_CHECK_PYMOD_VERSION([dbus], [__version__], [0.80.0], , AC_MSG_ERROR([Python module dbus >= 0.80.0 required to run Conduit]))
-AM_CHECK_PYMOD([gio], , , AC_MSG_ERROR([Python module gio required to run Conduit]))
+
+if test $FILE_IMPL = "GIO" ; then
+	AM_CHECK_PYMOD([gio], , , AC_MSG_ERROR([Python module gio required to run Conduit]))
+elif test $FILE_IMPL = "GnomeVfs" ; then
+	AM_CHECK_PYMOD([gnomevfs], , , AC_MSG_ERROR([Python module gnomevfs required to run Conduit]))
+fi
 
 ################################################################################
 # DBus
@@ -212,6 +231,7 @@
 echo $PACKAGE v$VERSION
 echo
 echo Prefix............... : $prefix
+echo File Implementation.. : $FILE_IMPL
 echo Dbus Services Dir.... : $DBUS_SERVICES_DIR
 echo Nautilus Extension... : $enable_nautilus_extension
 echo EOG Plugin........... : $enable_eog_plugin