diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-28 21:03:37 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-28 21:03:37 +0200 |
| commit | bd7f7c123db58dd7f50f4d1391577686d2f1bcc6 (patch) | |
| tree | 4e7a5662cd144de1f49cf9a012e7b469428c9466 | |
| parent | 461f21242a8fc7f2fe9d1c723741eeda45f0ac72 (diff) | |
patch 8.2.1310: configure with Xcode 12 fails to check for tgetentv8.2.1310
Problem: Configure with Xcode 12 fails to check for tgetent.
Solution: Declare tgetent(). (Ozaki Kiichi, closes #6558)
| -rwxr-xr-x | src/auto/configure | 2 | ||||
| -rw-r--r-- | src/configure.ac | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure index 9c9a719d81..41b29c2623 100755 --- 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 19ce4c7a5f..598d73c8df 100644 --- 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 fb641589bf..d8dfba87b0 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1310, +/**/ 1309, /**/ 1308, |