X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=8668e97d25ddc7c50b44bb985b1ef8fd32fedcc3;hb=e0dc2b9e3d7bd7c91c6c6bb2fa650873a7ebfe72;hp=720b187afe070f2daac0afc8807bcb5bd7d1287d;hpb=0441a493b34ad8a90d3ecc336a52a146d2794f13;p=yaz-moved-to-github.git diff --git a/configure.in b/configure.in index 720b187..8668e97 100644 --- a/configure.in +++ b/configure.in @@ -1,8 +1,8 @@ dnl YAZ Toolkit, Index Data 1994-2002 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.78 2002-08-02 08:54:04 adam Exp $ +dnl $Id: configure.in,v 1.81 2002-08-28 21:00:29 mike Exp $ AC_INIT(include/yaz/yaz-version.h) -AM_INIT_AUTOMAKE(yaz, 1.8.8) +AM_INIT_AUTOMAKE(yaz, 1.8.9) dnl AC_SUBST(READLINE_LIBS) AC_SUBST(YAZ_CONF_CFLAGS) @@ -24,6 +24,7 @@ AC_ARG_WITH(dtd, [ --with-dtd[=DIR] Use docbookx.dtd in DIR], 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 \ /usr/share/sgml/docbook/dtd/xml/4.0 \ /usr/lib/sgml/dtd/docbook-xml do @@ -73,31 +74,6 @@ if test "$checkBoth" = "1"; then fi AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])) dnl -dnl -dnl ------ EXPAT -expat=yes -AC_ARG_WITH(expat, [ --with-expat[=DIR] EXPAT library in DIR],[expat=$withval]) -if test "$expat" != "no"; then - xLIBS="$LIBS"; - xCFLAGS="$CFLAGS"; - if test "$expat" != "yes"; then - EXPAT_CFLAGS="-I$expat/include" - EXPAT_LIBS="-L$expat/lib" - CFLAGS="$EXPAT_CFLAGS $CFLAGS" - LIBS="$EXPAT_LIBS $LIBS" - fi - AC_CHECK_LIB(expat,XML_ParserCreate,[LIBS="$LIBS -lexpat"]) - if test "$ac_cv_lib_expat_XML_ParserCreate" = "yes"; then - AC_CHECK_HEADERS(expat.h) - if test "$ac_cv_header_expat_h" = "yes"; then - YAZ_CONF_CFLAGS="$YAZ_CONF_CFLAGS -DYAZ_HAVE_EXPAT=1" - fi - else - LIBS="$xLIBS" - CFLAGS="$xCFLAGS" - fi -fi -dnl dnl ------ Open SSL openssl=no AC_ARG_WITH(openssl, [ --with-openssl[=DIR] OpenSSL library in DIR], [openssl=$withval])