summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-07-30 06:45:48 +0200
committerCaolán McNamara <caolanm@redhat.com>2013-07-30 08:12:56 +0000
commitc486d46980cae515ee7b9d0e8c7d5b12a295b503 (patch)
treef2076edb8304b1476898c032a76f6b721d4575a3
parent9b1d8d864b813ebf943b85b129335d7d55e35c41 (diff)
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. (cherry picked from commit 24add548ac163651de5e3372798f0d4db347de77) Signed-off-by: David Tardon <dtardon@redhat.com> Conflicts: configure.ac Change-Id: Ib244222f8f048aefe0484060f9ad5f41bfd24def Reviewed-on: https://gerrit.libreoffice.org/5177 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--configure.ac1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 03d2ef8fd8c8..ce04c65712ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7144,6 +7144,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[^ ]*/CLucene/ext@@')]
AC_LANG_PUSH([C++])
save_CXXFLAGS=$CXXFLAGS
save_CPPFLAGS=$CPPFLAGS