libgsf r998 - trunk

[mortenw svn gnome org]

Author: mortenw
Date: Sat Aug 30 11:50:06 2008
New Revision: 998
URL: http://svn.gnome.org/viewvc/libgsf?rev=998&view=rev

Log:
2008-08-28  Morten Welinder  <terra gnome org>

	* configure.in (GNOMEVFS_REQ, BONOBO_REQ): Define as needed.
	* libgsf-gnome-1.pc.in: Use the above.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libgsf-gnome-1.pc.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Aug 30 11:50:06 2008
@@ -400,16 +400,17 @@
 if test $want_gnome_vfs = auto -a "$want_gio" = yes; then
    	want_gnome_vfs=yes
 fi
+GNOMEVFS_REQ=
 if test $want_gnome_vfs = yes; then
    	if test "$want_gio" = yes; then
 	   	AC_DEFINE(LIBGSF_GNOMEVFS_VIA_GIO, 1, [Define if gio is used to implement gnome-vfs api])
 	else
-	        libgsf_gnome_reqs="$libgsf_gnome_reqs gnome-vfs-2.0 >= 2.2.0"
-        	libgsf_gnome_reqs="$libgsf_gnome_reqs gnome-vfs-module-2.0 >= 2.2.0"
+                GNOMEVFS_REQ="gnome-vfs-2.0 >= 2.2.0 gnome-vfs-module-2.0 >= 2.2.0"
+	        libgsf_gnome_reqs="$libgsf_gnome_reqs $GNOMEVFS_REQ"
 	fi
    	want_gnome=yes
 fi
-
+AC_SUBST(GNOMEVFS_REQ)
 
 want_bonobo=no
 dnl check for bonobo
@@ -422,10 +423,13 @@
     esac],
     [want_bonobo=yes]) dnl Default value
 
+BONOBO_REQ=
 if test $want_bonobo = yes; then
-    libgsf_gnome_reqs="$libgsf_gnome_reqs libbonobo-2.0 >= 2.0.0"
+    BONOBO_REQ="libbonobo-2.0 >= 2.0.0"
+    libgsf_gnome_reqs="$libgsf_gnome_reqs $BONOBO_REQ"   
     want_gnome=yes
 fi
+AC_SUBST(BONOBO_REQ)
 
 
 have_gnome=no

Modified: trunk/libgsf-gnome-1.pc.in
==============================================================================
--- trunk/libgsf-gnome-1.pc.in	(original)
+++ trunk/libgsf-gnome-1.pc.in	Sat Aug 30 11:50:06 2008
@@ -6,6 +6,6 @@
 Name: libgsf-gnome-1
 Description: GNOME specific extensions to libgsf
 Version: @VERSION@
-Requires: libgsf-1 libbonobo-2.0 >= 2.0.0 gnome-vfs-2.0 >= 2.2.0 gnome-vfs-module-2.0 >= 2.2.0
+Requires: libgsf-1 @BONOBO_REQ@ @GNOMEVFS_REQ@
 Libs: -L${libdir} -lgsf-gnome-1
 Cflags: