diff options
author | David Tardon <dtardon@redhat.com> | 2013-07-30 06:45:48 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-07-30 06:50:22 +0200 |
commit | 24add548ac163651de5e3372798f0d4db347de77 (patch) | |
tree | 016cfee1b6f5ddf01a3f86fbc524c756f97bc3c4 | |
parent | 15066dc6be358287ec69e5ca63a77106558944b2 (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.
Change-Id: Ib244222f8f048aefe0484060f9ad5f41bfd24def
-rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index f60785de2c6c..53acedc839f5 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 |