Heimdal really uses termcap


(roy)

$NetBSD: patch-lib_libedit_configure,v 1.1 2013/10/11 16:21:40 roy Exp $

Include termcap in the termcap test

--- lib/libedit/configure.orig	2013-10-11 15:50:12.000000000 +0000
+++ lib/libedit/configure
@@ -11603,7 +11603,50 @@ test -n "$NROFF" || NROFF="/bin/false"
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
+$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
+if test "${ac_cv_lib_curses_termcap+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltermcap  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tgetent ();
+int
+main ()
+{
+return tgetent ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_termcap_tgetent=yes
+else
+  ac_cv_lib_termcap_tgetent=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
+$as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
+if test "x$ac_cv_lib_termcap_tgetent" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBTERMCAP 1
+_ACEOF
+
+  LIBS="-ltermcap $LIBS"
+
+else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5
 $as_echo_n "checking for tgetent in -lcurses... " >&6; }
 if test "${ac_cv_lib_curses_tgetent+set}" = set; then :
@@ -11692,11 +11735,12 @@ _ACEOF
   LIBS="-lncurses $LIBS"
 
 else
-  as_fn_error "libcurses or libncurses are required!" "$LINENO" 5
+  as_fn_error "libtermcap, libcurses or libncurses are required!" "$LINENO" 5
 fi
 
 fi
 
+fi
 
 
 ### use option --enable-widec to turn on use of wide-character support

$NetBSD: patch-lib_libedit_configure.ac,v 1.1 2013/10/11 16:21:40 roy Exp $

Include termcap in the termcap test

--- lib/libedit/configure.ac.orig	2013-10-11 15:50:21.000000000 +0000
+++ lib/libedit/configure.ac
@@ -33,9 +33,10 @@ AC_PROG_AWK
 EL_MANTYPE
 
 
-AC_CHECK_LIB(curses, tgetent,,
-   [AC_CHECK_LIB(ncurses, tgetent,,
-      [AC_MSG_ERROR([libcurses or libncurses are required!])] )] )
+AC_CHECK_LIB(termcap, tgetent,,
+   [AC_CHECK_LIB(curses, tgetent,,
+      [AC_CHECK_LIB(ncurses, tgetent,,
+         [AC_MSG_ERROR([libtermcap, libcurses or libncurses are required!])] )] )] )
 
 
 ### use option --enable-widec to turn on use of wide-character support