patch 8.2.3420: _REENTRANT defined more than once

Problem:    _REENTRANT defined more than once.
Solution:   Fix configure script. (Christian Brabandt, closes #8852)

diff --git a/src/auto/configure b/src/auto/configure
index 4f436322488f8a9e48a25041dad73fa3dbbc1ea7..be1440d3a711c539bd3a052104aea8bda0bcdb7e 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -12978,7 +12978,9 @@ if test "$enable_canberra" = "yes"; then
 $as_echo_n "checking for libcanberra... " >&6; }
   ac_save_CFLAGS="$CFLAGS"
   ac_save_LIBS="$LIBS"
-  CFLAGS="$CFLAGS $canberra_cflags"
+  if `echo "$CFLAGS" | grep -v "$canberra_cflags" >/dev/null`; then
+    CFLAGS="$CFLAGS $canberra_cflags"
+  fi
   LIBS="$LIBS $canberra_lib"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -14960,7 +14962,7 @@ $as_echo "no" >&6; }
   fi
 fi
 
-if `echo "$CFLAGS" | grep -v D_XEENTRANT >/dev/null`; then
+if `echo "$CFLAGS" | grep -v D_REENTRANT >/dev/null`; then
   CFLAGS="$CFLAGS -D_REENTRANT"
 fi
 

diff --git a/src/configure.ac b/src/configure.ac
index 4cd6dea1f476feb85b06d82cebd41c248a34d3b1..d417b904627101a0a602ddaa0cd2b0244e236376 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -3756,7 +3756,9 @@ if test "$enable_canberra" = "yes"; then
   AC_MSG_CHECKING(for libcanberra)
   ac_save_CFLAGS="$CFLAGS"
   ac_save_LIBS="$LIBS"
-  CFLAGS="$CFLAGS $canberra_cflags"
+  if `echo "$CFLAGS" | grep -v "$canberra_cflags" >/dev/null`; then
+    CFLAGS="$CFLAGS $canberra_cflags"
+  fi
   LIBS="$LIBS $canberra_lib"
   AC_TRY_LINK([
   # include <canberra.h>

diff --git a/src/version.c b/src/version.c
index 664f4ca8c20387efc33904e16cda0fc113adc780..6d64ffed24fa0374116a578f96285cd4f72c223a 100644 (file)
--- 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 */
+/**/
+    3420,
 /**/
     3419,
 /**/