goffice r2329 - trunk

[mortenw svn gnome org]

Author: mortenw
Date: Thu Mar 12 23:18:22 2009
New Revision: 2329
URL: http://svn.gnome.org/viewvc/goffice?rev=2329&view=rev

Log:
2009-03-12  Morten Welinder  <terra gnome org>

	* configure.in (surfaces_reqs): Move cairo backends here, so we
	don't link against them.



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

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Thu Mar 12 23:18:22 2009
@@ -5,6 +5,7 @@
 	* Don't display markers in histogram legend. [#574340]
 	* Skip points corresponding to invalid valies in pie charts. [#574348]
 	* Correctly use all points defined in bar/columns plot series. [#574349]
+	* Avoid unused direct shlib deps.  [#572910]
 
 Morten:
 	* Fix a pixbuf scaling problem in foocanvas.

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Mar 12 23:18:22 2009
@@ -100,15 +100,20 @@
 	pango			>= 1.8.1
 	pangocairo		>= 1.8.1
 	cairo			>= 1.2.0
-	cairo-svg		>= 1.2.0
-	cairo-pdf		>= 1.2.0
-	cairo-ps		>= 1.2.0
 "
 goffice_gtk_reqs="
 	gtk+-2.0		>= 2.6.0
 	libglade-2.0		>= 2.3.6
 "
 
+surfaces_reqs="
+	cairo-ps		>= 1.2.0
+	cairo-pdf		>= 1.2.0
+	cairo-svg		>= 1.2.0
+"
+
+PKG_CHECK_MODULES(surfaces, $surfaces_reqs)
+
 dnl ***********************
 dnl Should we use gmathml ?
 dnl ***********************
@@ -143,6 +148,7 @@
 if test "x$goffice_with_gconf" = "xtrue" ; then
 	AC_DEFINE(GOFFICE_WITH_GCONF, 1, [Define if GConf is used])
 	goffice_reqs="$goffice_reqs gconf-2.0"
+	EXTRA_DEPS="$EXTRA_DEPS gconf-2.0"
 fi
 
 dnl *******************
@@ -186,6 +192,7 @@
 
 EXTRA_LIBS=
 EXTRA_INCLUDES=
+EXTRA_DEPS=
 
 dnl ****************************
 dnl now that we have selected out libraries the whole collection in one
@@ -195,11 +202,24 @@
 PKG_CHECK_MODULES(GOFFICE, $goffice_reqs)
 
 dnl  Checks for Xft/XRender
+have_xrender=no
+xrender_libs="-lXrender -lXext"
 AC_CHECK_LIB(Xrender, XRenderFindFormat, 
-	[AC_SUBST(RENDER_LIBS, "-lXrender -lXext")
-	 AC_DEFINE(HAVE_RENDER, 1, [Define if libXrender is available.])],
-	[AC_SUBST(RENDER_LIBS, "")],
+	[have_xrender=yes
+	 dnl See if we really need that -lXext
+	 AC_CHECK_LIB(Xrender, XRenderQueryVersion,
+		      [xrender_libs="-lXrender"],
+		      [],
+		      [])],
+	[],
 	[-lXext])
+if test $have_xrender = yes; then
+  AC_SUBST(RENDER_LIBS, $xrender_libs)
+  AC_DEFINE(HAVE_RENDER, 1, [Define if libXrender is available.])
+else
+  AC_SUBST(RENDER_LIBS, "")
+fi
+unset xrender_libs
 
 dnl *****************************
 AC_MSG_CHECKING([for Win32 platform])
@@ -552,6 +572,7 @@
 fi
 AC_SUBST(EXTRA_LIBS)
 AC_SUBST(EXTRA_INCLUDES)
+AC_SUBST(EXTRA_DEPS)
 
 dnl ******************
 dnl * Config defaults

Modified: trunk/libgoffice.pc.in
==============================================================================
--- trunk/libgoffice.pc.in	(original)
+++ trunk/libgoffice.pc.in	Thu Mar 12 23:18:22 2009
@@ -6,7 +6,7 @@
 Name: libGOffice
 Description: G Office support library
 Version: @VERSION@
-Requires: glib-2.0 gobject-2.0 gio-2.0 libgsf-1 libxml-2.0 gtk+-2.0 libglade-2.0 cairo pangocairo
+Requires.private: glib-2.0 gobject-2.0 gio-2.0 libgsf-1 libxml-2.0 gtk+-2.0 libglade-2.0 cairo pangocairo @EXTRA_DEPS@
 Libs: -L${libdir} -lgoffice- GOFFICE_API_VER@
 Libs.private: @EXTRA_LIBS@
 Cflags: -I${includedir}/libgoffice- GOFFICE_API_VER@ @EXTRA_INCLUDES@