[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108069: * configure.in: Invert the TERMINFO logic

[Glenn Morris]

------------------------------------------------------------
revno: 108069
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-04-30 20:46:02 -0400
message:
  * configure.in: Invert the TERMINFO logic
  (since "yes" is far more common than "no")
modified:
  ChangeLog
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-01 00:30:11 +0000
+++ b/ChangeLog 2012-05-01 00:46:02 +0000
@@ -1,5 +1,8 @@
 2012-05-01  Glenn Morris  <address@hidden>
 
+       * configure.in: Invert the TERMINFO logic,
+       since "yes" is far more common than "no".
+
        * configure.in (HAVE_LIBNCURSES): Remove; it is required to be true.
 
        * configure.in (LD_SWITCH_X_SITE_RPATH):

=== modified file 'configure.in'
--- a/configure.in      2012-05-01 00:34:56 +0000
+++ b/configure.in      2012-05-01 00:46:02 +0000
@@ -2894,25 +2894,15 @@
 For example, a libncurses-dev(el) or similar package.])
 fi
 
-## Use terminfo instead of termcap?
-## Note only system files NOT using terminfo are:
-## freebsd < 40000, ms-w32, msdos, netbsd < 599002500
-TERMINFO=no
+## Use termcap instead of terminfo?
+## Only true for: freebsd < 40000, ms-w32, msdos, netbsd < 599002500.
+TERMINFO=yes
 case "$opsys" in
-  ## cygwin: Fewer environment variables to go wrong, more terminal types.
-  ## hpux10-20: Use the system provided termcap(3) library.
-  ## openbsd: David Mazieres <address@hidden> says this
-  ##  is necessary.  Otherwise Emacs dumps core when run -nw.
-  aix4-2|cygwin|hpux*|irix6-5|openbsd|sol2*|unixware) TERMINFO=yes ;;
-
   ## darwin: Prevents crashes when running Emacs in Terminal.app under 10.2.
   ##  The ncurses library has been moved out of the System framework in
   ##  Mac OS X 10.2.  So if configure detects it, set the command-line
   ##  option to use it.
-  darwin|gnu*)
-    TERMINFO=yes
-    LIBS_TERMCAP="-lncurses"
-    ;;
+  darwin|gnu*) LIBS_TERMCAP="-lncurses" ;;
 
   freebsd)
     AC_MSG_CHECKING([whether FreeBSD is new enough to use terminfo])
@@ -2926,18 +2916,18 @@
     AC_MSG_RESULT($emacs_cv_freebsd_terminfo)
 
     if test $emacs_cv_freebsd_terminfo = yes; then
-      TERMINFO=yes
       LIBS_TERMCAP="-lncurses"
     else
+      TERMINFO=no
       LIBS_TERMCAP="-ltermcap"
     fi
     ;;
 
   netbsd)
     if test $ac_cv_search_tputs = -lterminfo; then
-      TERMINFO=yes
       LIBS_TERMCAP="-lterminfo"
     else
+      TERMINFO=no
       LIBS_TERMCAP="-ltermcap"
     fi
     ;;