master 1395fb8 08/10: Merge from origin/emacs-27

[Glenn Morris]

branch: master
commit 1395fb8ff7c7e55bc7f5d3c901cb45bd0b3c7c8f
Merge: e8bf725 2e09efd
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>

    Merge from origin/emacs-27
    
    2e09efdb68 Revert previous patch which was installed into wrong branch.
---
 configure.ac   | 12 ------------
 src/terminfo.c |  6 +++---
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index 66c6606..bcc0be7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4393,18 +4393,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 a9c9572..15aff31 100644
--- 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