Index: configure.ac
===================================================================
--- configure.ac	(revision 21447)
+++ configure.ac	(working copy)
@@ -71,14 +71,24 @@
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
-PKG_CHECK_MODULES(GLIB, [glib-2.0],,[AC_MSG_ERROR([$GLIB_PKG_ERRORS])])
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
+# libgsf depends on glib and libxml2, so we should be fine
+libgsf_req='libgsf-1 >= 1.13.0'
+DEPS_PKGS="$libgsf_req"
 
-PKG_CHECK_MODULES(GSF, [libgsf-1 >= 1.13.0],,[AC_MSG_ERROR([$GSF_PKG_ERRORS])])
-AC_SUBST(GSF_CFLAGS)
-AC_SUBST(GSF_LIBS)
+# required, pkg-config'd packages
+PKG_CHECK_MODULES(DEPS, [ $DEPS_PKGS ],,[AC_MSG_ERROR([$DEPS_PKG_ERRORS])])
+AC_SUBST(DEPS_PKGS)
+AC_SUBST(DEPS_CFLAGS)
+AC_SUBST(DEPS_LIBS)
 
+# optional deps
+OPT_CFLAGS=
+OPT_LIBS=
+
+# these conditionals are still used, albeit libxml2 seems to be unconditionally required
+AC_DEFINE(HAVE_LIBXML2,1,[Define if you have libxml2])
+AC_SUBST(HAVE_LIBXML2)
+
 dnl Checks for headers.
 
 AC_HEADER_STDC
@@ -142,8 +152,8 @@
 	])
 ])
 
-AC_SUBST(ZLIB_CFLAGS)
-AC_SUBST(ZLIB_LIBS)
+OPT_CFLAGS="$OPT_CFLAGS $ZLIB_CFLAGS"
+OPT_LIBS="$OPT_LIBS $ZLIB_LIBS"
 
 CPPFLAGS=$_cppflags
 LDFLAGS=$_ldflags
@@ -205,21 +215,12 @@
 	PNG_LIBS=""
 ])
 
-AC_SUBST(PNG_CFLAGS)
-AC_SUBST(PNG_LIBS)
+OPT_CFLAGS="$OPT_CFLAGS $PNG_CFLAGS"
+OPT_LIBS="$OPT_LIBS $PNG_LIBS"
 
 CPPFLAGS=$_cppflags
 LDFLAGS=$_ldflags
 
-dnl system XML support
-dnl ========================================================
-
-PKG_CHECK_MODULES(XML, [libxml-2.0])
-AC_SUBST(XML_CFLAGS)
-AC_SUBST(XML_LIBS)
-AC_DEFINE(HAVE_LIBXML2,1,[Define if you have libxml2])
-AC_SUBST(HAVE_LIBXML2)
-
 dnl system libwmf support
 dnl ========================================================
 
@@ -280,9 +281,12 @@
 CPPFLAGS=$_cppflags
 LDFLAGS=$_ldflags
 
-AC_SUBST(WMF_LIBS)
-AC_SUBST(WMF_CFLAGS)
+OPT_CFLAGS="$OPT_CFLAGS $WMF_CFLAGS"
+OPT_LIBS="$OPT_LIBS $WMF_LIBS"
 
+AC_SUBST(OPT_CFLAGS)
+AC_SUBST(OPT_LIBS)
+
 AC_LANG_C
 
 CPPFLAGS=$_cppflags
Index: wv-1.0.pc.in
===================================================================
--- wv-1.0.pc.in	(revision 21447)
+++ wv-1.0.pc.in	(working copy)
@@ -6,5 +6,6 @@
 Name: wvWare
 Description: Word Document Filter library and utilities
 Version: @VERSION@
-Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @GSF_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
-Cflags: -I${includedir}/wv @GSF_CFLAGS@
+Requires: @DEPS_PKGS@
+Libs: -L${libdir} -lwv @OPT_LIBS@ -lm
+Cflags: -I${includedir}/wv @OPT_CFLAGS@
Index: libwv-config.in
===================================================================
--- libwv-config.in	(revision 21447)
+++ libwv-config.in	(working copy)
@@ -77,7 +77,7 @@
 fi
 
 wv_cflags=""
-wv_libs="-lwv @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm"
+wv_libs="-lwv @DEPS_LIBS@ @OPT_LIBS@ -lm"
 
 if test "$echo_cflags" = "yes"; then
 	includes="$wv_cflags"
Index: exporter/Makefile.in
===================================================================
--- exporter/Makefile.in	(revision 21447)
+++ exporter/Makefile.in	(working copy)
@@ -18,7 +18,7 @@
 
 DEFS = @DEFS@
 
-CPPFLAGS = @CPPFLAGS@ @GLIB_CFLAGS@
+CPPFLAGS = @CPPFLAGS@ @DEPS_CFLAGS@ @OPT_CFLAGS@
 
 ifeq ($(EPATH_DYLIB),1)
 WVPICFLAGS = -fno-common -DPIC
Index: exporter/GNUmakefile.am
===================================================================
--- exporter/GNUmakefile.am	(revision 21447)
+++ exporter/GNUmakefile.am	(working copy)
@@ -6,7 +6,7 @@
 
 INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/libole2 -I$(top_srcdir)/oledecod $(INCGLIB)
 
-CPPFLAGS = @CPPFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @ZLIB_CFLAGS@
+CPPFLAGS = @CPPFLAGS@ @DEPS_CFLAGS@ @OPT_CFLAGS@
 
 wvhdrdir = $(includedir)/wv
 
Index: GNUmakefile.am
===================================================================
--- GNUmakefile.am	(revision 21447)
+++ GNUmakefile.am	(working copy)
@@ -8,9 +8,9 @@
 
 CFLAGS = @CFLAGS@ @ANSI_CFLAGS@
 
-CPPFLAGS = @CPPFLAGS@ @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @GSF_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@
+CPPFLAGS = @CPPFLAGS@ @DEPS_CFLAGS@ @OPT_CFLAGS@
 
-WVLIBS = @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @GSF_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
+WVLIBS = @DEPS_LIBS@ @OPT_LIBS@ -lm
 
 wvhdrdir = $(includedir)/wv
 
Index: oledecod/Makefile.in
===================================================================
--- oledecod/Makefile.in	(revision 21447)
+++ oledecod/Makefile.in	(working copy)
@@ -19,7 +19,7 @@
 WVPICFLAGS = 
 endif
 
-CFLAGS = -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @CFLAGS@ @DEFS@ -I$(srcdir)/../libole2 @GLIB_CFLAGS@ $(WVPICFLAGS)
+CFLAGS = -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @CFLAGS@ @DEFS@ -I$(srcdir)/../libole2 @OPT_CFLAGS@ $(WVPICFLAGS)
 ifneq ($(HAVE_GLIB), 1)
 CFLAGS += -I$(srcdir)/../glib-wv
 endif
Index: oledecod/GNUmakefile.am
===================================================================
--- oledecod/GNUmakefile.am	(revision 21447)
+++ oledecod/GNUmakefile.am	(working copy)
@@ -6,7 +6,7 @@
 
 INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/libole2 -I$(top_srcdir)/oledecod $(INCGLIB)
 
-CPPFLAGS = @CPPFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @ZLIB_CFLAGS@
+CPPFLAGS = @CPPFLAGS@ @DEPS_CFLAGS@ @OPT_CFLAGS@
 
 noinst_LTLIBRARIES = liboledecod.la
 
@@ -16,4 +16,4 @@
 	oledecod.h \
 	support.h
 
-EXTRA_DIST = $(OTHERHEADERS)
+EXTRA_DIST = $(OTHERHEADERS)n