libgsf r1011 - in trunk: . gsf-gnome

[mortenw svn gnome org]

Author: mortenw
Date: Fri Oct 17 12:46:02 2008
New Revision: 1011
URL: http://svn.gnome.org/viewvc/libgsf?rev=1011&view=rev

Log:
2008-10-17  Morten Welinder  <terra gnome org>

	* gsf-gnome/Makefile.am: Don't compile the gnomevfs part unless
	asked to.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/gsf-gnome/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Oct 17 12:46:02 2008
@@ -439,6 +439,7 @@
 	[AC_MSG_ERROR([GNOME support requested, but not available.])])
 fi
 AM_CONDITIONAL(WITH_LIBGSF_GNOME, test $have_gnome = yes)
+AM_CONDITIONAL(WITH_LIBGSF_GNOMEVFS, test $want_gnome_vfs = yes)
 AM_CONDITIONAL(WITH_LIBGSF_BONOBO, test $want_bonobo = yes)
 
 # ===================

Modified: trunk/gsf-gnome/Makefile.am
==============================================================================
--- trunk/gsf-gnome/Makefile.am	(original)
+++ trunk/gsf-gnome/Makefile.am	Fri Oct 17 12:46:02 2008
@@ -8,9 +8,13 @@
 if WITH_WIN32
   libgsf_gnome_1_la_LDFLAGS += -no-undefined
 endif
-libgsf_gnome_1_la_SOURCES =	\
+libgsf_gnome_1_la_SOURCES =
+
+if WITH_LIBGSF_GNOMEVFS
+libgsf_gnome_1_la_SOURCES +=	\
 	gsf-input-gnomevfs.c 	\
 	gsf-output-gnomevfs.c
+endif
 
 if WITH_LIBGSF_BONOBO
 libgsf_gnome_1_la_SOURCES +=	\