mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-28 18:49:34 -05:00
Use $TERMCAP_LIBS in readline test.
This commit is contained in:
parent
0b9c3953f2
commit
5302491e94
2 changed files with 498 additions and 490 deletions
52
configure.in
52
configure.in
|
|
@ -463,30 +463,6 @@ if test $ol_link_kerberos = yes ; then
|
|||
AC_DEFINE(HAVE_KERBEROS, 1, [define if you have Kerberos])
|
||||
fi
|
||||
|
||||
dnl
|
||||
dnl Check for GNU readline
|
||||
dnl
|
||||
ol_link_readline=no
|
||||
if test $ol_with_readline != no ; then
|
||||
AC_CHECK_HEADERS(readline/readline.h readline/history.h)
|
||||
|
||||
if test $ac_cv_header_readline_readline_h = yes ; then
|
||||
AC_CHECK_LIB(readline, readline,
|
||||
[have_readline=yes], [have_readline=no])
|
||||
|
||||
if test $have_readline = yes ; then
|
||||
ol_with_readline=found
|
||||
ol_link_readline=yes
|
||||
|
||||
READLINE_LIBS="-lreadline"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test $ol_link_readline = yes ; then
|
||||
AC_DEFINE(HAVE_READLINE, 1, [define if you have -lreadline])
|
||||
fi
|
||||
|
||||
dnl
|
||||
dnl Check for SSL/TLS
|
||||
dnl
|
||||
|
|
@ -1493,6 +1469,34 @@ if test $ol_link_termcap = no ; then
|
|||
TERMCAP_LIBS=
|
||||
fi
|
||||
|
||||
dnl
|
||||
dnl Check for GNU readline
|
||||
dnl
|
||||
ol_link_readline=no
|
||||
if test $ol_with_readline != no ; then
|
||||
AC_CHECK_HEADERS(readline/readline.h readline/history.h)
|
||||
|
||||
if test $ac_cv_header_readline_readline_h = yes ; then
|
||||
save_LIBS="$LIBS"
|
||||
LIBS="$TERMCAP_LIBS $LIBS"
|
||||
AC_CHECK_LIB(readline, readline,
|
||||
[have_readline=yes], [have_readline=no])
|
||||
LIBS="$save_LIBS"
|
||||
|
||||
if test $have_readline = yes ; then
|
||||
ol_with_readline=found
|
||||
ol_link_readline=yes
|
||||
|
||||
READLINE_LIBS="-lreadline"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test $ol_link_readline = yes ; then
|
||||
AC_DEFINE(HAVE_READLINE, 1, [define if you have -lreadline])
|
||||
fi
|
||||
|
||||
|
||||
# FreeBSD (and others) have crypt(3) in -lcrypt
|
||||
if test $ol_enable_crypt != no ; then
|
||||
AC_CHECK_FUNC(crypt, [have_crypt=yes], [
|
||||
|
|
|
|||
Loading…
Reference in a new issue