summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2013-01-01 17:26:32 +0100
committerYang Tse <yangsita@gmail.com>2013-01-01 17:26:32 +0100
commitbc5298e25c3be085ea32457e42b70e54d4d4c0c4 (patch)
tree2b6a0f461aa37c2a617b5dc677a74c5d06c2e343 /m4
parentd86503ea82ba4f9ab5c0de74feadac94b7bd9ee8 (diff)
downloadcurl-bc5298e25c3be085ea32457e42b70e54d4d4c0c4.tar.gz
curl-override.m4: provide AC_CONFIG_MACRO_DIR definition conditionally
Provide a 'traceable' AC_CONFIG_MACRO_DIR definition only when using an autoconf version that does not provide it, instead of what we were doing up to now of providing and overriding AC_CONFIG_MACRO_DIR for all autoconf versions.
Diffstat (limited to 'm4')
-rw-r--r--m4/curl-override.m414
1 files changed, 7 insertions, 7 deletions
diff --git a/m4/curl-override.m4 b/m4/curl-override.m4
index ad3110ea5..0e4d1f908 100644
--- a/m4/curl-override.m4
+++ b/m4/curl-override.m4
@@ -2,7 +2,7 @@
#***************************************************************************
# File version for 'aclocal' use. Keep it a single number.
-# serial 5
+# serial 6
dnl CURL_OVERRIDE_AUTOCONF
dnl -------------------------------------------------
@@ -89,12 +89,12 @@ m4_defun([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
[CURL_CHECK_PATH_SEPARATOR
m4_define([$0],[])])
-dnl Override Autoconf's AC_CONFIG_MACRO_DIR (DIR)
+dnl Provide Autoconf's AC_CONFIG_MACRO_DIR (DIR)
dnl -------------------------------------------------
-dnl This is an emulation of Autoconf's 2.61 macro.
-dnl This is done to use fixed macro across Autoconf
-dnl versions, and avoid warnings from modern libtool
-dnl which traces usage of this macro.
+dnl Allow usage of mentioned macro in configure.ac
+dnl even with ancient Autoconf versions, such as 2.57,
+dnl that do not provide a definition for this macro.
-AC_DEFUN([AC_CONFIG_MACRO_DIR],[:])
+m4_ifndef([AC_CONFIG_MACRO_DIR],
+[AC_DEFUN([AC_CONFIG_MACRO_DIR],[:])])