patch 8.2.1310: configure with Xcode 12 fails to check for tgetent

Problem:    Configure with Xcode 12 fails to check for tgetent.
Solution:   Declare tgetent(). (Ozaki Kiichi, closes #6558)

diff --git a/src/auto/configure b/src/auto/configure
index 9c9a719d81af94ef2999ceb3d4a38f725250515f..41b29c2623fe845c14b9595dab89dbb2d0806e66 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -12106,7 +12106,7 @@ if test "x$olibs" = "x$LIBS"; then
 $as_echo_n "checking for tgetent()... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
+int tgetent(char *, const char *);
 int
 main ()
 {

diff --git a/src/configure.ac b/src/configure.ac
index 19ce4c7a5f3386d135d37da0cf13d5f19dd038e6..598d73c8dfc49678359855770d9510ce03ec643e 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -3510,7 +3510,7 @@ fi
 
 if test "x$olibs" = "x$LIBS"; then
   AC_MSG_CHECKING([for tgetent()])
-  AC_TRY_LINK([],
+  AC_TRY_LINK([int tgetent(char *, const char *);],
       [char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist");],
        AC_MSG_RESULT(yes),
        AC_MSG_ERROR([NOT FOUND!

diff --git a/src/version.c b/src/version.c
index fb641589bf759f62dfe85d438197483c94354603..d8dfba87b062273dd575b367f4407d3e37d0b717 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1310,
 /**/
     1309,
 /**/