patch 8.2.1119: configure fails with Xcode 12 beta

Problem:    Configure fails with Xcode 12 beta.
Solution:   use "return" instead of "exit()". (Nico Weber, closes #6381)

diff --git a/src/auto/configure b/src/auto/configure
index f642a0b5f9b762c2b8aefc45f0a62760a602dbbc..9c9a719d81af94ef2999ceb3d4a38f725250515f 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -14143,8 +14143,8 @@ else
 main() {
   uint32_t nr1 = (uint32_t)-1;
   uint32_t nr2 = (uint32_t)0xffffffffUL;
-  if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) exit(1);
-  exit(0);
+  if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) return 1;
+  return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :

diff --git a/src/configure.ac b/src/configure.ac
index 05439188208e28d10d1151fdcf1802af7db28696..19ce4c7a5f3386d135d37da0cf13d5f19dd038e6 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -4151,8 +4151,8 @@ AC_TRY_RUN([
 main() {
   uint32_t nr1 = (uint32_t)-1;
   uint32_t nr2 = (uint32_t)0xffffffffUL;
-  if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) exit(1);
-  exit(0);
+  if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) return 1;
+  return 0;
 }],
 AC_MSG_RESULT(ok),
 AC_MSG_ERROR([WRONG!  uint32_t not defined correctly.]),

diff --git a/src/version.c b/src/version.c
index c334ec686c918286ee71569f1b0e239d00482a4b..ae2a95f46512b97063e8280d8ffd21417bb295f4 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 */
+/**/
+    1119,
 /**/
     1118,
 /**/