diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | m4/curl-override.m4 | 9 | ||||
| -rw-r--r-- | m4/zz60-xc-ovr.m4 | 55 |
3 files changed, 56 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 70d65fa81..fdb49efc9 100644 --- a/configure.ac +++ b/configure.ac @@ -27,6 +27,7 @@ dnl We don't know the version number "statically" so we use a dash here AC_INIT([curl], [-], [a suitable curl mailing list: http://curl.haxx.se/mail/]) XC_OVR_ZZ50 +XC_OVR_ZZ60 CURL_OVERRIDE_AUTOCONF dnl configure script copyright diff --git a/m4/curl-override.m4 b/m4/curl-override.m4 index 0e4d1f908..263d7de38 100644 --- a/m4/curl-override.m4 +++ b/m4/curl-override.m4 @@ -89,12 +89,3 @@ m4_defun([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR], [CURL_CHECK_PATH_SEPARATOR m4_define([$0],[])]) -dnl Provide Autoconf's AC_CONFIG_MACRO_DIR (DIR) -dnl ------------------------------------------------- -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. - -m4_ifndef([AC_CONFIG_MACRO_DIR], -[AC_DEFUN([AC_CONFIG_MACRO_DIR],[:])]) - diff --git a/m4/zz60-xc-ovr.m4 b/m4/zz60-xc-ovr.m4 new file mode 100644 index 000000000..2122f5a31 --- /dev/null +++ b/m4/zz60-xc-ovr.m4 @@ -0,0 +1,55 @@ +#--------------------------------------------------------------------------- +# +# zz60-xc-ovr.m4 +# +# Copyright (c) 2013 Daniel Stenberg <daniel@haxx.se> +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# +#--------------------------------------------------------------------------- + +# serial 1 + + +dnl The funny name of this file is intentional in order to make it +dnl sort alphabetically after any libtool, autoconf or automake +dnl provided .m4 macro file that might get copied into this same +dnl subdirectory. This allows that macro (re)definitions from this +dnl file may override those provided in other files. + + +dnl Override an autoconf provided macro +dnl ------------------------------------------------- +dnl This macro overrides the one provided by autoconf +dnl 2.58 or newer, and provides macro definition for +dnl autoconf 2.57 or older which lack it. This allows +dnl using libtool 2.2 or newer, which requires that +dnl this macro is used in configure.ac, with autoconf +dnl 2.57 or older. + +m4_ifdef([AC_CONFIG_MACRO_DIR], + [m4_undefine([AC_CONFIG_MACRO_DIR])]) +m4_define([AC_CONFIG_MACRO_DIR],[]) + + +dnl XC_OVR_ZZ60 +dnl ------------------------------------------------- +dnl Placing a call to this macro in configure.ac will +dnl make macros in this file visible to other macros +dnl used for same configure script, overriding those +dnl provided elsewhere. + +AC_DEFUN([XC_OVR_ZZ60], + [AC_BEFORE([$0],[AC_PROG_LIBTOOL]) + AC_BEFORE([$0],[AM_INIT_AUTOMAKE])]) + |