libgsf r1010 - in trunk: . gsf-gnome

[mortenw svn gnome org]

Author: mortenw
Date: Thu Oct 16 19:28:21 2008
New Revision: 1010
URL: http://svn.gnome.org/viewvc/libgsf?rev=1010&view=rev

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

	* configure.in: Define LIBGSF_GNOMEVFS_VIA_GIO via command line,
	if needed.
	* gsf-gnome/gsf-output-gnomevfs.h: Don't include config file.  Get
	LIBGSF_GNOMEVFS_VIA_GIO from command line.
	* gsf-gnome/gsf-input-gnomevfs.h: Ditto.




Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/gsf-gnome/gsf-input-gnomevfs.h
   trunk/gsf-gnome/gsf-output-gnomevfs.h

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Oct 16 19:28:21 2008
@@ -401,7 +401,7 @@
 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])
+		CFLAGS="$CFLAGS -DLIBGSF_GNOMEVFS_VIA_GIO"
 	else
                 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"

Modified: trunk/gsf-gnome/gsf-input-gnomevfs.h
==============================================================================
--- trunk/gsf-gnome/gsf-input-gnomevfs.h	(original)
+++ trunk/gsf-gnome/gsf-input-gnomevfs.h	Thu Oct 16 19:28:21 2008
@@ -22,7 +22,6 @@
 #ifndef GSF_INPUT_GNOMEVFS_H
 #define GSF_INPUT_GNOMEVFS_H
 
-#include <gsf/gsf-input.h>
 #ifndef LIBGSF_GNOMEVFS_VIA_GIO
 /*
  * The installed version will always do this.  For our emulation layer, we

Modified: trunk/gsf-gnome/gsf-output-gnomevfs.h
==============================================================================
--- trunk/gsf-gnome/gsf-output-gnomevfs.h	(original)
+++ trunk/gsf-gnome/gsf-output-gnomevfs.h	Thu Oct 16 19:28:21 2008
@@ -22,7 +22,6 @@
 #ifndef GSF_OUTPUT_GNOMEVFS_H
 #define GSF_OUTPUT_GNOMEVFS_H
 
-#include <gsf/gsf-output.h>
 #ifndef LIBGSF_GNOMEVFS_VIA_GIO
 /*
  * The installed version will always do this.  For our emulation layer, we