[libgsf] Compilation: require gio unconditionally.

[Morten Welinder <mortenw src gnome org>]

commit 351fa3216fdd07de8e602a6f55e9cc93ce7ea09f
Author: Morten Welinder <terra gnome org>
Date:   Tue Nov 13 10:55:53 2012 -0500

    Compilation: require gio unconditionally.

 NEWS              |    3 +++
 configure.in      |   29 +----------------------------
 gsf/Makefile.am   |   22 +++++++---------------
 tests/Makefile.am |    7 +------
 tools/Makefile.am |    2 +-
 5 files changed, 13 insertions(+), 50 deletions(-)
---
diff --git a/NEWS b/NEWS
index 955a58b..d22b964 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,9 @@ Morten:
 	* Fix memory management problem with document properties.
 	* Fix writing of OLE2 properties for multi-byte codepages.  [#627696]
 
+Ryan Lortie:
+	* Unconditionally require gio.  [#687753]
+
 --------------------------------------------------------------------------
 libgsf 1.14.24
 
diff --git a/configure.in b/configure.in
index e21541e..b89db92 100644
--- a/configure.in
+++ b/configure.in
@@ -72,6 +72,7 @@ dnl Modules required for libgsf
 libgsf_reqs="
     gobject-2.0 >= 2.16.0
     glib-2.0 >= 2.26.0
+    gio-2.0 >= 2.26.0
     libxml-2.0 >= 2.4.16
 "
 
@@ -449,34 +450,6 @@ AC_SUBST(BZ2_LIBS)
 
 dnl ****************************************************************************
 
-dnl gio
-dnl
-want_gio=auto
-AC_ARG_WITH(gio,
-	[--{with,without}-gio   Build additional wrappers for GIO],
-	[case $withval in
-	yes) want_gio=yes;;
-	no) want_gio=no;;
-	esac[]dnl
-])
-
-have_gio=no
-if test $want_gio = no ; then 
-    AC_MSG_WARN([GIO support disabled, as requested (Use --with-gio to enable)])
-else
-    PKG_CHECK_MODULES(LIBGSF_GIO, gio-2.0,
-	[have_gio=yes],
-	[if test $want_gio = yes; then
-	    AC_MSG_ERROR([GIO support requested, but not available.])
-	 else
-	    AC_MSG_WARN([GIO support disabled, unable to find required version of GIO])
-	 fi])
-fi
-AM_CONDITIONAL(WITH_GIO, test $have_gio = yes)
-want_gio=$have_gio
-
-dnl ****************************************************************************
-
 want_gdk_pixbuf=no
 dnl check for gdk_pixbuf
 AC_ARG_WITH(gdk_pixbuf,
diff --git a/gsf/Makefile.am b/gsf/Makefile.am
index e5ac649..da44062 100644
--- a/gsf/Makefile.am
+++ b/gsf/Makefile.am
@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) \
-	$(Z_CPPFLAGS) $(LIBGSF_GIO_CFLAGS) \
+	$(Z_CPPFLAGS) \
 	-DGSFLOCALEDIR=\"$(datadir)/locale\"
 lib_LTLIBRARIES = libgsf-1.la
 
@@ -12,18 +12,7 @@ INTROSPECTION_COMPILER_ARGS = \
 	--includedir=$(srcdir) \
     --includedir=.
 
-if WITH_GIO
-gioc=gsf-input-gio.c gsf-output-gio.c
-gioh=gsf-input-gio.h gsf-output-gio.h
-giola=$(LIBGSF_GIO_LIBS)
-else
-gioc=
-gioh=
-giola=
-endif
-
-
-libgsf_1_la_LIBADD  = $(LIBGSF_LIBS) $(Z_LIBS) $(BZ2_LIBS) $(giola)
+libgsf_1_la_LIBADD  = $(LIBGSF_LIBS) $(Z_LIBS) $(BZ2_LIBS)
 libgsf_1_la_LDFLAGS = -version-info $(VERSION_INFO)
 if WITH_WIN32
   libgsf_1_la_DEPENDENCIES = lib.def
@@ -79,7 +68,9 @@ libgsf_1_la_SOURCES =		\
 	gsf-blob.c		\
 	gsf-clip-data.c		\
 	\
-	$(gioc)			\
+	gsf-input-gio.c		\
+	gsf-output-gio.c	\
+	\
 	version.c
 #	gsf-output-transaction.c	\
 #	gsf-command-context.c	\
@@ -139,7 +130,8 @@ libgsf_1_include_HEADERS = 	\
 	gsf-blob.h		\
 	gsf-clip-data.h		\
 	\
-	$(gioh)
+	gsf-input-gio.h		\
+	gsf-output-gio.h
 #	gsf-command-context.h	\
 #	gsf-io-context.h
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 85d7a8a..b566b00 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,9 +9,4 @@ check_PROGRAMS = test-msole1 test-msole2 test-cp-msole test-msvba	\
 		 test-out-gzip1 test-out-gzip2 test-gzip1 test-gzip2	\
 		 test-out-bzip test-bzip				\
 		 test-dump-msole test-restore-msole test-msvba-zip	\
-		 test-http # test-xml
-
-if WITH_GIO
-check_PROGRAMS += test-gio
-test_gio_LDADD = $(top_builddir)/gsf/libgsf-1.la $(LDADD) $(LIBGSF_GIO_LIBS)
-endif
+		 test-http test-gio # test-xml
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 595162e..9ab6852 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) \
 	$(Z_CPPFLAGS) \
 	-DGSFLOCALEDIR=\"$(datadir)/locale\"
-LDADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS) $(LIBGSF_GIO_LIBS)
+LDADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS)
 
 bin_PROGRAMS = gsf gsf-vba-dump
 gsf_SOURCES = gsf.c