is a Linux application sandboxing and distribution framework. Pre-release.
| aclocal.m4 (flatpak-1.15.0.tar.xz) | : | aclocal.m4 (flatpak-1.15.1.tar.xz) |
|---|
| | |
| skipping to change at line 483 | | skipping to change at line 483 |
|---|
| | |
| dnl Usage: | | dnl Usage: |
| dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) | | dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) |
| | |
| AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], | | AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], |
| [ | | [ |
| _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) | | _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) |
| ]) | | ]) |
| | |
| # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
|
| # serial 12 (pkg-config-0.29.2) | | # 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> | | 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 |
| | |
| skipping to change at line 525 | | skipping to change at line 525 |
|---|
| 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.2]) | | [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 625 | | skipping to change at line 625 |
|---|
| dnl | | dnl |
| dnl Note that if there is a possibility the first call to | | dnl 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 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 | | 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 $2]) | | 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]) |
| | |
| m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[
]_CFLAGS | | m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[
]_CFLAGS |
| and $1[]_LIBS to avoid the need to call pkg-config. | | and $1[]_LIBS to avoid the need to call pkg-config. |
| See the pkg-config man page for more details.]) | | See the pkg-config man page for more details.]) |
| | |
| if test $pkg_failed = yes; then | | if test $pkg_failed = yes; then |
|
| AC_MSG_RESULT([no]) | | AC_MSG_RESULT([no]) |
| _PKG_SHORT_ERRORS_SUPPORTED | | _PKG_SHORT_ERRORS_SUPPORTED |
| if test $_pkg_short_errors_supported = yes; then | | if test $_pkg_short_errors_supported = yes; then |
| $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cfla
gs --libs "$2" 2>&1` | | $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cfla
gs --libs "$2" 2>&1` |
| else | | else |
| $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2"
2>&1` | | $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2"
2>&1` |
| fi | | fi |
| # Put the nasty error message in config.log where it belongs | | # Put the nasty error message in config.log where it belongs |
| echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD | | echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |
| | |
| m4_default([$4], [AC_MSG_ERROR( | | m4_default([$4], [AC_MSG_ERROR( |
| [Package requirements ($2) were not met: | | [Package requirements ($2) were not met: |
| | |
| $$1_PKG_ERRORS | | $$1_PKG_ERRORS |
| | |
| Consider adjusting the PKG_CONFIG_PATH environment variable if you | | Consider adjusting the PKG_CONFIG_PATH environment variable if you |
| installed software in a non-standard prefix. | | installed software in a non-standard prefix. |
| | |
| _PKG_TEXT])[]dnl | | _PKG_TEXT])[]dnl |
| ]) | | ]) |
| elif test $pkg_failed = untried; then | | elif test $pkg_failed = untried; then |
|
| AC_MSG_RESULT([no]) | | AC_MSG_RESULT([no]) |
| m4_default([$4], [AC_MSG_FAILURE( | | m4_default([$4], [AC_MSG_FAILURE( |
| [The pkg-config script could not be found or is too old. Make sure it | | [The pkg-config script could not be found or is too old. Make sure it |
| is in your PATH or set the PKG_CONFIG environment variable to the full | | is in your PATH or set the PKG_CONFIG environment variable to the full |
| path to pkg-config. | | path to pkg-config. |
| | |
| _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 |
| | |
| skipping to change at line 753 | | skipping to change at line 753 |
|---|
| 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-2021 Free Software Foundation, Inc. | | # Copyright (C) 2002-2021 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. 6 change blocks. |
|---|
| 5 lines changed or deleted | | 73 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 