make --with-system-valgrind-headers the default

git-svn-id: https://svn.r-project.org/R/trunk@83743 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: ripley

configure

@@ -1908,7 +1908,7 @@ Optional Packages:
                           Level of additional instrumentation for Valgrind
                           (0/1/2) [0]
   --with-system-valgrind-headers
-                          use system valgrind headers (if available) [no]
+                          use system valgrind headers (if available) [yes]
   --with-internal-tzcode  use internal time-zone code [no, yes on macOS]
   --with-internal-towlower
                           use internal code for towlower/upper [no, yes on
@@ -4920,7 +4920,7 @@ else
 fi
 
 else $as_nop
-  use_system_valgrind=no
+  use_system_valgrind=yes
 fi
 
 
@@ -53210,6 +53210,11 @@ then :
 
 fi
 
+  if test "${ac_cv_header_valgrind_memcheck_h}" != yes; then
+  set use_system_valgrind = no
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: system valgrind headers not found -- using internal copies" >&5
+printf "%s\n" "$as_me: WARNING: system valgrind headers not found -- using internal copies" >&2;}
+  fi
 fi
 
 

configure.ac

@@ -503,9 +503,9 @@ AC_ARG_WITH([valgrind-instrumentation],
 [valgrind_level=0])
 
 AC_ARG_WITH([system-valgrind-headers],
-[AS_HELP_STRING([--with-system-valgrind-headers],[use system valgrind headers (if available) @<:@no@:>@])],
+[AS_HELP_STRING([--with-system-valgrind-headers],[use system valgrind headers (if available) @<:@yes@:>@])],
 [R_ARG_USE_SYSTEM(valgrind)],
-[use_system_valgrind=no])
+[use_system_valgrind=yes])
 
 AC_ARG_WITH([internal-tzcode],
 [AS_HELP_STRING([--with-internal-tzcode],[use internal time-zone code @<:@no, yes on macOS@:>@])],
@@ -2605,6 +2605,10 @@ if test ${valgrind_level} -eq 0; then
   AC_DEFINE(NVALGRIND, 1, [Define to disable Valgrind instrumentation])
 elif test "${use_system_valgrind}" = yes; then
   AC_CHECK_HEADERS([valgrind/memcheck.h])
+  if test "${ac_cv_header_valgrind_memcheck_h}" != yes; then
+  set use_system_valgrind = no
+  AC_MSG_WARN([system valgrind headers not found -- using internal copies])
+  fi
 fi
 
 AC_DEFINE_UNQUOTED(VALGRIND_LEVEL, ${valgrind_level}, [Define as 1 or 2 to specify levels of Valgrind instrumentation])

doc/NEWS.Rd

@@ -265,6 +265,19 @@
 
       \item The minimum required version of \code{libcurl} has been
       increased from 7.28.0 to 7.32.0 (released in Aug 2013).
+
+      \item If \command{configure} option
+      \option{--with-valgrind-instrumentation} is given value \code{1}
+      or \code{2}, option \option{--with-system-valgrind-headers} is now
+      the default and ignored.  It is highly recommended that the system
+      headers are installed alongside \command{valgrind}: they are part
+      of its packaging on some Linux distributions and packaged
+      separetely (e.g.\sspace{}in a \file{valgrind-devel} RPM) on
+      others.  \command{configure} gives a warning if they are not
+      found.
+
+      THe system headers will be reauired in a future release of \R
+      to build with \command{valgrind} instruementation.
     }
   }
 

doc/manual/R-exts.texi

@@ -9432,11 +9432,9 @@ they are freed.}  but make @R{} much slower when running under
 @code{valgrind}.  Using this in conjunction with @code{gctorture} can be
 even more effective (and even slower).
 
-If you have the development files (sometimes packaged separately, for
-example as @file{valgrind-devel}) installed and want to build an
-instrumented @R{} you are recoomended to also use the
-@command{configure} option @option{--with-system-valgrind-headers} (and
-having them installed is highly recommended).
+It is highly recommended that the @command{valgrind} headers (sometimes
+packaged separately, for example as @file{valgrind-devel}) are installed
+and want to build an instrumented @R{}: this will be required in future.
 
 An example of @code{valgrind} output is
 @smallexample