From 2c29c31d867a17d20817fc4015cd015f70b5f804 Mon Sep 17 00:00:00 2001
From: pd <pd@00db46b3-68df-0310-9c12-caf00c1e9a41>
Date: Fri, 21 Jul 2023 23:22:05 +0000
Subject: [PATCH] maintainer-mode changes

git-svn-id: https://svn.r-project.org/R/trunk@84723 00db46b3-68df-0310-9c12-caf00c1e9a41
---
 configure | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 6892683e962..1e1de8fe87e 100755
--- a/configure
+++ b/configure
@@ -5860,6 +5860,9 @@ fi
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $r_cv_prog_texi2any_v5" >&5
 printf "%s\n" "$r_cv_prog_texi2any_v5" >&6; }
+## Also record whether texi2any is at least 7 to appropriately handle
+## HTML and EPUB output changes, see
+## <<https://lists.gnu.org/archive/html/bug-texinfo/2022-11/msg00036.html>.
 if test ${r_cv_prog_texi2any_v7+y}
 then :
   printf %s "(cached) " >&6
@@ -8894,11 +8897,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx11+y}
+if test ${ac_cv_prog_cxx_11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_cxx11=no
+  ac_cv_prog_cxx_11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8940,11 +8943,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx98+y}
+if test ${ac_cv_prog_cxx_98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_cxx98=no
+  ac_cv_prog_cxx_98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -27098,7 +27101,7 @@ _ACEOF
 # flags.
 r_save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS $r_verb"
-(eval echo $as_me:27103: \"$ac_link\") >&5
+(eval echo $as_me:27106: \"$ac_link\") >&5
 r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
 echo "$r_c_v_output" >&5
 CFLAGS=$r_save_CFLAGS
@@ -27174,7 +27177,7 @@ _ACEOF
 # flags.
 r_save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS $r_cv_prog_c_v"
-(eval echo $as_me:27179: \"$ac_link\") >&5
+(eval echo $as_me:27182: \"$ac_link\") >&5
 r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
 echo "$r_c_v_output" >&5
 CFLAGS=$r_save_CFLAGS