X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=93f67d329d55e5bf2e84cba393d75049d837bc8c;hb=751c149afdcefae54743ad78a6abac853aa81ea2;hp=8dcaa46bee2598e8d1c367a3ad47eeb0b68948a9;hpb=395e1d0a3cdda0339d5476abd0437b20cd5098a6;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index 8dcaa46..93f67d3 100644
--- a/configure.in
+++ b/configure.in
@@ -1,10 +1,11 @@
 dnl YAZ Toolkit, Index Data 1994-2001
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.68 2002-03-25 15:12:25 adam Exp $
+dnl $Id: configure.in,v 1.74 2002-05-22 11:19:34 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 1.8.7)
 dnl
 AC_SUBST(READLINE_LIBS)
+AC_SUBST(YAZ_CONF_CFLAGS)
 dnl ------ Checking programs
 AC_PROG_CC
 AC_PROG_CPP
@@ -93,6 +94,30 @@ if test "$checkBoth" = "1"; then
 fi
 AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
 dnl
+dnl ------ EXPAT
+expat=no
+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])
@@ -125,6 +150,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"],
@@ -135,6 +161,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)
@@ -215,7 +262,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
@@ -229,6 +276,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