X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=abdd37c8f6ef265ca9d3e4c4459623d3f3f98b41;hb=e57e9b19f4257768441a8025d08ce0e3430c7d78;hp=ff0e2be01d0cfef8f1be0a7b331971f44f823e9b;hpb=ad082113401287efdd32da0b2c2a3b169a169ea9;p=idzebra-moved-to-github.git diff --git a/configure.in b/configure.in index ff0e2be..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.46 2002-09-05 14:36:20 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(zebra,1.3.2) +AM_INIT_AUTOMAKE(idzebra,1.3.3) dnl ------ Substitutions AC_SUBST(TCL_INCLUDE) AC_SUBST(TCL_LIB) @@ -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 + ],[ + static void f() {iconv_t t = iconv_open("", ""); } + ],[ + AC_DEFINE(HAVE_ICONV_H) + AC_MSG_RESULT(yes) + ],[ + LIBS="$LIBS -liconv" + AC_TRY_LINK([ + #include + ],[ + 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