X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=ea5551ecff5adc3f25650d9ba13ddd43c53d281d;hb=48bd65a2f5bda9d3407d92137524c14d288ec074;hp=ff2099678ce9b86af3a9c2edfff62d0710d1d150;hpb=397cccc3b0eeca050b002d96cefb8e042e4d2cbf;p=yaz-moved-to-github.git diff --git a/configure.in b/configure.in index ff20996..ea5551e 100644 --- a/configure.in +++ b/configure.in @@ -1,8 +1,8 @@ dnl YAZ Toolkit, Index Data 1994-2001 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.67 2002-03-24 10:14:46 adam Exp $ +dnl $Id: configure.in,v 1.72 2002-05-03 13:47:57 adam Exp $ AC_INIT(include/yaz/yaz-version.h) -AM_INIT_AUTOMAKE(yaz, 1.8.6) +AM_INIT_AUTOMAKE(yaz, 1.8.7) dnl AC_SUBST(READLINE_LIBS) dnl ------ Checking programs @@ -135,6 +135,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) + OLDLIBS=$LIBS + LIBS="$LIBS $READLINE_LIBS" + AC_TRY_LINK([ + #include + #include + ],[ + static void f() + { + rl_attempted_completion_over = 0; + } + ],AC_DEFINE(HAVE_READLINE_COMPLETION_OVER)) + AC_TRY_LINK([ + #include + #include + ],[ + static void f() + { + rl_completion_matches (0, 0); + } + ],AC_DEFINE(HAVE_READLINE_RL_COMPLETION_MATCHES)) + LIBS=$OLDLIBS fi dnl ------ various functions AC_CHECK_FUNCS(vsnprintf gettimeofday poll) @@ -215,7 +236,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 +250,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