From 04e8ff84fe74c3fdb2d4077d6e302f8d0c82a456 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 19 Oct 2009 04:11:54 +0000 Subject: 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. --- ares/m4/cares-override.m4 | 7 +++---- m4/curl-override.m4 | 7 +++---- 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],[])]) - -- cgit v1.2.3