[Libreoffice-commits] core.git: configure.ac

[David Tardon]

 configure.ac |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 2b5203c9ac4b6a95fa77f1a31fdb7b13e736d37e
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Jun 27 07:29:43 2013 +0200

    unoxml needs to link with raptor2 now
    
    Change-Id: Icbe5ac8e20b5a05fdba4ed7b8a287c3d9e94d2da

diff --git a/configure.ac b/configure.ac
index 1e1108f..66e6113 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8826,11 +8826,10 @@ AC_SUBST([LIBGCRYPT_LIBS])
 dnl ===================================================================
 dnl Check for system redland
 dnl ===================================================================
-dnl versions before 1.0.8 write RDF/XML that is useless for ODF (@xml:base)
-libo_CHECK_SYSTEM_MODULE([redland],[REDLAND],[redland >= 1.0.8])
+dnl redland: versions before 1.0.8 write RDF/XML that is useless for ODF (@xml:base)
+dnl raptor2: need at least 2.0.7 for CVE-2012-0037
+libo_CHECK_SYSTEM_MODULE([redland],[REDLAND],[redland >= 1.0.8 raptor2 >= 2.0.7])
 if test "$with_system_redland" = "yes"; then
-    # need at least 2.0.7 for CVE-2012-0037
-    PKG_CHECK_MODULES([RAPTOR2],[raptor2 >= 2.0.7])
     libo_MINGW_CHECK_DLL([librdf])
     libo_MINGW_TRY_DLL([libraptor])
     libo_MINGW_TRY_DLL([librasqal])