conduit r1909 - in trunk: . conduit

[astormont svn gnome org]

Author: astormont
Date: Tue Feb 24 22:12:53 2009
New Revision: 1909
URL: http://svn.gnome.org/viewvc/conduit?rev=1909&view=rev

Log:
2009-02-24  Andrew Stormont  <andy andys-desktop>

        First commit!

	* conduit/defs.py.in:
	* configure.ac:
        Adds --with-browser-impl configure option.



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	Tue Feb 24 22:12:53 2009
@@ -15,7 +15,7 @@
 FILE_IMPL = "@FILE_IMPL@"
 
 #{gtkmozembed, webkit, system}
-BROWSER_IMPL = "webkit"
+BROWSER_IMPL = "@BROWSER_IMPL@"
 
 #{GConf,Python}
 SETTINGS_IMPL = "GConf"

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Feb 24 22:12:53 2009
@@ -30,7 +30,7 @@
 FILE_IMPL="GIO"
 
 AC_ARG_WITH([file_impl],
-            AC_HELP_STRING([--with-file-impl], [GIO, GnomeVfs, Python]))
+            AC_HELP_STRING([--with-file-impl], [GIO (default), GnomeVfs, Python]))
 
 if test "$with_file_impl" = "GnomeVfs" || test "$with_file_impl" = "Python" ; then
 	FILE_IMPL=$with_file_impl
@@ -39,6 +39,21 @@
 AC_SUBST(FILE_IMPL)
 
 ################################################################################
+# Browser Implementation
+################################################################################
+BROWSER_IMPL="webkit"
+
+AC_ARG_WITH([browser_impl],
+            AC_HELP_STRING([--with-browser-impl], [webkit (default), gtkmozembed, system]))
+if test "$with_browser_impl" = "webkit" || 
+   test "$with_browser_impl" = "gtkmozembed" || 
+   test "$with_browser_impl" = "system"; then
+        BROWSER_IMPL=$with_browser_impl
+fi
+
+AC_SUBST(BROWSER_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]))
@@ -232,6 +247,7 @@
 echo
 echo Prefix............... : $prefix
 echo File Implementation.. : $FILE_IMPL
+echo Browser Implementation: $BROWSER_IMPL
 echo Dbus Services Dir.... : $DBUS_SERVICES_DIR
 echo Nautilus Extension... : $enable_nautilus_extension
 echo EOG Plugin........... : $enable_eog_plugin