[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - configure.ac

[David Tardon]

 configure.ac |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit c486d46980cae515ee7b9d0e8c7d5b12a295b503
Author: David Tardon <dtardon at redhat.com>
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.
    
    (cherry picked from commit 24add548ac163651de5e3372798f0d4db347de77)
    Signed-off-by: David Tardon <dtardon at redhat.com>
    
    Conflicts:
    	configure.ac
    
    Change-Id: Ib244222f8f048aefe0484060f9ad5f41bfd24def
    Reviewed-on: https://gerrit.libreoffice.org/5177
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/configure.ac b/configure.ac
index 03d2ef8..ce04c65 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 at -I[^ ]*/CLucene/ext@@')]
     AC_LANG_PUSH([C++])
     save_CXXFLAGS=$CXXFLAGS
     save_CPPFLAGS=$CPPFLAGS