goffice r2347 - trunk

[jbrefort svn gnome org]

Author: jbrefort
Date: Fri Mar 27 07:43:24 2009
New Revision: 2347
URL: http://svn.gnome.org/viewvc/goffice?rev=2347&view=rev

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

	* configure.in: Fixed gconf and gmathml propagation to pc file. [#576497]



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.in

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Fri Mar 27 07:43:24 2009
@@ -1,5 +1,8 @@
 goffice 0.7.5:
 
+Jean:
+	* Fixed gconf and gmathml propagation to pc file. [#576497]
+
 Morten:
 	* Add new go_format_is_time function.
 	* Pick sane bounds for time-formatted axes.  [Part of #574681]

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Mar 27 07:43:24 2009
@@ -114,12 +114,14 @@
 
 PKG_CHECK_MODULES(surfaces, $surfaces_reqs)
 
+EXTRA_DEPS=
+
 dnl ***********************
 dnl Should we use gmathml ?
 dnl ***********************
 
 goffice_with_gmathml=false
-AC_ARG_WITH(gtk, [  --with-gmathml          Build with gmathml use])
+AC_ARG_WITH(gmathml, [  --with-gmathml          Build with gmathml use])
 if test "x$with_gmathml" = xyes; then
 	PKG_CHECK_MODULES(GMathml, gmathml >= 0.0.1)
 	goffice_with_gmathml=true
@@ -127,6 +129,7 @@
 if test "x$goffice_with_gmathml" = "xtrue" ; then
 	AC_DEFINE(GOFFICE_WITH_GMATHML, 1, [Define if GMathml is used])
 	goffice_reqs="$goffice_reqs gmathml >= 0.0.1 "
+	EXTRA_DEPS="$EXTRA_DEPS gmathml"
 fi
 
 AM_CONDITIONAL(GOFFICE_WITH_GMATHML, $goffice_with_gmathml)
@@ -135,14 +138,13 @@
 dnl Should we use gconf ?
 dnl *******************
 goffice_with_gconf=true
-AC_ARG_WITH(gtk, [  --without-gconf         Build without gconf use])
+AC_ARG_WITH(gconf, [  --without-gconf         Build without gconf use])
 if test "x$with_gconf" = xno; then
 	ui_msg="None (Gconf disabled by request)"
 	goffice_with_gconf=false
 else
 	dnl We shouldn't silently default to --without-gconf.
 	dnl If the requirements are not met, fail.
-	ui_msg="Gtk"
 	PKG_CHECK_MODULES(GCONF, gconf-2.0)
 fi
 if test "x$goffice_with_gconf" = "xtrue" ; then
@@ -192,7 +194,6 @@
 
 EXTRA_LIBS=
 EXTRA_INCLUDES=
-EXTRA_DEPS=
 
 dnl ****************************
 dnl now that we have selected out libraries the whole collection in one