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.52 2002-10-30 13:59:42 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)
],[
AC_MSG_CHECKING(for docbookx.dtd)
for d in /usr/share/sgml/docbook/dtd/xml/4.1.2 \
- /usr/share/sgml/docbook/xml-dtd-4.1.2 \
+ /usr/share/sgml/docbook/xml-dtd-4.1.2* \
/usr/share/sgml/docbook/xml-dtd-4.1 \
/usr/share/sgml/docbook/dtd/xml/4.0 \
/usr/lib/sgml/dtd/docbook-xml
],[
AC_MSG_CHECKING(for docbook.dsl)
for d in /usr/share/sgml/docbook/stylesheet/dsssl/modular \
- /usr/share/sgml/docbook/dsssl-stylesheets-1.64 \
- /usr/share/sgml/docbook/dsssl-stylesheets-1.59 \
+ /usr/share/sgml/docbook/dsssl-stylesheets-1.* \
/usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh
do
if test -f $d/html/docbook.dsl; then
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
isamc/Makefile
isam/Makefile
rset/Makefile
+ data1/Makefile
recctrl/Makefile
index/Makefile
include/Makefile
doc/zebraphp.dsl
test/Makefile test/gils/Makefile test/usmarc/Makefile test/api/Makefile
test/dmoz/Makefile
+ examples/Makefile examples/gils/Makefile examples/dinosauricon/Makefile
])