introduced some autoconf

src/Makefile

@@ -1,4 +1,4 @@
-# @(#$Id: Makefile,v 1.11 2005-11-12 11:26:09 dockes Exp $  (C) 2005 J.F.Dockes
+# @(#$Id: Makefile,v 1.12 2005-11-12 14:19:28 dockes Exp $  (C) 2005 J.F.Dockes
 
 # Default values. These can be overridden on the command line ie: 
 # make PREFIX=/usr
@@ -10,7 +10,8 @@ all: mk/sysconf
 	cd bincimapmime; ${MAKE}
 	cd index; rm -f recollindex; ${MAKE} recollindex
 	cd qtgui; qmake recoll.pro; rm -f recoll; \
-	   cat ../mk/commondefs ../mk/sysconf Makefile | ${MAKE} -f -
+	   cat ../mk/sysconf Makefile | \
+	       ${MAKE} -f -
 
 mk/sysconf:
 	./configure
@@ -21,7 +22,7 @@ static:
 	cd index; rm -f recollindex; \
 	   ${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic
 	cd qtgui; qmake recoll.pro; rm -f recoll \
-	   cat ../mk/commondefs ../mk/sysconf Makefile | ${MAKE} -f - \
+	   cat ../mk/sysconf Makefile | ${MAKE} -f - \
 	       BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic
 
 clean:

src/configure.ac

@@ -0,0 +1,69 @@
+AC_INIT(Recoll, 1.0)
+AC_PREREQ(2.53)
+AC_CONFIG_SRCDIR(index/recollindex.cpp)
+
+sys=`uname`
+if test -f mk/$sys ; then
+    (cd mk; test -f sysconf || ln -s $sys sysconf)
+else
+   cat <<EOF
+    No system configuration file found in mk/ for '$sys'. Maybe you
+    could try to write one, starting from one of the existing files, they
+    are really simple.
+EOF
+   exit 1
+fi
+
+##### Look for iconv in libc (Linux), or libiconv in /usr/local/lib:/usr/lib
+AC_LANG(C)
+LIBICONV=""
+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
+  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
+    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/include)
+  fi
+fi
+LDFLAGS=$S_LDFLAGS
+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
+   LIBICONV=""
+fi
+echo LIBICONV $LIBICONV
+echo INCICONV $INCICONV
+
+#### Look for Xapian
+AC_PATH_PROG(XAPIAN_CONFIG, xapian-config, no)
+if test "$XAPIAN_CONFIG" = "no" ; then
+   AC_MSG_ERROR([Cannot find xapian-config command in $PATH. Is
+xapian-core installed ?])
+   exit 1
+fi
+LIBXAPIAN=`$XAPIAN_CONFIG --libs`
+XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
+
+#echo XAPIAN_CONFIG $XAPIAN_CONFIG 
+#echo LIBXAPIAN $LIBXAPIAN
+#echo XAPIANCXXFLAGS $XAPIANCXXFLAGS
+
+AC_SUBST(LIBXAPIAN)
+AC_SUBST(XAPIANCXXFLAGS)
+AC_SUBST(LIBICONV)
+AC_SUBST(INCICONV)
+
+AC_CONFIG_FILES(mk/localdefs)
+
+AC_OUTPUT

src/mk/Darwin

@@ -1,10 +1,9 @@
 include ../mk/commondefs
+include ../mk/localdefs
 
-CXXFLAGS = $(COMMONCXXFLAGS) \
+CXXFLAGS = $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
 	   -DHAVE_VASPRINTF=1 \
 	   -DHAVE_MKDTEMP=1
 
 RANLIB = ranlib
-
-LIBICONV =  -L/usr/local/lib -liconv
 LIBSYS = 

src/mk/FreeBSD

@@ -1,8 +1,8 @@
 include ../mk/commondefs
+include ../mk/localdefs
 
-CXXFLAGS = $(COMMONCXXFLAGS) -pthread  \
+CXXFLAGS = $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
+	 -pthread  \
 	 -DHAVE_VASPRINTF=1 \
 	 -DHAVE_MKDTEMP=1
-
-LIBICONV =  -L/usr/local/lib -liconv
 LIBSYS = 

src/mk/Linux

@@ -1,9 +1,8 @@
 include ../mk/commondefs
 
-CXXFLAGS = $(COMMONCXXFLAGS) -D_GNU_SOURCE \
+CXXFLAGS = $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
+	 -D_GNU_SOURCE \
 	 -DHAVE_VASPRINTF=1 \
 	 -DHAVE_MKDTEMP=1
 
-LIBICONV =  
-
 LIBSYS = -lpthread

src/mk/SunOS

@@ -1,13 +1,9 @@
 include ../mk/commondefs
+include ../mk/localdefs
 
-CXXFLAGS = $(COMMONCXXFLAGS)
+CXXFLAGS = $(COMMONCXXFLAGS) $(LOCALCXXFLAGS)
 
 CC=gcc
 CXX=g++
 
-# Note that we use a static libiconv only to ease installation of binary
-# packages
-#LIBICONV =  -L/usr/local/lib -liconv
-LIBICONV =  /usr/local/lib/libiconv.a
-
 LIBSYS = -lpthread -lnsl -lsocket

src/mk/commondefs

@@ -1,4 +1,3 @@
-#
 # Definitions mostly common to all systems, can be overridden by
 # sys-specific include
 
@@ -6,11 +5,6 @@
 COMMONCXXFLAGS = -Wall -Wno-unused -g -I. -I../index -I../utils -I../common \
 	 -I../unac -I../bincimapmime -I/usr/local/include
 
-LIBXAPIAN = -L/usr/local/lib -lxapian
-
-LIBICONV  = -L/usr/local/lib -liconv
-INCICONV = -I/usr/local/include
-
 BIGLIB = ../lib/librcl.a
 MIMELIB = ../bincimapmime/libmime.a
 RANLIB = test -f
@@ -19,4 +13,3 @@ AR=ar
 INSTALL = install -c
 
 #QTDIR = /usr
-

src/mk/localdefs

@@ -0,0 +1,9 @@
+
+LIBXAPIAN=-L/usr/local/lib -lxapian
+XAPIANCXXFLAGS=-I/usr/local/include
+
+LIBICONV=-L/usr/local/lib -liconv
+INCICONV=-I/usr/local/include
+
+LOCALCXXFLAGS = $(INCICONV) $(CXXFLAGSXAPIAN)
+

src/mk/localdefs.in

@@ -0,0 +1,9 @@
+
+LIBXAPIAN=@LIBXAPIAN@
+XAPIANCXXFLAGS=@XAPIANCXXFLAGS@
+
+LIBICONV=@LIBICONV@
+INCICONV=@INCICONV@
+
+LOCALCXXFLAGS = $(INCICONV) $(CXXFLAGSXAPIAN)
+