projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix rl_attempted_completion_over
[yaz-moved-to-github.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
168eaac
..
b7469a7
100644
(file)
--- 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 YAZ Toolkit, Index Data 1994-2001
dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.66 2002-03-22 20:53:13 adam Exp $
+dnl $Id: configure.in,v 1.70 2002-04-15 11:19:32 adam Exp $
AC_INIT(include/yaz/yaz-version.h)
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
dnl
AC_SUBST(READLINE_LIBS)
dnl ------ Checking programs
@@
-22,7
+22,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 \
],[
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
/usr/lib/sgml/dtd/docbook-xml
do
if test -f $d/docbookx.dtd; then
@@
-44,6
+45,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 \
],[
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
/usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh
do
if test -f $d/html/docbook.dsl; then
@@
-133,6
+135,15
@@
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)
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 <readline/readline.h>],[
+ static void f()
+ {
+ rl_attempted_completion_over = 0;
+ }
+ ],AC_DEFINE(HAVE_READLINE_COMPLETION_OVER))
+ LIBS=$OLDLIBS
fi
dnl ------ various functions
AC_CHECK_FUNCS(vsnprintf gettimeofday poll)
fi
dnl ------ various functions
AC_CHECK_FUNCS(vsnprintf gettimeofday poll)
@@
-213,7
+224,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)
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
CFLAGSTHREADS="-DYAZ_POSIX_THREADS=1 -D_REENTRANT"
HAVETHREADS=1
else
@@
-227,6
+238,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"
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
HAVETHREADS=1
fi
fi