configure.ac | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
New commits: commit f578cb783121f18791dde510a4ec3f8fa6a29e22 Author: Lionel Elie Mamane <[email protected]> Date: Thu Jun 27 10:07:32 2013 +0200 we now need librdf_world_set_raptor_init_handler from librdf Change-Id: I4e3b56fd8c088983a8a01eb6ccf88691d6fd93ef (cherry picked from commit 2728808553e5a248d1e4dc1361e4784400a75e7b) Signed-off-by: Michael Stahl <[email protected]> diff --git a/configure.ac b/configure.ac index fee09c2..b3f7876 100644 --- a/configure.ac +++ b/configure.ac @@ -8654,6 +8654,8 @@ 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 libo_MINGW_CHECK_DLL([librdf]) + AC_CHECK_LIB([rdf], [librdf_world_set_raptor_init_handler], [:], + [AC_MSG_ERROR(librdf too old. Need >= 1.16)], []) libo_MINGW_TRY_DLL([libraptor]) libo_MINGW_TRY_DLL([librasqal]) libo_MINGW_TRY_DLL([libsqlite3]) commit 192b75aa6a0bce8023c0529fb91ef1482439fb38 Author: David Tardon <[email protected]> Date: Thu Jun 27 07:29:43 2013 +0200 unoxml needs to link with raptor2 now Change-Id: Icbe5ac8e20b5a05fdba4ed7b8a287c3d9e94d2da (cherry picked from commit 2b5203c9ac4b6a95fa77f1a31fdb7b13e736d37e) Signed-off-by: Michael Stahl <[email protected]> diff --git a/configure.ac b/configure.ac index 5e01923..fee09c2 100644 --- a/configure.ac +++ b/configure.ac @@ -8649,11 +8649,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]) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
