oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

dont build editline if not needed. From Guillame Rosse

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23372 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-07-17 20:42:30 +00:00
parent b284984fc7
commit 97aa9055da
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cf/krb-readline.m4
View File

@@ -22,16 +22,20 @@ fi
dnl readline dnl readline
ac_foo=no ac_foo=no
build_editline=no
if test "$with_readline" = yes; then if test "$with_readline" = yes; then
: :
elif test "$ac_cv_func_readline" = yes; then elif test "$ac_cv_func_readline" = yes; then
: :
elif test "$ac_cv_func_el_init" = yes; then elif test "$ac_cv_func_el_init" = yes; then
ac_foo=yes ac_foo=yes
build_editline=yes
LIB_readline="\$(top_builddir)/lib/editline/libel_compat.la \$(LIB_el_init) \$(LIB_tgetent)" LIB_readline="\$(top_builddir)/lib/editline/libel_compat.la \$(LIB_el_init) \$(LIB_tgetent)"
else else
build_editline=yes
LIB_readline="\$(top_builddir)/lib/editline/libeditline.la \$(LIB_tgetent)" LIB_readline="\$(top_builddir)/lib/editline/libeditline.la \$(LIB_tgetent)"
fi fi
AM_CONDITIONAL(EDITLINE "$build_editline" = yes)
AM_CONDITIONAL(el_compat, test "$ac_foo" = yes) AM_CONDITIONAL(el_compat, test "$ac_foo" = yes)
AC_DEFINE(HAVE_READLINE, 1, AC_DEFINE(HAVE_READLINE, 1,
[Define if you have a readline compatible library.])dnl [Define if you have a readline compatible library.])dnl

5
lib/Makefile.am
View File

@@ -2,6 +2,9 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
if EDITLINE
dir_editline = editline
endif
if KRB4 if KRB4
dir_45 = 45 dir_45 = 45
endif endif
@@ -18,6 +21,6 @@ if !HAVE_OPENSSL
dir_hcrypto = hcrypto dir_hcrypto = hcrypto
endif endif
SUBDIRS = roken vers editline $(dir_com_err) sl wind asn1 sqlite \ SUBDIRS = roken vers $(dir_editline) $(dir_com_err) sl wind asn1 sqlite \
$(dir_hcrypto) hx509 krb5 ntlm kafs gssapi hdb kadm5 \ $(dir_hcrypto) hx509 krb5 ntlm kafs gssapi hdb kadm5 \
auth $(dir_45) $(dir_otp) $(dir_dce) auth $(dir_45) $(dir_otp) $(dir_dce)