From f31422992759cd2f60b3d380dd88319c3998c1b7 Mon Sep 17 00:00:00 2001
From: Derek Atkins <derek@ihtfp.com>
Date: Sat, 26 Aug 2006 22:59:23 +0000
Subject: [PATCH] Check for libgoffice-0.3 before libgoffice-1. (So we find
 "native" goffice-0.3.x on win32

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14732 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 configure.in | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/configure.in b/configure.in
index cc4df3a03f..be86bbc4dd 100644
--- a/configure.in
+++ b/configure.in
@@ -1243,16 +1243,24 @@ then
   AC_SUBST(GSF_LIBS)
   
   dnl $4=true => don't die if failure.
-  PKG_CHECK_MODULES(GOFFICE, libgoffice-1 >= 0.0.4,,true)
-  if $PKG_CONFIG --silence-errors 'libgoffice-1 >= 0.0.4'
+  PKG_CHECK_MODULES(GOFFICE, libgoffice-0.3 >= 0.3.0,,true)
+  if $PKG_CONFIG --silence-errors 'libgoffice-0.3 >= 0.3.0'
   then
     AC_DEFINE(HAVE_GOFFICE,1,[System has goffice-0.0.4 or better])
     HAVE_GOFFICE=yes
   else
-    AC_MSG_RESULT(using internally-packaged goffice)
-    GOFFICE_CFLAGS='-I${top_srcdir}/lib/goffice-0.0.4'
-    GOFFICE_LIBS='${top_builddir}/lib/goffice-0.0.4/goffice/libgoffice-1.la'
-    HAVE_GOFFICE=no
+    AC_MSG_RESULT(no)
+    PKG_CHECK_MODULES(GOFFICE, libgoffice-1 >= 0.0.4,,true)
+    if $PKG_CONFIG --silence-errors 'libgoffice-1 >= 0.0.4'
+    then
+      AC_DEFINE(HAVE_GOFFICE,1,[System has goffice-0.0.4 or better])
+      HAVE_GOFFICE=yes
+    else
+      AC_MSG_RESULT(using internally-packaged goffice)
+      GOFFICE_CFLAGS='-I${top_srcdir}/lib/goffice-0.0.4'
+      GOFFICE_LIBS='${top_builddir}/lib/goffice-0.0.4/goffice/libgoffice-1.la'
+      HAVE_GOFFICE=no
+    fi
   fi
   AM_CONDITIONAL(HAVE_GOFFICE, test "x$HAVE_GOFFICE" = "xyes")
   AC_SUBST(GOFFICE_CFLAGS)