X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=abdd37c8f6ef265ca9d3e4c4459623d3f3f98b41;hb=238730873cdf47ff4945ce1635870b10601c9aa3;hp=34f28e96e2154d7de29a23984786324a2cacd601;hpb=c853052276a4532643bb6ca00caf6e53bd28f703;p=idzebra-moved-to-github.git

diff --git a/configure.in b/configure.in
index 34f28e9..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.48 2002-09-13 09:24:16 adam 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(idzebra,1.3.2)
+AM_INIT_AUTOMAKE(idzebra,1.3.3)
 dnl ------ Substitutions
 AC_SUBST(TCL_INCLUDE)
 AC_SUBST(TCL_LIB)
@@ -123,17 +123,37 @@ dnl ------ mkstemp
 AC_CHECK_FUNCS(mkstemp)
 dnl
 dnl ------ iconv
-AC_CHECK_FUNCS(iconv_open)
-if test "$ac_cv_func_iconv_open" = "no"; then
-	oldLibs=$LIBS
-	LIBS="$LIBS -liconv"
-	AC_CHECK_FUNCS(iconv_open)
-	if test "$ac_cv_func_iconv_open" = "no"; then
-		LIBS=$oldLibs
+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
-fi
-if test "$ac_cv_func_iconv_open" = "yes"; then
-        AC_CHECK_HEADERS(iconv.h)
+	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