From 6b9efdde7828b3317b64f38bd90fb5a784a654c0 Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Thu, 9 Sep 2021 17:14:50 +0200 Subject: patch 8.2.3420: _REENTRANT defined more than once Problem: _REENTRANT defined more than once. Solution: Fix configure script. (Christian Brabandt, closes #8852) --- src/auto/configure | 6 ++++-- src/configure.ac | 4 +++- src/version.c | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/auto/configure b/src/auto/configure index 4f43632248..be1440d3a7 100755 --- 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 4cd6dea1f4..d417b90462 100644 --- 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 diff --git a/src/version.c b/src/version.c index 664f4ca8c2..6d64ffed24 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 */ +/**/ + 3420, /**/ 3419, /**/ -- cgit v1.2.3