From 35e7c669430e401e87f80f6c4c34e94d4a7def54 Mon Sep 17 00:00:00 2001
From: dockes <none@none>
Date: Sat, 12 Nov 2005 14:31:39 +0000
Subject: [PATCH] more config tweaks

---
 src/Makefile     |  4 +---
 src/configure    | 27 ++++++++++++++++++---------
 src/configure.ac | 18 ++++++++++++------
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index c29691ff..1424b138 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-# @(#$Id: Makefile,v 1.13 2005-11-12 14:23:36 dockes Exp $  (C) 2005 J.F.Dockes
+# @(#$Id: Makefile,v 1.14 2005-11-12 14:31:39 dockes Exp $  (C) 2005 J.F.Dockes
 
 # Default values. These can be overridden on the command line ie: 
 # make PREFIX=/usr
@@ -14,8 +14,6 @@ all: mk/sysconf
 	       ${MAKE} -f -
 
 mk/sysconf:
-	for d in bincimapmime index lib query;do \
-	    cp -f /dev/null $$d/alldeps;done
 	./configure
 
 static:
diff --git a/src/configure b/src/configure
index 62846832..e4e0eee0 100755
--- a/src/configure
+++ b/src/configure
@@ -1990,7 +1990,7 @@ if test $ac_cv_lib_c_iconv_open = yes; then
   LIBICONV=NONE;INCICONV=-I/usr/include
 fi
 
-if test A$LIBICONV = A ; then
+if test A"$LIBICONV" = A ; then
   dir=/usr/local/lib
   LDFLAGS="$S_LDFLAGS -L$dir"
   unset ac_cv_lib_iconv_iconv_open
@@ -2053,7 +2053,7 @@ if test $ac_cv_lib_iconv_iconv_open = yes; then
   LIBICONV="-L$dir -liconv";INCICONV=-I/usr/local/include
 fi
 
-  if test A$LIBICONV = A; then
+  if test A"$LIBICONV" = A; then
     dir=/usr/local/lib
     LDFLAGS="$S_LDFLAGS -L$dir"
     unset ac_cv_lib_iconv_iconv_open
@@ -2119,17 +2119,17 @@ fi
   fi
 fi
 LDFLAGS=$S_LDFLAGS
-if test A$LIBICONV = A ; then
+if test A"$LIBICONV" = A ; then
    { { echo "$as_me:$LINENO: error: Cannot find iconv_open anywhere. Please install iconv" >&5
 echo "$as_me: error: Cannot find iconv_open anywhere. Please install iconv" >&2;}
    { (exit 1); exit 1; }; }
    exit 1
 fi
-if test A$LIBICONV = ANONE ; then
+if test A"$LIBICONV" = ANONE ; then
    LIBICONV=""
 fi
-echo LIBICONV $LIBICONV
-echo INCICONV $INCICONV
+#echo LIBICONV $LIBICONV
+#echo INCICONV $INCICONV
 
 #### Look for Xapian
 # Extract the first word of "xapian-config", so it can be a program name with args.
@@ -2182,9 +2182,11 @@ xapian-core installed ?" >&2;}
 fi
 LIBXAPIAN=`$XAPIAN_CONFIG --libs`
 XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
-echo XAPIAN_CONFIG $XAPIAN_CONFIG
-echo LIBXAPIAN $LIBXAPIAN
-echo XAPIANCXXFLAGS $XAPIANCXXFLAGS
+
+#echo XAPIAN_CONFIG $XAPIAN_CONFIG
+#echo LIBXAPIAN $LIBXAPIAN
+#echo XAPIANCXXFLAGS $XAPIANCXXFLAGS
+
 
 
 
@@ -2192,6 +2194,13 @@ echo XAPIANCXXFLAGS $XAPIANCXXFLAGS
 
 ac_config_files="$ac_config_files mk/localdefs"
 
+
+for d in bincimapmime index lib query
+do
+    rm -f $d/alldeps.stamp
+    cp -f /dev/null $d/alldeps
+done
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
diff --git a/src/configure.ac b/src/configure.ac
index f6b0de5f..35d77525 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -21,13 +21,13 @@ S_LDFLAGS=$LDFLAGS
 dir=/usr/lib
 LDFLAGS="$S_LDFLAGS -L$dir"
 AC_CHECK_LIB(c, iconv_open, LIBICONV=NONE;INCICONV=-I/usr/include)
-if test A$LIBICONV = A ; then
+if test A"$LIBICONV" = A ; then
   dir=/usr/local/lib
   LDFLAGS="$S_LDFLAGS -L$dir"
   unset ac_cv_lib_iconv_iconv_open
   AC_CHECK_LIB(iconv, iconv_open, 
 		      LIBICONV="-L$dir -liconv";INCICONV=-I/usr/local/include)
-  if test A$LIBICONV = A; then
+  if test A"$LIBICONV" = A; then
     dir=/usr/local/lib
     LDFLAGS="$S_LDFLAGS -L$dir"
     unset ac_cv_lib_iconv_iconv_open
@@ -35,15 +35,15 @@ if test A$LIBICONV = A ; then
   fi
 fi
 LDFLAGS=$S_LDFLAGS
-if test A$LIBICONV = A ; then
+if test A"$LIBICONV" = A ; then
    AC_MSG_ERROR([Cannot find iconv_open anywhere. Please install iconv])
    exit 1
 fi
-if test A$LIBICONV = ANONE ; then
+if test A"$LIBICONV" = ANONE ; then
    LIBICONV=""
 fi
-echo LIBICONV $LIBICONV
-echo INCICONV $INCICONV
+#echo LIBICONV $LIBICONV
+#echo INCICONV $INCICONV
 
 #### Look for Xapian
 AC_PATH_PROG(XAPIAN_CONFIG, xapian-config, no)
@@ -66,4 +66,10 @@ AC_SUBST(INCICONV)
 
 AC_CONFIG_FILES(mk/localdefs)
 
+for d in bincimapmime index lib query
+do 
+    rm -f $d/alldeps.stamp
+    cp -f /dev/null $d/alldeps
+done
+
 AC_OUTPUT