Revert previous patch which was installed into wrong branch.

diff --git a/configure.ac b/configure.ac
index 89b0785d0314f097d038e7f5388ab5987a872b14..48e96529ff2837f2c276aa2f8705c7000a1a457c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4366,18 +4366,6 @@ TERMCAP_OBJ=tparam.o
 if test $TERMINFO = yes; then
   AC_DEFINE(TERMINFO, 1, [Define to 1 if you use terminfo instead of termcap.])
   TERMCAP_OBJ=terminfo.o
-  AC_CACHE_CHECK([whether $LIBS_TERMCAP library defines BC],
-    [emacs_cv_terminfo_defines_BC],
-    [OLD_LIBS=$LIBS
-     LIBS="$LIBS $LIBS_TERMCAP"
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[extern char *BC;]], [[return !*BC;]])],
-       [emacs_cv_terminfo_defines_BC=yes],
-       [emacs_cv_terminfo_defines_BC=no])
-     LIBS=$OLD_LIBS])
-  if test "$emacs_cv_terminfo_defines_BC" = yes; then
-    AC_DEFINE([TERMINFO_DEFINES_BC], 1, [Define to 1 if the
-      terminfo library defines the variables BC, PC, and UP.])
-  fi
 fi
 if test "X$LIBS_TERMCAP" = "X-lncurses"; then
   AC_DEFINE(USE_NCURSES, 1, [Define to 1 if you use ncurses.])

diff --git a/src/terminfo.c b/src/terminfo.c
index a9c9572bbb26a6faca61a87e92eaa1344ab4c860..15aff317f15165801ad87baaa5ad3d49d34a5620 100644 (file)
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -23,10 +23,10 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Define these variables that serve as global parameters to termcap,
    so that we do not need to conditionalize the places in Emacs
-   that set them.  But don't do that if terminfo defines them, as that
-   could cause link errors when using -fno-common.  */
+   that set them.  But don't do that for terminfo, as that could
+   cause link errors when using -fno-common.  */
 
-#ifndef TERMINFO_DEFINES_BC
+#if !TERMINFO
 char *UP, *BC, PC;
 #endif