configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 24add548ac163651de5e3372798f0d4db347de77
Author: David Tardon <[email protected]>
Date: Tue Jul 30 06:45:48 2013 +0200
sanitize system clucene includes
Apparently clucene bundles pieces of a very old version of boost (1.42)
in CLucene/ext/boost, which breaks build with boost 1.54.
Change-Id: Ib244222f8f048aefe0484060f9ad5f41bfd24def
diff --git a/configure.ac b/configure.ac
index f60785d..53acedc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7376,7 +7376,7 @@ if test "$with_system_clucene" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_CLUCENE=YES
PKG_CHECK_MODULES(CLUCENE, libclucene-core)
- CLUCENE_CFLAGS=$(printf '%s' "$CLUCENE_CFLAGS" | sed -e
"s/-I/${ISYSTEM?}/g")
+ CLUCENE_CFLAGS=[$(printf '%s' "$CLUCENE_CFLAGS" | sed -e 's@-I[^
]*/CLucene/ext@@' -e "s/-I/${ISYSTEM?}/g")]
AC_LANG_PUSH([C++])
save_CXXFLAGS=$CXXFLAGS
save_CPPFLAGS=$CPPFLAGS
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
