introduced some autoconf

src/mk/Darwin

@@ -1,10 +1,9 @@
 include ../mk/commondefs
+include ../mk/localdefs
 
-CXXFLAGS = $(COMMONCXXFLAGS) \
-	 -DHAVE_VASPRINTF=1 \
-	 -DHAVE_MKDTEMP=1
+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)
+