Mercurial > vim
changeset 25769:05d1062b1dc0 v8.2.3420
patch 8.2.3420: _REENTRANT defined more than once
Commit: https://github.com/vim/vim/commit/6b9efdde7828b3317b64f38bd90fb5a784a654c0
Author: Christian Brabandt <cb@256bit.org>
Date: Thu Sep 9 17:14:50 2021 +0200
patch 8.2.3420: _REENTRANT defined more than once
Problem: _REENTRANT defined more than once.
Solution: Fix configure script. (Christian Brabandt, closes https://github.com/vim/vim/issues/8852)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 09 Sep 2021 17:15:04 +0200 |
| parents | 324dd1d24850 |
| children | 32fbd220d18e |
| files | src/auto/configure src/configure.ac src/version.c |
| diffstat | 3 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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 @@ if test "$MACOS_X" = "yes"; then 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
--- 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>