Our _AS_PATH_SEPARATOR_PREPARE override is now m4_defun'd instead of m4_define'd

due to autoconf 2.64 m4_require'ing it in _AS_SHELL_SANITIZE indirectly through
_AS_PATH_WALK.

diff --git a/ares/m4/cares-override.m4 b/ares/m4/cares-override.m4
index ea5b55362ad1739046f834781294ebc8435fe221..b29c960dcfc25f49b5785d8852a1f2b4f7e2fe3b 100644 (file)
--- a/ares/m4/cares-override.m4
+++ b/ares/m4/cares-override.m4
@@ -3,7 +3,7 @@
 #***************************************************************************
 
 # File version for 'aclocal' use. Keep it a single number.
-# serial 2
+# serial 3
 
 dnl CARES_OVERRIDE_AUTOCONF
 dnl -------------------------------------------------
@@ -92,12 +92,11 @@ dnl used across different Autoconf versions and to
 dnl allow us to use this macro early enough in the
 dnl configure script.
 
-m4_define([_AS_PATH_SEPARATOR_PREPARE],
+m4_defun([_AS_PATH_SEPARATOR_PREPARE],
 [CARES_CHECK_PATH_SEPARATOR
 m4_define([$0],[])])
 
-m4_define([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
+m4_defun([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
 [CARES_CHECK_PATH_SEPARATOR
 m4_define([$0],[])])
 
-

diff --git a/m4/curl-override.m4 b/m4/curl-override.m4
index 4092d9ab588ba6776d91846a9a2b00487fca31e6..2ef2a91f2555a24fcd10d6736ef7f8b1ba545404 100644 (file)
--- a/m4/curl-override.m4
+++ b/m4/curl-override.m4
@@ -3,7 +3,7 @@
 #***************************************************************************
 
 # File version for 'aclocal' use. Keep it a single number.
-# serial 2
+# serial 3
 
 dnl CURL_OVERRIDE_AUTOCONF
 dnl -------------------------------------------------
@@ -92,12 +92,11 @@ dnl used across different Autoconf versions and to
 dnl allow us to use this macro early enough in the
 dnl configure script.
 
-m4_define([_AS_PATH_SEPARATOR_PREPARE],
+m4_defun([_AS_PATH_SEPARATOR_PREPARE],
 [CURL_CHECK_PATH_SEPARATOR
 m4_define([$0],[])])
 
-m4_define([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
+m4_defun([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
 [CURL_CHECK_PATH_SEPARATOR
 m4_define([$0],[])])
 
-