aclocal.m4 (hitch-1.5.2) | : | aclocal.m4 (hitch-1.6.0) | ||
---|---|---|---|---|
skipping to change at line 23 | skipping to change at line 23 | |||
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun ([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) | m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun ([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) | |||
m4_ifndef([AC_AUTOCONF_VERSION], | m4_ifndef([AC_AUTOCONF_VERSION], | |||
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | |||
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, | |||
[m4_warning([this file was generated for autoconf 2.69. | [m4_warning([this file was generated for autoconf 2.69. | |||
You have another version of autoconf. It may work, but is not guaranteed to. | You have another version of autoconf. It may work, but is not guaranteed to. | |||
If you have problems, you may need to regenerate the build system entirely. | If you have problems, you may need to regenerate the build system entirely. | |||
To do so, use the procedure documented by the package, typically 'autoreconf'.]) ]) | To do so, use the procedure documented by the package, typically 'autoreconf'.]) ]) | |||
dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | |||
dnl serial 11 (pkg-config-0.29) | # serial 11 (pkg-config-0.29.1) | |||
dnl | ||||
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. | dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. | |||
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> | dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> | |||
dnl | dnl | |||
dnl This program is free software; you can redistribute it and/or modify | dnl This program is free software; you can redistribute it and/or modify | |||
dnl it under the terms of the GNU General Public License as published by | dnl it under the terms of the GNU General Public License as published by | |||
dnl the Free Software Foundation; either version 2 of the License, or | dnl the Free Software Foundation; either version 2 of the License, or | |||
dnl (at your option) any later version. | dnl (at your option) any later version. | |||
dnl | dnl | |||
dnl This program is distributed in the hope that it will be useful, but | dnl This program is distributed in the hope that it will be useful, but | |||
dnl WITHOUT ANY WARRANTY; without even the implied warranty of | dnl WITHOUT ANY WARRANTY; without even the implied warranty of | |||
skipping to change at line 66 | skipping to change at line 66 | |||
dnl installed version of pkg-config, this checks the developer's version | dnl installed version of pkg-config, this checks the developer's version | |||
dnl of pkg.m4 when generating configure. | dnl of pkg.m4 when generating configure. | |||
dnl | dnl | |||
dnl To ensure that this macro is defined, also add: | dnl To ensure that this macro is defined, also add: | |||
dnl m4_ifndef([PKG_PREREQ], | dnl m4_ifndef([PKG_PREREQ], | |||
dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf /autogen])]) | dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf /autogen])]) | |||
dnl | dnl | |||
dnl See the "Since" comment for each macro you use to see what version | dnl See the "Since" comment for each macro you use to see what version | |||
dnl of the macros you require. | dnl of the macros you require. | |||
m4_defun([PKG_PREREQ], | m4_defun([PKG_PREREQ], | |||
[m4_define([PKG_MACROS_VERSION], [0.29]) | [m4_define([PKG_MACROS_VERSION], [0.29.1]) | |||
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, | m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, | |||
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) | [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) | |||
])dnl PKG_PREREQ | ])dnl PKG_PREREQ | |||
dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) | dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) | |||
dnl ---------------------------------- | dnl ---------------------------------- | |||
dnl Since: 0.16 | dnl Since: 0.16 | |||
dnl | dnl | |||
dnl Search for the pkg-config tool and set the PKG_CONFIG variable to | dnl Search for the pkg-config tool and set the PKG_CONFIG variable to | |||
dnl first found in the path. Checks that the version of pkg-config found | dnl first found in the path. Checks that the version of pkg-config found | |||
skipping to change at line 294 | skipping to change at line 294 | |||
AC_DEFUN([PKG_CHECK_VAR], | AC_DEFUN([PKG_CHECK_VAR], | |||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl | |||
AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl | AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl | |||
_PKG_CONFIG([$1], [variable="][$3]["], [$2]) | _PKG_CONFIG([$1], [variable="][$3]["], [$2]) | |||
AS_VAR_COPY([$1], [pkg_cv_][$1]) | AS_VAR_COPY([$1], [pkg_cv_][$1]) | |||
AS_VAR_IF([$1], [""], [$5], [$4])dnl | AS_VAR_IF([$1], [""], [$5], [$4])dnl | |||
])dnl PKG_CHECK_VAR | ])dnl PKG_CHECK_VAR | |||
dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, | ||||
dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], | ||||
dnl [DESCRIPTION], [DEFAULT]) | ||||
dnl ------------------------------------------ | ||||
dnl | ||||
dnl Prepare a "--with-" configure option using the lowercase | ||||
dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and | ||||
dnl PKG_CHECK_MODULES in a single macro. | ||||
AC_DEFUN([PKG_WITH_MODULES], | ||||
[ | ||||
m4_pushdef([with_arg], m4_tolower([$1])) | ||||
m4_pushdef([description], | ||||
[m4_default([$5], [build with ]with_arg[ support])]) | ||||
m4_pushdef([def_arg], [m4_default([$6], [auto])]) | ||||
m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) | ||||
m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) | ||||
m4_case(def_arg, | ||||
[yes],[m4_pushdef([with_without], [--without-]with_arg)], | ||||
[m4_pushdef([with_without],[--with-]with_arg)]) | ||||
AC_ARG_WITH(with_arg, | ||||
AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, | ||||
[AS_TR_SH([with_]with_arg)=def_arg]) | ||||
AS_CASE([$AS_TR_SH([with_]with_arg)], | ||||
[yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], | ||||
[auto],[PKG_CHECK_MODULES([$1],[$2], | ||||
[m4_n([def_action_if_found]) $3], | ||||
[m4_n([def_action_if_not_found]) $4])]) | ||||
m4_popdef([with_arg]) | ||||
m4_popdef([description]) | ||||
m4_popdef([def_arg]) | ||||
])dnl PKG_WITH_MODULES | ||||
dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, | ||||
dnl [DESCRIPTION], [DEFAULT]) | ||||
dnl ----------------------------------------------- | ||||
dnl | ||||
dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES | ||||
dnl check._[VARIABLE-PREFIX] is exported as make variable. | ||||
AC_DEFUN([PKG_HAVE_WITH_MODULES], | ||||
[ | ||||
PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) | ||||
AM_CONDITIONAL([HAVE_][$1], | ||||
[test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) | ||||
])dnl PKG_HAVE_WITH_MODULES | ||||
dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, | ||||
dnl [DESCRIPTION], [DEFAULT]) | ||||
dnl ------------------------------------------------------ | ||||
dnl | ||||
dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after | ||||
dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make | ||||
dnl and preprocessor variable. | ||||
AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], | ||||
[ | ||||
PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) | ||||
AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], | ||||
[AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) | ||||
])dnl PKG_HAVE_DEFINE_WITH_MODULES | ||||
# Copyright (C) 2002-2018 Free Software Foundation, Inc. | # Copyright (C) 2002-2018 Free Software Foundation, Inc. | |||
# | # | |||
# This file is free software; the Free Software Foundation | # This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | # gives unlimited permission to copy and/or distribute it, | |||
# with or without modifications, as long as this notice is preserved. | # with or without modifications, as long as this notice is preserved. | |||
# AM_AUTOMAKE_VERSION(VERSION) | # AM_AUTOMAKE_VERSION(VERSION) | |||
# ---------------------------- | # ---------------------------- | |||
# Automake X.Y traces this macro to ensure aclocal.m4 has been | # Automake X.Y traces this macro to ensure aclocal.m4 has been | |||
# generated from the m4 files accompanying Automake X.Y. | # generated from the m4 files accompanying Automake X.Y. | |||
End of changes. 3 change blocks. | ||||
4 lines changed or deleted | 72 lines changed or added |