diff options
Diffstat (limited to 'cf/krb-readline.m4')
| -rw-r--r-- | cf/krb-readline.m4 | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/cf/krb-readline.m4 b/cf/krb-readline.m4 index b5b32feeb..ddb94bf0d 100644 --- a/cf/krb-readline.m4 +++ b/cf/krb-readline.m4 @@ -6,18 +6,6 @@ dnl dnl el_init AC_DEFUN([KRB_READLINE],[ -AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent]) -if test "$ac_cv_func_el_init" = yes ; then - AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> - #include <histedit.h>]], - [[el_init("", NULL, NULL, NULL);]])], - [ac_cv_func_el_init_four=yes], - [ac_cv_func_el_init_four=no])]) - if test "$ac_cv_func_el_init_four" = yes; then - AC_DEFINE(HAVE_FOUR_VALUED_EL_INIT, 1, [Define if el_init takes four arguments.]) - fi -fi dnl readline @@ -25,18 +13,15 @@ ac_foo=no build_editline=no if test "$with_readline" = yes; then : +elif test "$with_libedit" = yes; then + LIB_readline="${LIB_libedit}" elif test "$ac_cv_func_readline" = yes; then : -elif test "$ac_cv_func_el_init" = yes; then - ac_foo=yes - build_editline=yes - LIB_readline="\$(top_builddir)/lib/editline/libel_compat.la \$(LIB_el_init) \$(LIB_tgetent)" else - build_editline=yes - LIB_readline="\$(top_builddir)/lib/editline/libeditline.la \$(LIB_tgetent)" + build_libedit=yes + LIB_readline="\$(top_builddir)/lib/libedit/src/libheimedit.la \$(LIB_tgetent)" fi -AM_CONDITIONAL(EDITLINE, test "$build_editline" = yes) -AM_CONDITIONAL(el_compat, test "$ac_foo" = yes) +AM_CONDITIONAL(LIBEDIT, test "$build_libedit" = yes) AC_DEFINE(HAVE_READLINE, 1, [Define if you have a readline compatible library.])dnl |