mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-28 18:49:34 -05:00
As ud(1) is in the Attic, TERMCAP no longer needed
This commit is contained in:
parent
c425a7ce1d
commit
459d6f41e2
4 changed files with 870 additions and 1073 deletions
|
|
@ -182,7 +182,6 @@ SECURITY_LIBS = $(SASL_LIBS) $(KRB_LIBS) $(TLS_LIBS) $(AUTH_LIBS)
|
|||
MODULES_CPPFLAGS = @SLAPD_MODULES_CPPFLAGS@
|
||||
MODULES_LDFLAGS = @SLAPD_MODULES_LDFLAGS@
|
||||
MODULES_LIBS = @MODULES_LIBS@
|
||||
TERMCAP_LIBS = @TERMCAP_LIBS@
|
||||
SLAPD_PERL_LDFLAGS = @SLAPD_PERL_LDFLAGS@
|
||||
|
||||
SLAPD_SQL_LDFLAGS = @SLAPD_SQL_LDFLAGS@
|
||||
|
|
|
|||
30
configure.in
30
configure.in
|
|
@ -599,7 +599,6 @@ SLAPD_SQL_INCLUDES=
|
|||
KRB4_LIBS=
|
||||
KRB5_LIBS=
|
||||
SASL_LIBS=
|
||||
TERMCAP_LIBS=
|
||||
TLS_LIBS=
|
||||
MODULES_LIBS=
|
||||
SLAPI_LIBS=
|
||||
|
|
@ -2159,34 +2158,6 @@ if test $ol_enable_sql != no ; then
|
|||
fi
|
||||
fi
|
||||
|
||||
dnl ----------------------------------------------------------------
|
||||
dnl ud needs termcap (should insert check here)
|
||||
ol_link_termcap=no
|
||||
AC_CHECK_HEADERS(termcap.h ncurses.h)
|
||||
|
||||
if test $ol_link_termcap = no ; then
|
||||
AC_CHECK_LIB(termcap, tputs, [have_termcap=yes], [have_termcap=no])
|
||||
if test $have_termcap = yes ; then
|
||||
AC_DEFINE(HAVE_TERMCAP, 1, [define if you have -ltermcap])
|
||||
ol_link_termcap=yes
|
||||
TERMCAP_LIBS=-ltermcap
|
||||
fi
|
||||
fi
|
||||
|
||||
if test $ol_link_termcap = no ; then
|
||||
AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no])
|
||||
if test $have_ncurses = yes ; then
|
||||
AC_DEFINE(HAVE_NCURSES, 1, [define if you have -lncurses])
|
||||
ol_link_termcap=yes
|
||||
TERMCAP_LIBS=-lncurses
|
||||
fi
|
||||
fi
|
||||
|
||||
if test $ol_link_termcap = no ; then
|
||||
AC_DEFINE(NO_TERMCAP,1, [define if you have no termcap support])
|
||||
TERMCAP_LIBS=
|
||||
fi
|
||||
|
||||
dnl ----------------------------------------------------------------
|
||||
dnl
|
||||
dnl Check for Cyrus SASL
|
||||
|
|
@ -2891,7 +2862,6 @@ AC_SUBST(MOD_PERL_LDFLAGS)
|
|||
AC_SUBST(KRB4_LIBS)
|
||||
AC_SUBST(KRB5_LIBS)
|
||||
AC_SUBST(SASL_LIBS)
|
||||
AC_SUBST(TERMCAP_LIBS)
|
||||
AC_SUBST(TLS_LIBS)
|
||||
AC_SUBST(MODULES_LIBS)
|
||||
AC_SUBST(SLAPI_LIBS)
|
||||
|
|
|
|||
|
|
@ -443,9 +443,6 @@
|
|||
/* Define if you have the <memory.h> header file. */
|
||||
#undef HAVE_MEMORY_H
|
||||
|
||||
/* Define if you have the <ncurses.h> header file. */
|
||||
#undef HAVE_NCURSES_H
|
||||
|
||||
/* Define if you have the <ndbm.h> header file. */
|
||||
#undef HAVE_NDBM_H
|
||||
|
||||
|
|
@ -581,9 +578,6 @@
|
|||
/* Define if you have the <tcpd.h> header file. */
|
||||
#undef HAVE_TCPD_H
|
||||
|
||||
/* Define if you have the <termcap.h> header file. */
|
||||
#undef HAVE_TERMCAP_H
|
||||
|
||||
/* Define if you have the <termios.h> header file. */
|
||||
#undef HAVE_TERMIOS_H
|
||||
|
||||
|
|
@ -797,15 +791,6 @@
|
|||
/* define if you have -lwrap */
|
||||
#undef HAVE_TCPD
|
||||
|
||||
/* define if you have -ltermcap */
|
||||
#undef HAVE_TERMCAP
|
||||
|
||||
/* define if you have -lncurses */
|
||||
#undef HAVE_NCURSES
|
||||
|
||||
/* define if you have no termcap support */
|
||||
#undef NO_TERMCAP
|
||||
|
||||
/* define if you have Cyrus SASL */
|
||||
#undef HAVE_CYRUS_SASL
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue