From 85b9c59d0a222f16e6c749b4c3b768ea19732400 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Mon, 12 Jun 2000 12:52:57 +0000 Subject: [PATCH] x git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8390 ec53bebd-3082-4978-b11e-865c3cabbd6b --- cf/aix.m4 | 5 +++++ cf/krb-readline.m4 | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 cf/krb-readline.m4 diff --git a/cf/aix.m4 b/cf/aix.m4 index c31d5ad43..40929284b 100644 --- a/cf/aix.m4 +++ b/cf/aix.m4 @@ -19,4 +19,9 @@ if test "$aix" != no; then AIX_EXTRA_KAFS= fi fi + +AM_CONDITIONAL(HAVE_DLOPEN, test "$ac_cv_funclib_dlopen" != no)dnl +AC_SUBST(AFS_EXTRA_LD)dnl +AC_SUBST(AIX_EXTRA_KAFS)dnl + ]) \ No newline at end of file diff --git a/cf/krb-readline.m4 b/cf/krb-readline.m4 new file mode 100644 index 000000000..311b60822 --- /dev/null +++ b/cf/krb-readline.m4 @@ -0,0 +1,42 @@ +dnl +dnl Tests for readline functions +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_TRY_COMPILE([#include + #include ], + [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 + +ac_foo=no +if test "$with_readline" = yes; then + : +elif test "$ac_cv_func_readline" = yes; then + : +elif test "$ac_cv_func_el_init" = yes; then + ac_foo=yes + LIB_readline="\$(top_builddir)/lib/editline/libel_compat.a $LIB_el_init" +else + LIB_readline='$(top_builddir)/lib/editline/libeditline.a' +fi +AM_CONDITIONAL(el_compat, test "$ac_foo" = yes) +if test "$readline_libdir"; then + LIB_readline="-rpath $readline_libdir $LIB_readline" +fi +LIB_readline="$LIB_readline \$(LIB_tgetent)" +AC_DEFINE(HAVE_READLINE, 1, + [Define if you have a readline compatible library.])dnl + +]) \ No newline at end of file