is a free word processing program. It is suitable for typing papers, letters, reports, memos, and so forth (docs).
| aclocal.m4 (abiword-docs-3.0.1) | : | aclocal.m4 (abiword-docs-3.0.2) |
|---|
|
| # generated automatically by aclocal 1.14.1 -*- Autoconf -*- | | # generated automatically by aclocal 1.15 -*- Autoconf -*- |
| | |
|
| # Copyright (C) 1996-2013 Free Software Foundation, Inc. | | # Copyright (C) 1996-2014 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. |
| | |
| # This program is distributed in the hope that it will be useful, | | # This program is distributed in the hope that it will be useful, |
| # but WITHOUT ANY WARRANTY, to the extent permitted by law; without | | # but WITHOUT ANY WARRANTY, to the extent permitted by law; without |
| # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
| # PARTICULAR PURPOSE. | | # PARTICULAR PURPOSE. |
| | |
| 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'.])
]) |
| | |
|
| # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | | dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
| # serial 1 (pkg-config-0.24) | | dnl serial 11 (pkg-config-0.29.1) |
| # | | 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> |
| # 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 This program is free software; you can redistribute it and/or modify |
| # the Free Software Foundation; either version 2 of the License, or | | dnl it under the terms of the GNU General Public License as published by |
| # (at your option) any later version. | | dnl the Free Software Foundation; either version 2 of the License, or |
| # | | dnl (at your option) any later version. |
| # This program is distributed in the hope that it will be useful, but | | dnl |
| # WITHOUT ANY WARRANTY; without even the implied warranty of | | dnl This program is distributed in the hope that it will be useful, but |
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | | dnl WITHOUT ANY WARRANTY; without even the implied warranty of |
| # General Public License for more details. | | dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| # | | dnl General Public License for more details. |
| # You should have received a copy of the GNU General Public License | | dnl |
| # along with this program; if not, write to the Free Software | | dnl You should have received a copy of the GNU General Public License |
| # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | | dnl along with this program; if not, write to the Free Software |
| # | | dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA |
| # As a special exception to the GNU General Public License, if you | | dnl 02111-1307, USA. |
| # distribute this file as part of a program that contains a | | dnl |
| # configuration script generated by Autoconf, you may include it under | | dnl As a special exception to the GNU General Public License, if you |
| # the same distribution terms that you use for the rest of that program. | | dnl distribute this file as part of a program that contains a |
| | | dnl configuration script generated by Autoconf, you may include it under |
| # PKG_PROG_PKG_CONFIG([MIN-VERSION]) | | dnl the same distribution terms that you use for the rest of that |
| # ---------------------------------- | | dnl program. |
| | |
| | dnl PKG_PREREQ(MIN-VERSION) |
| | dnl ----------------------- |
| | dnl Since: 0.29 |
| | dnl |
| | dnl Verify that the version of the pkg-config macros are at least |
| | dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's |
| | dnl installed version of pkg-config, this checks the developer's version |
| | dnl of pkg.m4 when generating configure. |
| | dnl |
| | dnl To ensure that this macro is defined, also add: |
| | dnl m4_ifndef([PKG_PREREQ], |
| | dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf |
| | /autogen])]) |
| | dnl |
| | dnl See the "Since" comment for each macro you use to see what version |
| | dnl of the macros you require. |
| | m4_defun([PKG_PREREQ], |
| | [m4_define([PKG_MACROS_VERSION], [0.29.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])]) |
| | ])dnl PKG_PREREQ |
| | |
| | dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) |
| | dnl ---------------------------------- |
| | dnl Since: 0.16 |
| | dnl |
| | 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 is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is |
| | dnl used since that's the first version where most current features of |
| | dnl pkg-config existed. |
| AC_DEFUN([PKG_PROG_PKG_CONFIG], | | AC_DEFUN([PKG_PROG_PKG_CONFIG], |
| [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) | | [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) |
| m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIB
S)))?$]) | | m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIB
S)))?$]) |
| m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) | | m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) |
| AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) | | AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) |
| AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) | | AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) |
| AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search pa
th]) | | AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search pa
th]) |
| | |
| if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
| AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) | | AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) |
| | |
| skipping to change at line 70 | | skipping to change at line 101 |
|---|
| if test -n "$PKG_CONFIG"; then | | if test -n "$PKG_CONFIG"; then |
| _pkg_min_version=m4_default([$1], [0.9.0]) | | _pkg_min_version=m4_default([$1], [0.9.0]) |
| AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) | | AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) |
| if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then | | if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
| AC_MSG_RESULT([yes]) | | AC_MSG_RESULT([yes]) |
| else | | else |
| AC_MSG_RESULT([no]) | | AC_MSG_RESULT([no]) |
| PKG_CONFIG="" | | PKG_CONFIG="" |
| fi | | fi |
| fi[]dnl | | fi[]dnl |
|
| ])# PKG_PROG_PKG_CONFIG | | ])dnl PKG_PROG_PKG_CONFIG |
| | |
|
| # PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) | | dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
| # | | dnl ------------------------------------------------------------------- |
| # Check to see whether a particular set of modules exists. Similar | | dnl Since: 0.18 |
| # to PKG_CHECK_MODULES(), but does not set variables or print errors. | | dnl |
| # | | dnl Check to see whether a particular set of modules exists. Similar to |
| # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | | dnl PKG_CHECK_MODULES(), but does not set variables or print errors. |
| # only at the first occurence in configure.ac, so if the first place | | dnl |
| # it's called might be skipped (such as if it is within an "if", you | | dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
| # have to call PKG_CHECK_EXISTS manually | | dnl only at the first occurence in configure.ac, so if the first place |
| # -------------------------------------------------------------- | | dnl it's called might be skipped (such as if it is within an "if", you |
| | dnl have to call PKG_CHECK_EXISTS manually |
| AC_DEFUN([PKG_CHECK_EXISTS], | | AC_DEFUN([PKG_CHECK_EXISTS], |
| [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl | | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
| if test -n "$PKG_CONFIG" && \ | | if test -n "$PKG_CONFIG" && \ |
| AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then | | AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then |
| m4_default([$2], [:]) | | m4_default([$2], [:]) |
| m4_ifvaln([$3], [else | | m4_ifvaln([$3], [else |
| $3])dnl | | $3])dnl |
| fi]) | | fi]) |
| | |
|
| # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) | | dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) |
| # --------------------------------------------- | | dnl --------------------------------------------- |
| | dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting |
| | dnl pkg_failed based on the result. |
| m4_define([_PKG_CONFIG], | | m4_define([_PKG_CONFIG], |
| [if test -n "$$1"; then | | [if test -n "$$1"; then |
| pkg_cv_[]$1="$$1" | | pkg_cv_[]$1="$$1" |
| elif test -n "$PKG_CONFIG"; then | | elif test -n "$PKG_CONFIG"; then |
| PKG_CHECK_EXISTS([$3], | | PKG_CHECK_EXISTS([$3], |
| [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` | | [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` |
| test "x$?" != "x0" && pkg_failed=yes ], | | test "x$?" != "x0" && pkg_failed=yes ], |
| [pkg_failed=yes]) | | [pkg_failed=yes]) |
| else | | else |
| pkg_failed=untried | | pkg_failed=untried |
| fi[]dnl | | fi[]dnl |
|
| ])# _PKG_CONFIG | | ])dnl _PKG_CONFIG |
| | |
|
| # _PKG_SHORT_ERRORS_SUPPORTED | | dnl _PKG_SHORT_ERRORS_SUPPORTED |
| # ----------------------------- | | dnl --------------------------- |
| | dnl Internal check to see if pkg-config supports short errors. |
| AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], | | AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], |
| [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | | [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
| if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
| _pkg_short_errors_supported=yes | | _pkg_short_errors_supported=yes |
| else | | else |
| _pkg_short_errors_supported=no | | _pkg_short_errors_supported=no |
| fi[]dnl | | fi[]dnl |
|
| ])# _PKG_SHORT_ERRORS_SUPPORTED | | ])dnl _PKG_SHORT_ERRORS_SUPPORTED |
| | |
|
| # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], | | dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], |
| # [ACTION-IF-NOT-FOUND]) | | dnl [ACTION-IF-NOT-FOUND]) |
| # | | dnl -------------------------------------------------------------- |
| # | | dnl Since: 0.4.0 |
| # Note that if there is a possibility the first call to | | dnl |
| # PKG_CHECK_MODULES might not happen, you should be sure to include an | | dnl Note that if there is a possibility the first call to |
| # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac | | dnl PKG_CHECK_MODULES might not happen, you should be sure to include an |
| # | | dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac |
| # | | |
| # -------------------------------------------------------------- | | |
| AC_DEFUN([PKG_CHECK_MODULES], | | AC_DEFUN([PKG_CHECK_MODULES], |
| [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl | | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
| AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl | | AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl |
| AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl | | AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl |
| | |
| pkg_failed=no | | pkg_failed=no |
| AC_MSG_CHECKING([for $1]) | | AC_MSG_CHECKING([for $1]) |
| | |
| _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) | | _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) |
| _PKG_CONFIG([$1][_LIBS], [libs], [$2]) | | _PKG_CONFIG([$1][_LIBS], [libs], [$2]) |
| | |
| skipping to change at line 180 | | skipping to change at line 213 |
|---|
| _PKG_TEXT | | _PKG_TEXT |
| | |
| To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl | | To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl |
| ]) | | ]) |
| else | | else |
| $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS | | $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |
| $1[]_LIBS=$pkg_cv_[]$1[]_LIBS | | $1[]_LIBS=$pkg_cv_[]$1[]_LIBS |
| AC_MSG_RESULT([yes]) | | AC_MSG_RESULT([yes]) |
| $3 | | $3 |
| fi[]dnl | | fi[]dnl |
|
| ])# PKG_CHECK_MODULES | | ])dnl PKG_CHECK_MODULES |
| | |
|
| # PKG_INSTALLDIR(DIRECTORY) | | dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], |
| # ------------------------- | | dnl [ACTION-IF-NOT-FOUND]) |
| # Substitutes the variable pkgconfigdir as the location where a module | | dnl --------------------------------------------------------------------- |
| # should install pkg-config .pc files. By default the directory is | | dnl Since: 0.29 |
| # $libdir/pkgconfig, but the default can be changed by passing | | dnl |
| # DIRECTORY. The user can override through the --with-pkgconfigdir | | dnl Checks for existence of MODULES and gathers its build flags with |
| # parameter. | | dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags |
| | dnl and VARIABLE-PREFIX_LIBS from --libs. |
| | dnl |
| | dnl Note that if there is a possibility the first call to |
| | dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to |
| | dnl include an explicit call to PKG_PROG_PKG_CONFIG in your |
| | dnl configure.ac. |
| | AC_DEFUN([PKG_CHECK_MODULES_STATIC], |
| | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
| | _save_PKG_CONFIG=$PKG_CONFIG |
| | PKG_CONFIG="$PKG_CONFIG --static" |
| | PKG_CHECK_MODULES($@) |
| | PKG_CONFIG=$_save_PKG_CONFIG[]dnl |
| | ])dnl PKG_CHECK_MODULES_STATIC |
| | |
| | dnl PKG_INSTALLDIR([DIRECTORY]) |
| | dnl ------------------------- |
| | dnl Since: 0.27 |
| | dnl |
| | dnl Substitutes the variable pkgconfigdir as the location where a module |
| | dnl should install pkg-config .pc files. By default the directory is |
| | dnl $libdir/pkgconfig, but the default can be changed by passing |
| | dnl DIRECTORY. The user can override through the --with-pkgconfigdir |
| | dnl parameter. |
| AC_DEFUN([PKG_INSTALLDIR], | | AC_DEFUN([PKG_INSTALLDIR], |
| [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) | | [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) |
| m4_pushdef([pkg_description], | | m4_pushdef([pkg_description], |
| [pkg-config installation directory @<:@]pkg_default[@:>@]) | | [pkg-config installation directory @<:@]pkg_default[@:>@]) |
| AC_ARG_WITH([pkgconfigdir], | | AC_ARG_WITH([pkgconfigdir], |
| [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, | | [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, |
| [with_pkgconfigdir=]pkg_default) | | [with_pkgconfigdir=]pkg_default) |
| AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) | | AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) |
| m4_popdef([pkg_default]) | | m4_popdef([pkg_default]) |
| m4_popdef([pkg_description]) | | m4_popdef([pkg_description]) |
|
| ]) dnl PKG_INSTALLDIR | | ])dnl PKG_INSTALLDIR |
| | |
|
| # PKG_NOARCH_INSTALLDIR(DIRECTORY) | | dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) |
| # ------------------------- | | dnl -------------------------------- |
| # Substitutes the variable noarch_pkgconfigdir as the location where a | | dnl Since: 0.27 |
| # module should install arch-independent pkg-config .pc files. By | | dnl |
| # default the directory is $datadir/pkgconfig, but the default can be | | dnl Substitutes the variable noarch_pkgconfigdir as the location where a |
| # changed by passing DIRECTORY. The user can override through the | | dnl module should install arch-independent pkg-config .pc files. By |
| # --with-noarch-pkgconfigdir parameter. | | dnl default the directory is $datadir/pkgconfig, but the default can be |
| | dnl changed by passing DIRECTORY. The user can override through the |
| | dnl --with-noarch-pkgconfigdir parameter. |
| AC_DEFUN([PKG_NOARCH_INSTALLDIR], | | AC_DEFUN([PKG_NOARCH_INSTALLDIR], |
| [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) | | [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) |
| m4_pushdef([pkg_description], | | m4_pushdef([pkg_description], |
| [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) | | [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) |
| AC_ARG_WITH([noarch-pkgconfigdir], | | AC_ARG_WITH([noarch-pkgconfigdir], |
| [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, | | [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, |
| [with_noarch_pkgconfigdir=]pkg_default) | | [with_noarch_pkgconfigdir=]pkg_default) |
| AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) | | AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) |
| m4_popdef([pkg_default]) | | m4_popdef([pkg_default]) |
| m4_popdef([pkg_description]) | | m4_popdef([pkg_description]) |
|
| ]) dnl PKG_NOARCH_INSTALLDIR | | ])dnl PKG_NOARCH_INSTALLDIR |
| | |
|
| # PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, | | dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, |
| # [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) | | dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
| # ------------------------------------------- | | dnl ------------------------------------------- |
| # Retrieves the value of the pkg-config variable for the given module. | | dnl Since: 0.28 |
| | dnl |
| | dnl Retrieves the value of the pkg-config variable for the given module. |
| 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 |
|
| ])# PKG_CHECK_VAR | | ])dnl PKG_CHECK_VAR |
| | |
|
| # Copyright (C) 2002-2013 Free Software Foundation, Inc. | | # Copyright (C) 2002-2014 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. |
| # (This private macro should not be called outside this file.) | | # (This private macro should not be called outside this file.) |
| AC_DEFUN([AM_AUTOMAKE_VERSION], | | AC_DEFUN([AM_AUTOMAKE_VERSION], |
|
| [am__api_version='1.14' | | [am__api_version='1.15' |
| dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
| dnl require some minimum version. Point them to the right macro. | | dnl require some minimum version. Point them to the right macro. |
|
| m4_if([$1], [1.14.1], [], | | m4_if([$1], [1.15], [], |
| [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
| ]) | | ]) |
| | |
| # _AM_AUTOCONF_VERSION(VERSION) | | # _AM_AUTOCONF_VERSION(VERSION) |
| # ----------------------------- | | # ----------------------------- |
| # aclocal traces this macro to find the Autoconf version. | | # aclocal traces this macro to find the Autoconf version. |
| # This is a private macro too. Using m4_define simplifies | | # This is a private macro too. Using m4_define simplifies |
| # the logic in aclocal, which can simply ignore this definition. | | # the logic in aclocal, which can simply ignore this definition. |
| m4_define([_AM_AUTOCONF_VERSION], []) | | m4_define([_AM_AUTOCONF_VERSION], []) |
| | |
| # AM_SET_CURRENT_AUTOMAKE_VERSION | | # AM_SET_CURRENT_AUTOMAKE_VERSION |
| # ------------------------------- | | # ------------------------------- |
| # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
| # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
| AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
|
| [AM_AUTOMAKE_VERSION([1.14.1])dnl | | [AM_AUTOMAKE_VERSION([1.15])dnl |
| 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 |
| _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
| | |
| # AM_AUX_DIR_EXPAND -*- Autoconf -*- | | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
| | |
|
| # Copyright (C) 2001-2013 Free Software Foundation, Inc. | | # Copyright (C) 2001-2014 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. |
| | |
| # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets | | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
| # $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to | | # $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to |
| # '$srcdir', '$srcdir/..', or '$srcdir/../..'. | | # '$srcdir', '$srcdir/..', or '$srcdir/../..'. |
| # | | # |
| # Of course, Automake must honor this variable whenever it calls a | | # Of course, Automake must honor this variable whenever it calls a |
| | |
| skipping to change at line 317 | | skipping to change at line 377 |
|---|
| # This will work as long as MISSING is not called from configure, because | | # This will work as long as MISSING is not called from configure, because |
| # unfortunately $(top_srcdir) has no meaning in configure. | | # unfortunately $(top_srcdir) has no meaning in configure. |
| # However there are other variables, like CC, which are often used in | | # However there are other variables, like CC, which are often used in |
| # configure, and could therefore not use this "fixed" $ac_aux_dir. | | # configure, and could therefore not use this "fixed" $ac_aux_dir. |
| # | | # |
| # Another solution, used here, is to always expand $ac_aux_dir to an | | # Another solution, used here, is to always expand $ac_aux_dir to an |
| # absolute PATH. The drawback is that using absolute paths prevent a | | # absolute PATH. The drawback is that using absolute paths prevent a |
| # configured tree to be moved without reconfiguration. | | # configured tree to be moved without reconfiguration. |
| | |
| AC_DEFUN([AM_AUX_DIR_EXPAND], | | AC_DEFUN([AM_AUX_DIR_EXPAND], |
|
| [dnl Rely on autoconf to set up CDPATH properly. | | [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl |
| AC_PREREQ([2.50])dnl | | # Expand $ac_aux_dir to an absolute path. |
| # expand $ac_aux_dir to an absolute path | | am_aux_dir=`cd "$ac_aux_dir" && pwd` |
| am_aux_dir=`cd $ac_aux_dir && pwd` | | |
| ]) | | ]) |
| | |
| # Do all the work for Automake. -*- Autoconf -*- | | # Do all the work for Automake. -*- Autoconf -*- |
| | |
|
| # Copyright (C) 1996-2013 Free Software Foundation, Inc. | | # Copyright (C) 1996-2014 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. |
| | |
| # This macro actually does too much. Some checks are only needed if | | # This macro actually does too much. Some checks are only needed if |
| # your package does certain things. But this isn't really a big deal. | | # your package does certain things. But this isn't really a big deal. |
| | |
| dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. | | dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. |
| m4_define([AC_PROG_CC], | | m4_define([AC_PROG_CC], |
| | |
| skipping to change at line 415 | | skipping to change at line 474 |
|---|
| AM_MISSING_PROG([AUTOHEADER], [autoheader]) | | AM_MISSING_PROG([AUTOHEADER], [autoheader]) |
| AM_MISSING_PROG([MAKEINFO], [makeinfo]) | | AM_MISSING_PROG([MAKEINFO], [makeinfo]) |
| AC_REQUIRE([AM_PROG_INSTALL_SH])dnl | | AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
| AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl | | AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl |
| AC_REQUIRE([AC_PROG_MKDIR_P])dnl | | AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
| # For better backward compatibility. To be removed once Automake 1.9.x | | # For better backward compatibility. To be removed once Automake 1.9.x |
| # dies out for good. For more background, see: | | # dies out for good. For more background, see: |
| # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> |
| # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
| AC_SUBST([mkdir_p], ['$(MKDIR_P)']) | | AC_SUBST([mkdir_p], ['$(MKDIR_P)']) |
|
| # We need awk for the "check" target. The system "awk" is bad on | | # We need awk for the "check" target (and possibly the TAP driver). The |
| # some platforms. | | # system "awk" is bad on some platforms. |
| AC_REQUIRE([AC_PROG_AWK])dnl | | AC_REQUIRE([AC_PROG_AWK])dnl |
| AC_REQUIRE([AC_PROG_MAKE_SET])dnl | | AC_REQUIRE([AC_PROG_MAKE_SET])dnl |
| AC_REQUIRE([AM_SET_LEADING_DOT])dnl | | AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
| _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], | | _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], |
| [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], | | [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], |
| [_AM_PROG_TAR([v7])])]) | | [_AM_PROG_TAR([v7])])]) |
| _AM_IF_OPTION([no-dependencies],, | | _AM_IF_OPTION([no-dependencies],, |
| [AC_PROVIDE_IFELSE([AC_PROG_CC], | | [AC_PROVIDE_IFELSE([AC_PROG_CC], |
| [_AM_DEPENDENCIES([CC])], | | [_AM_DEPENDENCIES([CC])], |
| [m4_define([AC_PROG_CC], | | [m4_define([AC_PROG_CC], |
| | |
| skipping to change at line 489 | | skipping to change at line 548 |
|---|
| You can download and install GNU coreutils to get an 'rm' implementation | | You can download and install GNU coreutils to get an 'rm' implementation |
| that behaves properly: <http://www.gnu.org/software/coreutils/>. | | that behaves properly: <http://www.gnu.org/software/coreutils/>. |
| | |
| If you want to complete the configuration process using your problematic | | If you want to complete the configuration process using your problematic |
| 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM | | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM |
| to "yes", and re-run configure. | | to "yes", and re-run configure. |
| | |
| END | | END |
| AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) | | AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) |
| fi | | fi |
|
| fi]) | | fi |
| | dnl The trailing newline in this macro's definition is deliberate, for |
| | dnl backward compatibility and to allow trailing 'dnl'-style comments |
| | dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. |
| | ]) |
| | |
| dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not | | dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
| dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further | | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
| dnl mangled by Autoconf and run in a shell conditional statement. | | dnl mangled by Autoconf and run in a shell conditional statement. |
| m4_define([_AC_COMPILER_EXEEXT], | | m4_define([_AC_COMPILER_EXEEXT], |
| m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) | | m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) |
| | |
| # When config.status generates a header, we must update the stamp-h file. | | # When config.status generates a header, we must update the stamp-h file. |
| # This file resides in the same directory as the config header | | # This file resides in the same directory as the config header |
| # that is generated. The stamp files are numbered to have different names. | | # that is generated. The stamp files are numbered to have different names. |
| | |
| skipping to change at line 518 | | skipping to change at line 581 |
|---|
| for _am_header in $config_headers :; do | | for _am_header in $config_headers :; do |
| case $_am_header in | | case $_am_header in |
| $_am_arg | $_am_arg:* ) | | $_am_arg | $_am_arg:* ) |
| break ;; | | break ;; |
| * ) | | * ) |
| _am_stamp_count=`expr $_am_stamp_count + 1` ;; | | _am_stamp_count=`expr $_am_stamp_count + 1` ;; |
| esac | | esac |
| done | | done |
| echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
unt]) | | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
unt]) |
| | |
|
| # Copyright (C) 2001-2013 Free Software Foundation, Inc. | | # Copyright (C) 2001-2014 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_PROG_INSTALL_SH | | # AM_PROG_INSTALL_SH |
| # ------------------ | | # ------------------ |
| # Define $install_sh. | | # Define $install_sh. |
| AC_DEFUN([AM_PROG_INSTALL_SH], | | AC_DEFUN([AM_PROG_INSTALL_SH], |
| [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
|
| if test x"${install_sh}" != xset; then | | if test x"${install_sh+set}" != xset; then |
| case $am_aux_dir in | | case $am_aux_dir in |
| *\ * | *\ *) | | *\ * | *\ *) |
| install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; | | install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; |
| *) | | *) |
| install_sh="\${SHELL} $am_aux_dir/install-sh" | | install_sh="\${SHELL} $am_aux_dir/install-sh" |
| esac | | esac |
| fi | | fi |
| AC_SUBST([install_sh])]) | | AC_SUBST([install_sh])]) |
| | |
|
| # Copyright (C) 2003-2013 Free Software Foundation, Inc. | | # Copyright (C) 2003-2014 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. |
| | |
| # Check whether the underlying file-system supports filenames | | # Check whether the underlying file-system supports filenames |
| # with a leading dot. For instance MS-DOS doesn't. | | # with a leading dot. For instance MS-DOS doesn't. |
| AC_DEFUN([AM_SET_LEADING_DOT], | | AC_DEFUN([AM_SET_LEADING_DOT], |
| [rm -rf .tst 2>/dev/null | | [rm -rf .tst 2>/dev/null |
| mkdir .tst 2>/dev/null | | mkdir .tst 2>/dev/null |
| if test -d .tst; then | | if test -d .tst; then |
| am__leading_dot=. | | am__leading_dot=. |
| else | | else |
| am__leading_dot=_ | | am__leading_dot=_ |
| fi | | fi |
| rmdir .tst 2>/dev/null | | rmdir .tst 2>/dev/null |
| AC_SUBST([am__leading_dot])]) | | AC_SUBST([am__leading_dot])]) |
| | |
| # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- | | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
| | |
|
| # Copyright (C) 1997-2013 Free Software Foundation, Inc. | | # Copyright (C) 1997-2014 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_MISSING_PROG(NAME, PROGRAM) | | # AM_MISSING_PROG(NAME, PROGRAM) |
| # ------------------------------ | | # ------------------------------ |
| AC_DEFUN([AM_MISSING_PROG], | | AC_DEFUN([AM_MISSING_PROG], |
| [AC_REQUIRE([AM_MISSING_HAS_RUN]) | | [AC_REQUIRE([AM_MISSING_HAS_RUN]) |
| $1=${$1-"${am_missing_run}$2"} | | $1=${$1-"${am_missing_run}$2"} |
| | |
| skipping to change at line 599 | | skipping to change at line 662 |
|---|
| if eval "$MISSING --is-lightweight"; then | | if eval "$MISSING --is-lightweight"; then |
| am_missing_run="$MISSING " | | am_missing_run="$MISSING " |
| else | | else |
| am_missing_run= | | am_missing_run= |
| AC_MSG_WARN(['missing' script is too old or missing]) | | AC_MSG_WARN(['missing' script is too old or missing]) |
| fi | | fi |
| ]) | | ]) |
| | |
| # Helper functions for option handling. -*- Autoconf -*- | | # Helper functions for option handling. -*- Autoconf -*- |
| | |
|
| # Copyright (C) 2001-2013 Free Software Foundation, Inc. | | # Copyright (C) 2001-2014 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_MANGLE_OPTION(NAME) | | # _AM_MANGLE_OPTION(NAME) |
| # ----------------------- | | # ----------------------- |
| AC_DEFUN([_AM_MANGLE_OPTION], | | AC_DEFUN([_AM_MANGLE_OPTION], |
| [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) | | [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) |
| | |
| | |
| skipping to change at line 630 | | skipping to change at line 693 |
|---|
| [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) | | [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) |
| | |
| # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) | | # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) |
| # ------------------------------------------- | | # ------------------------------------------- |
| # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. | | # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. |
| AC_DEFUN([_AM_IF_OPTION], | | AC_DEFUN([_AM_IF_OPTION], |
| [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) | | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
| | |
| # Check to make sure that the build environment is sane. -*- Autoconf -*- | | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
| | |
|
| # Copyright (C) 1996-2013 Free Software Foundation, Inc. | | # Copyright (C) 1996-2014 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_SANITY_CHECK | | # AM_SANITY_CHECK |
| # --------------- | | # --------------- |
| AC_DEFUN([AM_SANITY_CHECK], | | AC_DEFUN([AM_SANITY_CHECK], |
| [AC_MSG_CHECKING([whether build environment is sane]) | | [AC_MSG_CHECKING([whether build environment is sane]) |
| # Reject unsafe characters in $srcdir or the absolute working directory | | # Reject unsafe characters in $srcdir or the absolute working directory |
| | |
| skipping to change at line 711 | | skipping to change at line 774 |
|---|
| AC_CONFIG_COMMANDS_PRE( | | AC_CONFIG_COMMANDS_PRE( |
| [AC_MSG_CHECKING([that generated files are newer than configure]) | | [AC_MSG_CHECKING([that generated files are newer than configure]) |
| if test -n "$am_sleep_pid"; then | | if test -n "$am_sleep_pid"; then |
| # Hide warnings about reused PIDs. | | # Hide warnings about reused PIDs. |
| wait $am_sleep_pid 2>/dev/null | | wait $am_sleep_pid 2>/dev/null |
| fi | | fi |
| AC_MSG_RESULT([done])]) | | AC_MSG_RESULT([done])]) |
| rm -f conftest.file | | rm -f conftest.file |
| ]) | | ]) |
| | |
|
| # Copyright (C) 2009-2013 Free Software Foundation, Inc. | | # Copyright (C) 2009-2014 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_SILENT_RULES([DEFAULT]) | | # AM_SILENT_RULES([DEFAULT]) |
| # -------------------------- | | # -------------------------- |
| # Enable less verbose build rules; with the default set to DEFAULT | | # Enable less verbose build rules; with the default set to DEFAULT |
| # ("yes" being less verbose, "no" or empty being verbose). | | # ("yes" being less verbose, "no" or empty being verbose). |
| AC_DEFUN([AM_SILENT_RULES], | | AC_DEFUN([AM_SILENT_RULES], |
| | |
| skipping to change at line 771 | | skipping to change at line 834 |
|---|
| AC_SUBST([AM_V])dnl | | AC_SUBST([AM_V])dnl |
| AM_SUBST_NOTMAKE([AM_V])dnl | | AM_SUBST_NOTMAKE([AM_V])dnl |
| AC_SUBST([AM_DEFAULT_V])dnl | | AC_SUBST([AM_DEFAULT_V])dnl |
| AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl | | AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl |
| AC_SUBST([AM_DEFAULT_VERBOSITY])dnl | | AC_SUBST([AM_DEFAULT_VERBOSITY])dnl |
| AM_BACKSLASH='\' | | AM_BACKSLASH='\' |
| AC_SUBST([AM_BACKSLASH])dnl | | AC_SUBST([AM_BACKSLASH])dnl |
| _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl | | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
| ]) | | ]) |
| | |
|
| # Copyright (C) 2001-2013 Free Software Foundation, Inc. | | # Copyright (C) 2001-2014 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_PROG_INSTALL_STRIP | | # AM_PROG_INSTALL_STRIP |
| # --------------------- | | # --------------------- |
| # One issue with vendor 'install' (even GNU) is that you can't | | # One issue with vendor 'install' (even GNU) is that you can't |
| # specify the program used to strip binaries. This is especially | | # specify the program used to strip binaries. This is especially |
| # annoying in cross-compiling environments, where the build's strip | | # annoying in cross-compiling environments, where the build's strip |
| | |
| skipping to change at line 799 | | skipping to change at line 862 |
|---|
| # run "make install-strip". However 'strip' might not be the right | | # run "make install-strip". However 'strip' might not be the right |
| # tool to use in cross-compilation environments, therefore Automake | | # tool to use in cross-compilation environments, therefore Automake |
| # will honor the 'STRIP' environment variable to overrule this program. | | # will honor the 'STRIP' environment variable to overrule this program. |
| dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. | | dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. |
| if test "$cross_compiling" != no; then | | if test "$cross_compiling" != no; then |
| AC_CHECK_TOOL([STRIP], [strip], :) | | AC_CHECK_TOOL([STRIP], [strip], :) |
| fi | | fi |
| INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
| AC_SUBST([INSTALL_STRIP_PROGRAM])]) | | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
| | |
|
| # Copyright (C) 2006-2013 Free Software Foundation, Inc. | | # Copyright (C) 2006-2014 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_SUBST_NOTMAKE(VARIABLE) | | # _AM_SUBST_NOTMAKE(VARIABLE) |
| # --------------------------- | | # --------------------------- |
| # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. | | # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. |
| # This macro is traced by Automake. | | # This macro is traced by Automake. |
| AC_DEFUN([_AM_SUBST_NOTMAKE]) | | AC_DEFUN([_AM_SUBST_NOTMAKE]) |
| | |
| # AM_SUBST_NOTMAKE(VARIABLE) | | # AM_SUBST_NOTMAKE(VARIABLE) |
| # -------------------------- | | # -------------------------- |
| # Public sister of _AM_SUBST_NOTMAKE. | | # Public sister of _AM_SUBST_NOTMAKE. |
| AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) | | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
| | |
| # Check how to create a tarball. -*- Autoconf -*- | | # Check how to create a tarball. -*- Autoconf -*- |
| | |
|
| # Copyright (C) 2004-2013 Free Software Foundation, Inc. | | # Copyright (C) 2004-2014 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_PROG_TAR(FORMAT) | | # _AM_PROG_TAR(FORMAT) |
| # -------------------- | | # -------------------- |
| # Check how to create a tarball in format FORMAT. | | # Check how to create a tarball in format FORMAT. |
| # FORMAT should be one of 'v7', 'ustar', or 'pax'. | | # FORMAT should be one of 'v7', 'ustar', or 'pax'. |
| # | | # |
| | | |
| End of changes. 36 change blocks. |
|---|
| 100 lines changed or deleted | | 165 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 