gnumeric r17200 - in trunk: . schemas

[jbrefort svn gnome org]

Author: jbrefort
Date: Sat Mar 14 15:38:26 2009
New Revision: 17200
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17200&view=rev

Log:
2009-03-14  Jean Brefort  <jean brefort normalesup org>

	* configure.in: check if goffice uses gconf and make gconf use independent
	from the with-gnome option. [#574813]
	* schemas/Makefile.am: ditto.



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.in
   trunk/schemas/Makefile.am

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sat Mar 14 15:38:26 2009
@@ -11,6 +11,9 @@
 	* Remove crash potential under goto and cell-format dialog with 
 	  multiple views.  [Part of #364291]
 
+Jean:
+	* Make gconf use independent from the with-gnome option. [#574813]
+
 Jody:
 	* Work around semantic changes in gtk-2.16.
 	* rename sr Latn -> sr latin

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Mar 14 15:38:26 2009
@@ -306,17 +306,16 @@
 AC_SUBST(HILDON_CFLAGS)
 AC_SUBST(HILDON_LIBS)
 
-dnl ==============================================
-dnl GNOME Specific extensions
-
 dnl The following conditional is set in AM_GCONF_SOURCE_2.
 dnl Because we may skip its execution, we have to set a default here.
 m4_pattern_allow([^AM_GCONF_SOURCE_2$])
 AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
 
-with_corba=false
-if test "x${gnumeric_with_gnome}" = xtrue; then
-
+dnl *******************
+dnl Do we need gconf ?
+dnl *******************
+gnumeric_with_gconf=false
+if test ! -z "`echo $GNUMERIC_CFLAGS|grep gconf`"; then
 	dnl ==============================================
 	dnl Special GConf section  (stolen from libgnome)
 	dnl ==============================================
@@ -328,13 +327,11 @@
 		AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
 	fi
 	AM_GCONF_SOURCE_2
-
-	dnl *************
-	dnl Corba support
-	dnl *************
-
-	dnl disabled -- hasn't worked for years.
+	gnumeric_with_gconf=true
 fi
+AM_CONDITIONAL(WITH_GCONF, $gnumeric_with_gconf)
+
+with_corba=false
 AM_CONDITIONAL(WITH_CORBA, $with_corba)
 
 

Modified: trunk/schemas/Makefile.am
==============================================================================
--- trunk/schemas/Makefile.am	(original)
+++ trunk/schemas/Makefile.am	Sat Mar 14 15:38:26 2009
@@ -1,5 +1,5 @@
 schema_in_files = gnumeric-dialogs.schemas.in gnumeric-general.schemas.in gnumeric-plugins.schemas.in 
-if WITH_GNOME
+if WITH_GCONF
 schemadir   	= @GCONF_SCHEMA_FILE_DIR@
 schema_DATA 	= $(schema_in_files:.schemas.in=.schemas)
 endif