| @@ -0,0 +1,64 @@
+Index: m4/acx_clucene.m4
+===================================================================
+--- m4/acx_clucene.m4.orig
++++ m4/acx_clucene.m4
+@@ -24,17 +24,19 @@ AC_MSG_CHECKING([how to include clucene]
+ CLUCENE_CXXFLAGS=
+ CLUCENE_LIBS=
+ for flag in $with_clucene; do
+- if test -z "$clucene_set_failed"; then
+- if test -e "$flag/include/CLucene/StdHeader.h"; then
+- if test -e "$flag/lib/CLucene/clucene-config.h"; then
+- if test -e "$flag/lib/libclucene.la"; then
+- CLUCENE_LIBS="-L$flag/lib -lclucene"
+- CLUCENE_CXXFLAGS="-I$flag/include -I$flag/lib"
+- clucene_set_failed=$flag
++ for cltest_libdir in lib64 lib ; do
++ if test -z "$clucene_set_failed"; then
++ if test -e "$flag/include/CLucene/StdHeader.h"; then
++ if test -e "$flag/$cltest_libdir/CLucene/clucene-config.h"; then
++ if test -e "$flag/$cltest_libdir/libclucene.la"; then
++ CLUCENE_LIBS="-L$flag/$cltest_libdir -lclucene"
++ CLUCENE_CXXFLAGS="-I$flag/include -I$flag/$cltest_libdir"
++ clucene_set_failed=$flag
++ fi
+ fi
+ fi
+ fi
+- fi
++ done
+
+ if test -z "$clucene_set_failed"; then
+ if test -e "$flag/src/CLucene/StdHeader.h"; then
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -19669,17 +19669,19 @@ echo $ECHO_N "checking how to include cl
+ CLUCENE_CXXFLAGS=
+ CLUCENE_LIBS=
+ for flag in $with_clucene; do
+- if test -z "$clucene_set_failed"; then
+- if test -e "$flag/include/CLucene/StdHeader.h"; then
+- if test -e "$flag/lib/CLucene/clucene-config.h"; then
+- if test -e "$flag/lib/libclucene.la"; then
+- CLUCENE_LIBS="-L$flag/lib -lclucene"
+- CLUCENE_CXXFLAGS="-I$flag/include -I$flag/lib"
+- clucene_set_failed=$flag
++ for cltest_libdir in lib64 lib ; do
++ if test -z "$clucene_set_failed"; then
++ if test -e "$flag/include/CLucene/StdHeader.h"; then
++ if test -e "$flag/$cltest_libdir/CLucene/clucene-config.h"; then
++ if test -e "$flag/$cltest_libdir/libclucene.la"; then
++ CLUCENE_LIBS="-L$flag/$cltest_libdir -lclucene"
++ CLUCENE_CXXFLAGS="-I$flag/include -I$flag/$cltest_libdir"
++ clucene_set_failed=$flag
++ fi
+ fi
+ fi
+ fi
+- fi
++ done
+
+ if test -z "$clucene_set_failed"; then
+ if test -e "$flag/src/CLucene/StdHeader.h"; then
|
