X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=ead21ac38dfba249f0ec92594d4d863f3ff88187;hb=48abc88bc981af496e660e8f8a7a4aa678781623;hp=00c5c408ce1c1b6d72240fe826a3cd65424c0294;hpb=96809bad943557af7ac0d01d78ed7fc18dc18436;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index 00c5c40..ead21ac 100644
--- a/configure.in
+++ b/configure.in
@@ -1,10 +1,11 @@
-dnl YAZ Toolkit, Index Data 1994-2001
+dnl YAZ Toolkit, Index Data 1994-2002
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.65 2002-03-21 21:30:44 adam Exp $
+dnl $Id: configure.in,v 1.79 2002-08-17 07:56:59 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 1.8.6)
+AM_INIT_AUTOMAKE(yaz, 1.8.9)
 dnl
 AC_SUBST(READLINE_LIBS)
+AC_SUBST(YAZ_CONF_CFLAGS)
 dnl ------ Checking programs
 AC_PROG_CC
 AC_PROG_CPP
@@ -22,7 +23,8 @@ 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/dtd/xml/4.0 \
+         /usr/share/sgml/docbook/xml-dtd-4.1.2 \
+         /usr/share/sgml/docbook/dtd/xml/4.0 \
 	    /usr/lib/sgml/dtd/docbook-xml 
    do
      if test -f $d/docbookx.dtd; then
@@ -44,6 +46,7 @@ AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      Use DSSSL in DIR/{html,print}/docbo
 ],[
    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/lib/sgml/stylesheet/dsssl/docbook/nwalsh 
    do
      if test -f $d/html/docbook.dsl; then
@@ -57,27 +60,6 @@ AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      Use DSSSL in DIR/{html,print}/docbo
    fi
 ])
 dnl 
-dnl ----- yaz-comp: The Yaz Compiler
-AC_SUBST(EXTRAMODULE)
-AC_SUBST(EXTRALIB)
-
-EXTRAMODULE="z39.50 zutil"
-
-AC_ARG_ENABLE(modules,[  --enable-modules=\"mod ..\" ill],[
-if test "$enable_modules" != "no"; then
-		EXTRAMODULE="$EXTRAMODULE $enable_modules"
-fi
-],[
-EXTRAMODULE="$EXTRAMODULE ill ccl zoom"
-])
-EXTRALIB=""
-for module in $EXTRAMODULE; do
-	EXTRALIB="$EXTRALIB ../$module/lib${module}.la"
-	if test $module = "z39.50"; then
-		module=z3950
-	fi
-	AC_DEFINE_UNQUOTED(YAZ_MODULE_${module})
-done
 dnl ----- Sockets
 checkBoth=0
 AC_CHECK_FUNC(connect)
@@ -91,6 +73,31 @@ 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])
@@ -123,6 +130,7 @@ if test "$openssl" != "no"; then
 	CFLAGS="$xCFLAGS"
 fi
 AM_CONDITIONAL(ISSSL, test $USE_SSL = "1")
+dnl
 dnl ------ GNU Readline
 READLINE_SHARED_LIBADD=""
 AC_CHECK_LIB(ncurses, tgetent, [READLINE_SHARED_LIBADD="-lncurses"],
@@ -133,6 +141,27 @@ AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline $READ
 AC_CHECK_LIB(history, add_history, [READLINE_LIBS="$READLINE_LIBS -lhistory"])
 if test "$ac_cv_lib_readline_readline" = "yes"; then
 	AC_CHECK_HEADERS(readline/readline.h readline/history.h)
+        xLIBS=$LIBS
+        LIBS="$LIBS $READLINE_LIBS"
+        AC_TRY_LINK([
+	#include <stdio.h>
+	#include <readline/readline.h>
+	],[
+        static void f()
+        {
+                rl_attempted_completion_over = 0;
+        }
+        ],AC_DEFINE(HAVE_READLINE_COMPLETION_OVER))
+        AC_TRY_LINK([
+	#include <stdio.h>
+	#include <readline/readline.h>
+	],[
+        static void f()
+        {
+                rl_completion_matches (0, 0);
+        }
+        ],AC_DEFINE(HAVE_READLINE_RL_COMPLETION_MATCHES))
+        LIBS=$xLIBS
 fi
 dnl ------ various functions
 AC_CHECK_FUNCS(vsnprintf gettimeofday poll)
@@ -169,7 +198,7 @@ if test "$enable_tcpd" != ""; then
 fi
 dnl
 dnl ------ Headers
-AC_CHECK_HEADERS(fnmatch.h)
+AC_CHECK_HEADERS(fnmatch.h iconv.h)
 AC_STDC_HEADERS
 if test "$ac_cv_header_stdc" = "no"; then
 	AC_MSG_WARN(Your system doesn't seem to support ANSI C)
@@ -213,7 +242,7 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
 		thread_ok=yes,thread_ok=no)
 	if test "$thread_ok" = "yes"; then
 		AC_MSG_RESULT(yes)
-		LIBTHREAD=-lpthread
+		LIBTHREAD="-lpthread"
 		CFLAGSTHREADS="-DYAZ_POSIX_THREADS=1 -D_REENTRANT"
 		HAVETHREADS=1
 	else
@@ -227,6 +256,7 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
 		if test "$thread_ok" = "yes"; then
 			AC_MSG_RESULT([yes,BSD])
 			CFLAGSTHREADS="-pthread -DYAZ_POSIX_THREADS=1 -D_REENTRANT"
+			LIBTHREAD="-pthread"
 			HAVETHREADS=1
 		fi
 	fi
@@ -257,8 +287,6 @@ if test -f ${srcdir}/lib/yaz-config.in; then
 fi
 sed s%yaz_echo_source=yes%yaz_echo_source=no%g < ${srcdir}/yaz-config.in >${srcdir}/lib/yaz-config.in
 dnl
-SUBDIRS_VAR="util odr comstack $EXTRAMODULE tab retrieval server include lib include client ztest"
-AC_SUBST(SUBDIRS_VAR)
 dnl ------ Makefiles
 dnl
 AC_OUTPUT([