fix #457

Author: gagolews

NEWS

@@ -14,7 +14,8 @@
 
 * [DOCUMENTATION] ICU Project site has been moved to <https://icu.unicode.org/>.
 
-* TO DO..  #457: The macro `AC_LANG_CPLUSPLUS' was obsolete.
+* [BUILD TIME] #457: The `autoconf` macros `AC_LANG_CPLUSPLUS`
+  and `AC_TRY_COMPILE` were obsolete.
 
 * TO DO..  #458: 'embedded nul in string'
 

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for stringi 1.6.
+# Generated by GNU Autoconf 2.69 for stringi 1.7.
 #
 # Report bugs to <https://stringi.gagolewski.com>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='stringi'
 PACKAGE_TARNAME='stringi'
-PACKAGE_VERSION='1.6'
-PACKAGE_STRING='stringi 1.6'
+PACKAGE_VERSION='1.7'
+PACKAGE_STRING='stringi 1.7'
 PACKAGE_BUGREPORT='https://stringi.gagolewski.com'
 PACKAGE_URL=''
 
@@ -1289,7 +1289,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures stringi 1.6 to adapt to many kinds of systems.
+\`configure' configures stringi 1.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1351,7 +1351,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of stringi 1.6:";;
+     short | recursive ) echo "Configuration of stringi 1.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1497,7 +1497,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-stringi configure 1.6
+stringi configure 1.7
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1837,7 +1837,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by stringi $as_me 1.6, which was
+It was created by stringi $as_me 1.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2202,6 +2202,10 @@ ICU_VERSION_NEEDED="55" # minimal version of ICU4C required to build stringi
 
 
 
+
+
+
+
 ##### OPTIONS #################################################################
 
 # shell variables/arguments accepted:
@@ -4149,12 +4153,13 @@ using namespace Outer::Inner; return i;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_cxx_namespaces=yes
 else
   ac_cv_cxx_namespaces=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
  ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4171,8 +4176,8 @@ $as_echo "#define HAVE_NAMESPACES /**/" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports Standard Template Library" >&5
-$as_echo_n "checking whether the compiler supports Standard Template Library... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the Standard Template Library" >&5
+$as_echo_n "checking whether the compiler supports the Standard Template Library... " >&6; }
 if ${ac_cv_cxx_have_stl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4200,12 +4205,13 @@ list<int>::iterator iter = x.begin(); if (iter != x.end()) ++iter; return 0;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_cxx_have_stl=yes
 else
   ac_cv_cxx_have_stl=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
  ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5659,7 +5665,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by stringi $as_me 1.6, which was
+This file was extended by stringi $as_me 1.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5712,7 +5718,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-stringi config.status 1.6
+stringi config.status 1.7
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -19,7 +19,7 @@
 
 ##### INIT ####################################################################
 
-AC_INIT(stringi, 1.6, https://stringi.gagolewski.com)
+AC_INIT([stringi],[1.7],[https://stringi.gagolewski.com])
 
 ICU_VERSION_NEEDED="55" # minimal version of ICU4C required to build stringi
 # We still support ICU 55.1 because of... yes, Solaris.
@@ -208,7 +208,7 @@ MSG_CONFIG_FAIL="
 
 # this is inspired by the "Writing R Extensions" manual:
 # determine R_HOME directory...
-AC_MSG_CHECKING(for R_HOME)
+AC_MSG_CHECKING([for R_HOME])
 if test -z "${R_HOME}"; then
     R_HOME=`R RHOME` # set R_HOME if it has not been set already
 fi
@@ -222,7 +222,7 @@ AC_SUBST(R_HOME)
 
 
 # ...and then R_PATH
-AC_MSG_CHECKING(for R)
+AC_MSG_CHECKING([for R])
 R_PATH="${R_HOME}/bin/R" # see "Writing R Extensions"
 if test ! -e "${R_PATH}"; then
     # if it was determined by calling `R RHOME`, then this is likely a bug
@@ -242,7 +242,7 @@ else
     AC_MSG_RESULT(little)
 fi
 
-AC_MSG_CHECKING(for R >= 3.1.0 for C++11 use)
+AC_MSG_CHECKING([for R >= 3.1.0 for C++11 use])
 R_GE_31=`"${R_PATH}" --vanilla --slave -e 'cat(if (getRversion() >= numeric_version("3.1.0")) "yes" else "no")'`
 if test "x$R_GE_31" = "xyes"; then
     AC_MSG_RESULT([yes])
@@ -260,7 +260,7 @@ else
     fi
 fi
 
-AC_MSG_CHECKING(for R < 3.4.0 for CXX1X flag use)
+AC_MSG_CHECKING([for R < 3.4.0 for CXX1X flag use])
 R_GE_34=`"${R_PATH}" --vanilla --slave -e 'cat(if (getRversion() >= numeric_version("3.4.0")) "yes" else "no")'`
 if test "x$R_GE_34" = "xyes"; then
     AC_MSG_RESULT([no])
@@ -381,15 +381,15 @@ while true; do
 
 
     # set ICUDT_DIR
-    AC_MSG_CHECKING(for local ICUDT_DIR)
+    AC_MSG_CHECKING([for local ICUDT_DIR])
     if test "x$ICUDT_DIR_FORCE" = "xyes"; then
     # Remember to update the configure.win file too
         ICUDT_DIR="icu${ICU_BUNDLE_VERSION}/data"
     fi
     AC_MSG_RESULT($ICUDT_DIR)
 
 
-    AC_LANG(C)
+    AC_LANG([C])
     AC_PROG_CC
 
     AC_CHECK_HEADER([elf.h], [
@@ -402,9 +402,9 @@ while true; do
     #
     # If this is the case, return 0
     check_cpp() {
-        AC_LANG(C++)
+        AC_LANG([C++])
         AC_PROG_CXX
-        AC_MSG_CHECKING(whether the C++ compiler supports the long long type)
+        AC_MSG_CHECKING([whether the C++ compiler supports the long long type])
         AC_LINK_IFELSE([AC_LANG_SOURCE([
             #include <iostream>
             using namespace std;
@@ -431,7 +431,7 @@ while true; do
             return 1
         fi
 
-        AC_MSG_CHECKING(whether std::map is available)
+        AC_MSG_CHECKING([whether std::map is available])
         AC_LINK_IFELSE([AC_LANG_SOURCE([
             #include <iostream>
             #include <map>
@@ -486,7 +486,7 @@ while true; do
         fi
 
         # check if pkg-config knows about icu-i18n
-        AC_MSG_CHECKING(with pkg-config for the system ICU4C)
+        AC_MSG_CHECKING([with pkg-config for the system ICU4C])
         if ! `"${PKG_CONFIG}" --exists icu-i18n icu-uc`; then
             # pkg config doesn't know about icu-i18n
             AC_MSG_RESULT(no)
@@ -500,7 +500,7 @@ while true; do
         AC_MSG_RESULT($ICU_VERSION)
 
         # check for a suitable version
-        AC_MSG_CHECKING(for ICU4C >= $ICU_VERSION_NEEDED)
+        AC_MSG_CHECKING([for ICU4C >= $ICU_VERSION_NEEDED])
         #VERSION_CHECK=`expr $ICU_VERSION ">=" $ICU_VERSION_NEEDED`
         #if test "$VERSION_CHECK" != "1" ; then
         if ! `"${PKG_CONFIG}" --atleast-version=${ICU_VERSION_NEEDED} icu-i18n icu-uc`; then
@@ -532,7 +532,7 @@ while true; do
         LDFLAGS="${LDFLAGS} ${ICU_LDFLAGS}"
         LIBS="${LIBS} ${ICU_LIBS}"
 
-        AC_LANG(C++)
+        AC_LANG([C++])
 
         AC_MSG_CHECKING([whether an ICU4C-based project can be built])
         AC_LINK_IFELSE([AC_LANG_SOURCE([
@@ -778,7 +778,7 @@ while true; do
 
         if test ${ICU_BUNDLE_VERSION} -le 60; then
             # ICU >=61 doesn't provide any .c files anymore
-            AC_LANG(C)
+            AC_LANG([C])
             AC_MSG_CHECKING([whether we may compile src/icu${ICU_BUNDLE_VERSION}/common/umapfile.c])
             AC_COMPILE_IFELSE([
                 AC_LANG_SOURCE([`${CAT} src/icu${ICU_BUNDLE_VERSION}/common/umapfile.c`])
@@ -802,7 +802,7 @@ while true; do
             ])
         fi
 
-        AC_LANG(C++)
+        AC_LANG([C++])
         AC_MSG_CHECKING([whether we may compile src/icu${ICU_BUNDLE_VERSION}/common/putil.cpp])
         AC_COMPILE_IFELSE([
             AC_LANG_SOURCE([`${CAT} src/icu${ICU_BUNDLE_VERSION}/common/putil.cpp`])
@@ -827,7 +827,7 @@ while true; do
         ])
 
         if test ${ICU_BUNDLE_VERSION} -gt 60; then
-            AC_LANG(C++)
+            AC_LANG([C++])
             AC_MSG_CHECKING([whether we may compile src/icu${ICU_BUNDLE_VERSION}/i18n/number_affixutils.cpp])
             AC_COMPILE_IFELSE([
                 AC_LANG_SOURCE([`${CAT} src/icu${ICU_BUNDLE_VERSION}/i18n/number_affixutils.cpp`])
@@ -857,7 +857,7 @@ while true; do
 
         if test ${ICU_BUNDLE_VERSION} -ge 69; then
 
-            AC_MSG_CHECKING(whether alignof(std::max_align_t) is available)
+            AC_MSG_CHECKING([whether alignof(std::max_align_t) is available])
             AC_LINK_IFELSE([AC_LANG_SOURCE([
                 #include <iostream>
                 #include <cstddef>
@@ -873,7 +873,7 @@ while true; do
                 old_with_extra_cxxflags="${with_extra_cxxflags}"
                 with_extra_cxxflags="${with_extra_cxxflags} -DSTRINGI_MAX_ALIGN_T_STD"
                 CXXFLAGS="${CXXFLAGS} -D_XPG6"
-                AC_MSG_CHECKING(whether alignof(::max_align_t) is available)
+                AC_MSG_CHECKING([whether alignof(::max_align_t) is available])
                 AC_LINK_IFELSE([AC_LANG_SOURCE([
                     #include <iostream>
                     #include <cstddef>

tools/AC_CXX_HAVE_STL.m4

@@ -1,35 +1,38 @@
-dnl 
+dnl
 dnl AC_CXX_HAVE_STL
-dnl 
+dnl
 dnl Description
-dnl 
+dnl
 dnl  If the compiler supports the Standard Template Library, define HAVE_STL.
-dnl 
-dnl Version: 1.2 (last modified: 2000-07-19)
+dnl
+dnl Version: 1.2.1 (last modified: 2021-10-02)
 dnl Author: Luc Maisonobe
-dnl 
+dnl
 dnl from http://www.gnu.org/software/ac-archive/htmldoc/index.html
-dnl 
+dnl
 dnl License:
 dnl GNU General Public License
 dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
 dnl with this special exception
-dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html]. 
-dnl 
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+
+
+dnl Marek's 2021-10-02 update: replace obsolete AC_TRY_COMPILE, AC_LANG_CPLUSPLUS
+
 
 AC_DEFUN([AC_CXX_HAVE_STL],
-[AC_CACHE_CHECK(whether the compiler supports Standard Template Library,
+[AC_CACHE_CHECK(whether the compiler supports the Standard Template Library,
 ac_cv_cxx_have_stl,
 [AC_REQUIRE([AC_CXX_NAMESPACES])
  AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_TRY_COMPILE([#include <list>
+ AC_LANG([C++])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <list>
 #include <deque>
 #ifdef HAVE_NAMESPACES
 using namespace std;
-#endif],[list<int> x; x.push_back(5);
-list<int>::iterator iter = x.begin(); if (iter != x.end()) ++iter; return 0;],
- ac_cv_cxx_have_stl=yes, ac_cv_cxx_have_stl=no)
+#endif]],[[list<int> x; x.push_back(5);
+list<int>::iterator iter = x.begin(); if (iter != x.end()) ++iter; return 0;]])],
+ [ac_cv_cxx_have_stl=yes], [ac_cv_cxx_have_stl=no])
  AC_LANG_RESTORE
 ])
 if test "$ac_cv_cxx_have_stl" = yes; then

tools/AC_CXX_NAMESPACES.m4

@@ -6,16 +6,18 @@ dnl
 dnl @category Cxx
 dnl @author Todd Veldhuizen
 dnl @author Luc Maisonobe <[email protected]>
-dnl @version 2004-02-04
 dnl @license AllPermissive
+dnl @version 2021-10-02
+
+dnl Marek's 2021-10-02 update: replace obsolete AC_TRY_COMPILE, AC_LANG_CPLUSPLUS
 
 AC_DEFUN([AC_CXX_NAMESPACES],
 [AC_CACHE_CHECK(whether the compiler implements namespaces,
 ac_cv_cxx_namespaces,
 [AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_TRY_COMPILE([namespace Outer { namespace Inner { int i = 0; }}],
-                [using namespace Outer::Inner; return i;],
+ AC_LANG([C++])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[namespace Outer { namespace Inner { int i = 0; }}]],
+                [[using namespace Outer::Inner; return i;]])],
  ac_cv_cxx_namespaces=yes, ac_cv_cxx_namespaces=no)
  AC_LANG_RESTORE
 ])