r14732 - gnucash/trunk - Check for libgoffice-0.3 before libgoffice-1.

[Derek Atkins]

Author: warlord
Date: 2006-08-26 18:59:23 -0400 (Sat, 26 Aug 2006)
New Revision: 14732
Trac: http://svn.gnucash.org/trac/changeset/14732

Modified:
   gnucash/trunk/
   gnucash/trunk/configure.in
Log:
Check for libgoffice-0.3 before libgoffice-1.
(So we find "native" goffice-0.3.x on win32



Property changes on: gnucash/trunk
___________________________________________________________________
Name: svk:merge
   - d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13136
   + d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13141

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2006-08-26 21:22:58 UTC (rev 14731)
+++ gnucash/trunk/configure.in	2006-08-26 22:59:23 UTC (rev 14732)
@@ -1243,16 +1243,24 @@
   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)