aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2009-10-19 04:11:54 +0000
committerYang Tse <yangsita@gmail.com>2009-10-19 04:11:54 +0000
commit04e8ff84fe74c3fdb2d4077d6e302f8d0c82a456 (patch)
tree296bf26cb2c662d9f11726a1a957183f4a68475c
parent6f4a5a46125d48d8fb9c6f8e112ca9c376829577 (diff)
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.
-rw-r--r--ares/m4/cares-override.m47
-rw-r--r--m4/curl-override.m47
2 files changed, 6 insertions, 8 deletions
diff --git a/ares/m4/cares-override.m4 b/ares/m4/cares-override.m4
index ea5b55362..b29c960dc 100644
--- 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 4092d9ab5..2ef2a91f2 100644
--- 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],[])])
-