Patch 8.2.3420

[Bram Moolenaar]

Patch 8.2.3420
Problem: _REENTRANT defined more than once.
Solution: Fix configure script. (Christian Brabandt, closes #8852)
Files: src/configure.ac, src/auto/configure


*** ../vim-8.2.3419/src/configure.ac 2021-09-06 18:57:25.270231387 +0200
--- src/configure.ac 2021-09-09 16:58:55.848120125 +0200
***************
*** 3756,3762 ****
AC_MSG_CHECKING(for libcanberra)
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
! CFLAGS="$CFLAGS $canberra_cflags"
LIBS="$LIBS $canberra_lib"
AC_TRY_LINK([
# include <canberra.h>
--- 3756,3764 ----
AC_MSG_CHECKING(for libcanberra)
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
! 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>
*** ../vim-8.2.3419/src/auto/configure 2021-09-06 18:57:25.270231387 +0200
--- src/auto/configure 2021-09-09 16:59:00.504115181 +0200
***************
*** 12978,12984 ****
$as_echo_n "checking for libcanberra... " >&6; }
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
! CFLAGS="$CFLAGS $canberra_cflags"
LIBS="$LIBS $canberra_lib"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--- 12978,12986 ----
$as_echo_n "checking for libcanberra... " >&6; }
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
! 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,14966 ****
fi
fi

! if `echo "$CFLAGS" | grep -v D_XEENTRANT >/dev/null`; then
CFLAGS="$CFLAGS -D_REENTRANT"
fi

--- 14962,14968 ----
fi
fi

! if `echo "$CFLAGS" | grep -v D_REENTRANT >/dev/null`; then
CFLAGS="$CFLAGS -D_REENTRANT"
fi

*** ../vim-8.2.3419/src/version.c 2021-09-09 12:34:15.661539702 +0200
--- src/version.c 2021-09-09 17:14:12.547032806 +0200
***************
*** 757,758 ****
--- 757,760 ----
{ /* Add new patch number below this line */
+ /**/
+ 3420,
/**/

--
hundred-and-one symptoms of being an internet addict:
14. You start introducing yourself as "Jim at I-I-Net dot net dot au"

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///