Author: philip
Date: Mon Mar 20 01:17:01 2023
New Revision: 1908543

URL: http://svn.apache.org/viewvc?rev=1908543&view=rev
Log:
Replace some deprected autoconf macros, this stops
autoconf 2.72 complaining.  The new macros have
existed since 2.50.

* configure.ac
  Remove AC_HEADER_STDC, change AC_HELP_STRING to
  AS_HELP_STRING.

* build/ac-macros/apr_memcache.m4:
  Change AC_HELP_STRING to AS_HELP_STRING.
  
* build/ac-macros/serf.m4
  Change AC_TRY_COMPILE to AC_COMPILE_IFLSE.

* build/ac-macros/svn-macros.m4
  Change AC_TRY_RUN to AC_RUN_IFELSE.

Modified:
    subversion/trunk/build/ac-macros/apr_memcache.m4
    subversion/trunk/build/ac-macros/serf.m4
    subversion/trunk/build/ac-macros/svn-macros.m4
    subversion/trunk/configure.ac

Modified: subversion/trunk/build/ac-macros/apr_memcache.m4
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/apr_memcache.m4?rev=1908543&r1=1908542&r2=1908543&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/apr_memcache.m4 (original)
+++ subversion/trunk/build/ac-macros/apr_memcache.m4 Mon Mar 20 01:17:01 2023
@@ -29,7 +29,7 @@ AC_DEFUN(SVN_LIB_APR_MEMCACHE,
 [
   apr_memcache_found=no
 
-  AC_ARG_WITH(apr_memcache,AC_HELP_STRING([--with-apr_memcache=PREFIX],
+  AC_ARG_WITH(apr_memcache,AS_HELP_STRING([--with-apr_memcache=PREFIX],
                                   [Standalone apr_memcache client library]),
   [
     if test "$withval" = "yes" ; then

Modified: subversion/trunk/build/ac-macros/serf.m4
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/serf.m4?rev=1908543&r1=1908542&r2=1908543&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/serf.m4 (original)
+++ subversion/trunk/build/ac-macros/serf.m4 Mon Mar 20 01:17:01 2023
@@ -107,10 +107,10 @@ AC_DEFUN(SVN_SERF_PREFIX_CONFIG,
       save_ldflags="$LDFLAGS"
       LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS(-L$serf_prefix/lib)`"
       AC_CHECK_LIB($serf_major, serf_context_create,[
-        AC_TRY_COMPILE([
+        AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 #include <stdlib.h>
 #include "serf.h"
-],[
+]])],[
 #if ! SERF_VERSION_AT_LEAST($serf_check_major, $serf_check_minor, 
$serf_check_patch)
 #error Serf version too old: need $serf_check_version
 #endif

Modified: subversion/trunk/build/ac-macros/svn-macros.m4
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/svn-macros.m4?rev=1908543&r1=1908542&r2=1908543&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/svn-macros.m4 (original)
+++ subversion/trunk/build/ac-macros/svn-macros.m4 Mon Mar 20 01:17:01 2023
@@ -126,7 +126,7 @@ AC_DEFUN([SVN_REMOVE_STANDARD_LIB_DIRS],
 AC_DEFUN([SVN_CHECK_FOR_ATOMIC_BUILTINS],
 [
   AC_CACHE_CHECK([whether the compiler provides atomic builtins], 
[svn_cv_atomic_builtins],
-  [AC_TRY_RUN([
+  [AC_RUN_IFELSE([AC_LANG_SOURCE([[
   int main()
   {
       unsigned long long val = 1010, tmp, *mem = &val;
@@ -161,5 +161,5 @@ AC_DEFUN([SVN_CHECK_FOR_ATOMIC_BUILTINS]
           return 1;
 
       return 0;
-  }], [svn_cv_atomic_builtins=yes], [svn_cv_atomic_builtins=no], 
[svn_cv_atomic_builtins=no])])
+  }]])], [svn_cv_atomic_builtins=yes], [svn_cv_atomic_builtins=no], 
[svn_cv_atomic_builtins=no])])
 ])

Modified: subversion/trunk/configure.ac
URL: 
http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1908543&r1=1908542&r2=1908543&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Mon Mar 20 01:17:01 2023
@@ -379,7 +379,7 @@ fi
 dnl Check for doxygen
 doxygen=yes
 AC_ARG_WITH(doxygen,
-AC_HELP_STRING([--with-doxygen=PATH],
+AS_HELP_STRING([--with-doxygen=PATH],
                [Specify the command to run doxygen]),
 [
     doxygen="$withval"
@@ -934,9 +934,6 @@ AC_SUBST(BDB_TEST_PROGRAMS)
 
 dnl Check for header files ----------------
 
-dnl Standard C headers
-AC_HEADER_STDC
-
 dnl Check for typedefs, structures, and compiler characteristics ----------
 
 dnl if compiler doesn't understand `const', then define it empty
@@ -1249,7 +1246,7 @@ AC_SUBST(MOD_ACTIVATION)
 
 
 AC_ARG_ENABLE(gcov,
-AC_HELP_STRING([--enable-gcov],
+AS_HELP_STRING([--enable-gcov],
                [Turn on gcov coverage testing (GCC only).]),
 [
     if test "$enableval" = "yes" ; then


Reply via email to