X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=abdd37c8f6ef265ca9d3e4c4459623d3f3f98b41;hb=e57e9b19f4257768441a8025d08ce0e3430c7d78;hp=9f77f075311752b251ac7f5da71972c357640a9a;hpb=0ea0788a838ebc8f5918758a7c2d14d4c15c7f25;p=idzebra-moved-to-github.git

diff --git a/configure.in b/configure.in
index 9f77f07..abdd37c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 dnl Zebra, Index Data Aps, 1995-2002
-dnl $Id: configure.in,v 1.44 2002-08-29 14:04:45 mike Exp $
+dnl $Id: configure.in,v 1.49 2002-09-18 21:01:14 adam Exp $
 dnl
 AC_INIT(include/zebraver.h)
-AM_INIT_AUTOMAKE(zebra,1.3.1)
+AM_INIT_AUTOMAKE(idzebra,1.3.3)
 dnl ------ Substitutions
 AC_SUBST(TCL_INCLUDE)
 AC_SUBST(TCL_LIB)
@@ -86,7 +86,7 @@ if test "x$tclconfig" = xNONE; then
 	if test ! -r ${tclconfig}/tclConfig.sh; then
 		# Not found, try search for Tcl on Debian systems.
 		for d in /usr/lib/tcl*; do
-			if test -d $d; then
+			if test -f $d/tclConfig.sh; then
 				tclconfig=$d
 			fi
 		done
@@ -117,10 +117,45 @@ else
 fi
 dnl
 dnl ------ times
-AC_CHECK_HEADERS(sys/times.h iconv.h)
+AC_CHECK_HEADERS(sys/times.h)
+dnl
 dnl ------ mkstemp
 AC_CHECK_FUNCS(mkstemp)
 dnl
+dnl ------ iconv
+AC_ARG_WITH(iconv, [  --with-iconv[=DIR]      iconv library in DIR])
+if test "$with_iconv" != "no"; then
+	AC_MSG_CHECKING(for iconv)
+	oldLIBS="$LIBS"
+	oldCPPFLAGS="${CPPFLAGS}"
+	if test "$with_iconv" != "yes" -a "$with_iconv" != ""; then
+		LIBS="$LIBS -L${with_iconv}/lib"
+		CPPFLAGS="${CPPFLAGS} -I${with_iconv}/include"
+	fi
+	AC_TRY_LINK([
+		#include <iconv.h>
+	],[
+		static void f() {iconv_t t = iconv_open("", ""); }
+	],[
+		AC_DEFINE(HAVE_ICONV_H)
+		AC_MSG_RESULT(yes)
+	],[
+		LIBS="$LIBS -liconv"
+		AC_TRY_LINK([
+			#include <iconv.h>
+		],[
+			static void f() {iconv_t t = iconv_open("", ""); }
+		],[
+			AC_DEFINE(HAVE_ICONV_H)
+			AC_MSG_RESULT(yes)
+		],[
+			LIBS="$oldLIBS"
+			CPPFLAGS="$oldCPPFLAGS"
+			AC_MSG_RESULT(no)
+		])
+	])
+fi
+dnl
 dnl ------- BZIP2
 AC_CHECK_LIB(bz2,bzCompressInit)
 if test "$ac_cv_lib_bz2_bzCompressInit" = "yes"; then