[sword-svn] r2051 - in trunk: . include m4

[scribe at www.crosswire.org]

Author: scribe
Date: 2007-05-18 14:35:21 -0700 (Fri, 18 May 2007)
New Revision: 2051

Modified:
   trunk/configure.ac
   trunk/include/config.h
   trunk/m4/acx_clucene.m4
   trunk/m4/cppunit.m4
   trunk/usrinst.sh
Log:
Updated make system and acx_clucene m4 script to better work with sword


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-05-13 18:55:38 UTC (rev 2050)
+++ trunk/configure.ac	2007-05-18 21:35:21 UTC (rev 2051)
@@ -210,14 +210,14 @@
 # ---------------------------------------------------------------------
 
 use_clucene=
-if test -z "$with_clucene"; then
+if test -z "$CLUCENE_LIBS"; then
+   echo "lucene searching options not available"
+else
    echo "lucene found - lucene searching options available"
    AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE_CXXFLAGS -DUSELUCENE"
    AM_CFLAGS="$AM_CFLAGS -DUSELUCENE"
    LIBS="$LIBS $CLUCENE_LIBS"
    use_clucene="yes"
-else
-   echo "lucene searching options not available"
 fi
 
 

Modified: trunk/include/config.h
===================================================================
--- trunk/include/config.h	2007-05-13 18:55:38 UTC (rev 2050)
+++ trunk/include/config.h	2007-05-18 21:35:21 UTC (rev 2051)
@@ -1,4 +1,4 @@
-/* include/config.h.  Generated by configure.  */
+/* include/config.h.  Generated from config.h.in 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-13 18:55:38 UTC (rev 2050)
+++ trunk/m4/acx_clucene.m4	2007-05-18 21:35:21 UTC (rev 2051)
@@ -9,6 +9,10 @@
 	AC_HELP_STRING([ --with-clucene=<path>],
 		[prefix of CLucene-Core installation. e.g. /usr/local or /usr]),,)
 
+AC_MSG_CHECKING([how to include clucene])
+if test "x$with_clucene" = "xno"; then
+	AC_MSG_RESULT(excluding support)
+else
 #try some default locations
 if test -z "$with_clucene"; then
 	#use parent of this directory, and some common library paths
@@ -19,18 +23,30 @@
 	with_clucene=$(cd "$with_clucene" && pwd)
 fi
 clucene_set_failed=
-
-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
+		if test -e "$flag/include/CLucene.h"; then
+			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
+				if test -e "$flag/lib/libclucene.la" || test -e "$flag/lib/libclucene.so"; then
+					clucene_set_failed=$flag
 					CLUCENE_LIBS="-L$flag/lib -lclucene"
-					CLUCENE_CXXFLAGS="-I$flag/include -I$flag/lib"
-					clucene_set_failed=$flag
+					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
 				fi
 			fi
 		fi
@@ -49,19 +65,21 @@
 
 if test -z "$clucene_set_failed"; then
 	clucene_set_failed="true"
-	AC_MSG_RESULT("failed")
+        with_clucene="no"
+	AC_MSG_RESULT(excluding support)
 else
 	AC_MSG_RESULT($clucene_set_failed)
 fi
 
 if test "$clucene_set_failed" = "true"; then
-	AC_MSG_ERROR([You must call configure with the --with-clucene option
-		or you must compile this package from a subdirectory of the clucene core.
+	AC_MSG_WARN([Could not detect clucene location.  To enable clucene, you must
+		call configure with the --with-clucene option specifying the location.
 	    This tells configure where to find the CLucene Core library and headers.
 	    e.g. --with-clucene=/usr/local or --with-clucene=/usr])
 fi
 AC_SUBST(CLUCENE_LIBS)
 AC_SUBST(CLUCENE_CXXFLAGS)
+fi
 
 
 

Modified: trunk/m4/cppunit.m4
===================================================================
--- trunk/m4/cppunit.m4	2007-05-13 18:55:38 UTC (rev 2050)
+++ trunk/m4/cppunit.m4	2007-05-18 21:35:21 UTC (rev 2051)
@@ -1,7 +1,7 @@
 dnl
 dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
 dnl
-AC_DEFUN(AM_PATH_CPPUNIT,
+AC_DEFUN([AM_PATH_CPPUNIT],
 [
 
 AC_ARG_WITH(cppunit-prefix,[  --with-cppunit-prefix=PFX   Prefix where CppUnit is installed (optional)],

Modified: trunk/usrinst.sh
===================================================================
--- trunk/usrinst.sh	2007-05-13 18:55:38 UTC (rev 2050)
+++ trunk/usrinst.sh	2007-05-18 21:35:21 UTC (rev 2051)
@@ -7,9 +7,9 @@
 #OPTIONS="--with-vcl $OPTIONS"
 OPTIONS="--enable-debug $OPTIONS"
 #OPTIONS="--enable-profile $OPTIONS"
-OPTIONS="--with-lucene $OPTIONS"
-OPTIONS="--with-icu $OPTIONS"
-#OPTIONS="--without-curl $OPTIONS"
+#OPTIONS="--with-icu $OPTIONS"
+#OPTIONS="--without-clucene $OPTIONS"
+OPTIONS="--without-curl $OPTIONS"
 OPTIONS="--enable-tests $OPTIONS"
 #OPTIONS="--disable-utilities $OPTIONS"