[sword-svn] r2052 - in trunk: include m4

[scribe at www.crosswire.org]

Author: scribe
Date: 2007-05-19 14:28:23 -0700 (Sat, 19 May 2007)
New Revision: 2052

Modified:
   trunk/include/config.h
   trunk/m4/acx_clucene.m4
Log:
fixed latest work on clucene detection improvements


Modified: trunk/include/config.h
===================================================================
--- trunk/include/config.h	2007-05-18 21:35:21 UTC (rev 2051)
+++ trunk/include/config.h	2007-05-19 21:28:23 UTC (rev 2052)
@@ -1,4 +1,4 @@
-/* include/config.h.  Generated from config.h.in by configure.  */
+/* include/config.h.  Generated by configure.  */
 /* include/config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define to 1 if you have the <dlfcn.h> header file. */

Modified: trunk/m4/acx_clucene.m4
===================================================================
--- trunk/m4/acx_clucene.m4	2007-05-18 21:35:21 UTC (rev 2051)
+++ trunk/m4/acx_clucene.m4	2007-05-19 21:28:23 UTC (rev 2052)
@@ -14,7 +14,7 @@
 	AC_MSG_RESULT(excluding support)
 else
 #try some default locations
-if test -z "$with_clucene"; then
+if test -z "$with_clucene" || test "x$with_clucene" = "xyes"; then
 	#use parent of this directory, and some common library paths
 	with_clucene=$(cd "../" && pwd)
 	with_clucene="$with_clucene /usr /usr/local"
@@ -28,24 +28,24 @@
 for flag in $with_clucene; do
 	if test -z "$clucene_set_failed"; then
 		if test -e "$flag/include/CLucene.h"; then
+# 64-bit checks first
 			if test -e "$flag/lib64/libclucene.la" || test -e "$flag/lib64/libclucene.so"; then
 				clucene_set_failed=$flag
 				CLUCENE_LIBS="-L$flag/lib64 -lclucene"
 				if test -e "$flag/include/CLucene/clucene-config.h"; then
 					CLUCENE_CXXFLAGS="-I$flag/include"
-# what is this?!!!  Keeping, but don't understand.  Can clucene-config.h actually get installed to lib?
 				else
 					CLUCENE_CXXFLAGS="-I$flag/include -I$flag/lib64"
 				fi
 			else
+# 32-bit checks
 				if test -e "$flag/lib/libclucene.la" || test -e "$flag/lib/libclucene.so"; then
 					clucene_set_failed=$flag
 					CLUCENE_LIBS="-L$flag/lib -lclucene"
 					if test -e "$flag/include/CLucene/clucene-config.h"; then
 						CLUCENE_CXXFLAGS="-I$flag/include"
-	# what is this?!!!  Keeping, but don't understand.  Can clucene-config.h actually get installed to lib?
 					else
-						CLUCENE_CXXFLAGS="-I$flag/include -I$flag/lib64"
+						CLUCENE_CXXFLAGS="-I$flag/include -I$flag/lib"
 					fi
 				fi
 			fi