mirror of
https://github.com/Gnucash/gnucash.git
synced 2026-08-04 18:33:36 -05:00
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
This commit is contained in:
+14
-6
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user