From 15098a5cd1b8a2bff9dc819d4f94e5ab544c4700 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Sat, 7 Sep 2002 07:52:23 +0000
Subject: [PATCH] * configure.in: Eliminate --with-terminfo option, which was
 essentially equivalent to --with-included-slang and didn't force anything. *
 acinclude.m4 (AC_USE_TERMINFO): Remove. * INSTALL: Adjust to match. * FAQ:
 Likewise.

---
 ChangeLog    |  9 +++++++++
 FAQ          |  6 +++---
 INSTALL      |  9 ++++-----
 acinclude.m4 | 16 ++++------------
 configure.in |  9 ---------
 5 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6c6c06541..3865e1a5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-09-07  Pavel Roskin  <proski@gnu.org>
+
+	* configure.in: Eliminate --with-terminfo option, which was
+	essentially equivalent to --with-included-slang and didn't force
+	anything.
+	* acinclude.m4 (AC_USE_TERMINFO): Remove.
+	* INSTALL: Adjust to match.
+	* FAQ: Likewise.
+
 2002-09-05  Pavel Roskin  <proski@gnu.org>
 
 	* configure.in: Fix USE_VFS_NET conditional.  Don't substitute
diff --git a/FAQ b/FAQ
index 934cabe4d..6a7519239 100644
--- a/FAQ
+++ b/FAQ
@@ -214,9 +214,9 @@ Questions and Answers
      http://www.tuxedo.org/~esr/terminfo/
      ftp://dickey.his.com/ncurses/
 
-   You can select whether Midnight Commander will use terminfo or termcap
-   database by giving --with-terminfo or --with-termcap option to the
-   configure. Default is terminfo if found, otherwise termcap.
+   You can force Midnight Commander to use the termcap database by
+   giving --with-termcap option to the configure script.  The default
+   is to use terminfo.
 
    If you don't have permissions to edit terminal databases you can use
    Learn keys feature of Midnight Commander instead. Press Esc 9 o k and
diff --git a/INSTALL b/INSTALL
index c56a40c39..0d959112c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -149,11 +149,10 @@ better than everything else),
      on your system it will be used if possible.  You can force usage of
      the included S-Lang with the `--with-included-slang' option.
 
-     This option will usually try to use the terminfo database if it
-     is available, otherwise it will use the termcap database.  At
-     compile time, you may force the use the terminal database with
-     the `--with-termcap' and `--with-terminfo' options (both options
-     automatically turn `--with-included-slang' on).
+     S-Lang tries to use the terminfo database if it's available,
+     otherwise it uses the termcap database.  At the compile time, you
+     may force using the termcap database by using the option
+     `--with-termcap', which also enables `--with-included-slang'.
 
 `--with-ncurses[=directory]'
      Use this flag (either with or without the =directory part), if
diff --git a/acinclude.m4 b/acinclude.m4
index 777f8848b..9be99fdbd 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -634,12 +634,6 @@ fi
 rm -f conftest*]
 )
 
-AC_DEFUN([AC_USE_TERMINFO], [
-	AC_DEFINE(SLANG_TERMINFO, 1, [Define to use S-Lang with terminfo])
-	AC_MSG_NOTICE([using SLang screen manager/terminfo])
-	slang_term=" with terminfo"
-])
-
 AC_DEFUN([AC_USE_TERMCAP], [
 	AC_MSG_NOTICE([using S-Lang screen manager/termcap])
 	AC_DEFINE(USE_TERMCAP, 1, [Define to use termcap library])
@@ -669,25 +663,23 @@ AC_DEFUN([AC_WITH_SLANG], [
 	    #endif], [
 	    SLtt_get_terminfo();
 	    SLtt_tgetflag("");], 
-	    [LIBS="$ac_save_LIBS"; AC_USE_TERMINFO], 
+	    [LIBS="$ac_save_LIBS"],
 	    [LIBS="$ac_save_LIBS"; AC_USE_TERMCAP])
 	else
 	    screen_manager="SLang"
 	fi
 	if $slang_check_lib
 	then
-	    use_terminfo=false
+	    use_terminfo=
 	    for dir in 	/usr/lib /usr/share/lib /usr/local/lib /lib \
 			/usr/local/share /usr/share
 	    do
 		if test -d $dir/terminfo; then
-		use_terminfo=true; 
+		use_terminfo=yes
 		break
 		fi
 	    done
-	    if $use_terminfo; then
-		AC_USE_TERMINFO
-	    else
+	    if test -z "$use_terminfo"; then
 		AC_USE_TERMCAP
 	    fi
         fi]
diff --git a/configure.in b/configure.in
index 8da129ec1..f2dc1d5f0 100644
--- a/configure.in
+++ b/configure.in
@@ -494,15 +494,6 @@ if test "x$screen_type" != xncurses; then
 	])
 fi
 
-AC_ARG_WITH(terminfo,
-        [--with-terminfo            SLANG: Force usage of terminfo],[
-	if test x$withval = xyes; then
-		AC_USE_TERMINFO
-		slang_check_lib=false
-		slang_use_system_installed_lib=false
-	fi]
-)
-
 AC_ARG_WITH(termcap,
 	[--with-termcap             SLANG: Force usage of termcap],[
 	if test x$withval = xyes; then