<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/7199">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
Kevin Harwell: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">menuselect: Delete and ignore aclocal.m4.<br><br>This file is temporary output from the bootstrap.sh command, it does not<br>need to be committed.<br><br>Change-Id: Ie0fd113aff6eac44924c0bd0c900833c6c86a6d9<br>---<br>M menuselect/.gitignore<br>D menuselect/aclocal.m4<br>2 files changed, 1 insertion(+), 296 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/menuselect/.gitignore b/menuselect/.gitignore<br>index ded8d2d..05f4778 100644<br>--- a/menuselect/.gitignore<br>+++ b/menuselect/.gitignore<br>@@ -1,3 +1,4 @@<br>+aclocal.m4<br> autoconfig.h<br> cmenuselect<br> config.log<br>diff --git a/menuselect/aclocal.m4 b/menuselect/aclocal.m4<br>deleted file mode 100644<br>index e67774c..0000000<br>--- a/menuselect/aclocal.m4<br>+++ /dev/null<br>@@ -1,296 +0,0 @@<br>-# generated automatically by aclocal 1.15 -*- Autoconf -*-<br>-<br>-# Copyright (C) 1996-2014 Free Software Foundation, Inc.<br>-<br>-# This file is free software; the Free Software Foundation<br>-# gives unlimited permission to copy and/or distribute it,<br>-# with or without modifications, as long as this notice is preserved.<br>-<br>-# This program is distributed in the hope that it will be useful,<br>-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without<br>-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A<br>-# PARTICULAR PURPOSE.<br>-<br>-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])<br>-dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-<br>-dnl serial 11 (pkg-config-0.29)<br>-dnl<br>-dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.<br>-dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com><br>-dnl<br>-dnl This program is free software; you can redistribute it and/or modify<br>-dnl it under the terms of the GNU General Public License as published by<br>-dnl the Free Software Foundation; either version 2 of the License, or<br>-dnl (at your option) any later version.<br>-dnl<br>-dnl This program is distributed in the hope that it will be useful, but<br>-dnl WITHOUT ANY WARRANTY; without even the implied warranty of<br>-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU<br>-dnl General Public License for more details.<br>-dnl<br>-dnl You should have received a copy of the GNU General Public License<br>-dnl along with this program; if not, write to the Free Software<br>-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA<br>-dnl 02111-1307, USA.<br>-dnl<br>-dnl As a special exception to the GNU General Public License, if you<br>-dnl distribute this file as part of a program that contains a<br>-dnl configuration script generated by Autoconf, you may include it under<br>-dnl the same distribution terms that you use for the rest of that<br>-dnl program.<br>-<br>-dnl PKG_PREREQ(MIN-VERSION)<br>-dnl -----------------------<br>-dnl Since: 0.29<br>-dnl<br>-dnl Verify that the version of the pkg-config macros are at least<br>-dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's<br>-dnl installed version of pkg-config, this checks the developer's version<br>-dnl of pkg.m4 when generating configure.<br>-dnl<br>-dnl To ensure that this macro is defined, also add:<br>-dnl m4_ifndef([PKG_PREREQ],<br>-dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])<br>-dnl<br>-dnl See the "Since" comment for each macro you use to see what version<br>-dnl of the macros you require.<br>-m4_defun([PKG_PREREQ],<br>-[m4_define([PKG_MACROS_VERSION], [0.29])<br>-m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,<br>- [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])<br>-])dnl PKG_PREREQ<br>-<br>-dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])<br>-dnl ----------------------------------<br>-dnl Since: 0.16<br>-dnl<br>-dnl Search for the pkg-config tool and set the PKG_CONFIG variable to<br>-dnl first found in the path. Checks that the version of pkg-config found<br>-dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is<br>-dnl used since that's the first version where most current features of<br>-dnl pkg-config existed.<br>-AC_DEFUN([PKG_PROG_PKG_CONFIG],<br>-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])<br>-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])<br>-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])<br>-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])<br>-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])<br>-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])<br>-<br>-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then<br>- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])<br>-fi<br>-if test -n "$PKG_CONFIG"; then<br>- _pkg_min_version=m4_default([$1], [0.9.0])<br>- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])<br>- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then<br>- AC_MSG_RESULT([yes])<br>- else<br>- AC_MSG_RESULT([no])<br>- PKG_CONFIG=""<br>- fi<br>-fi[]dnl<br>-])dnl PKG_PROG_PKG_CONFIG<br>-<br>-dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])<br>-dnl -------------------------------------------------------------------<br>-dnl Since: 0.18<br>-dnl<br>-dnl Check to see whether a particular set of modules exists. Similar to<br>-dnl PKG_CHECK_MODULES(), but does not set variables or print errors.<br>-dnl<br>-dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])<br>-dnl only at the first occurence in configure.ac, so if the first place<br>-dnl it's called might be skipped (such as if it is within an "if", you<br>-dnl have to call PKG_CHECK_EXISTS manually<br>-AC_DEFUN([PKG_CHECK_EXISTS],<br>-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl<br>-if test -n "$PKG_CONFIG" && \<br>- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then<br>- m4_default([$2], [:])<br>-m4_ifvaln([$3], [else<br>- $3])dnl<br>-fi])<br>-<br>-dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])<br>-dnl ---------------------------------------------<br>-dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting<br>-dnl pkg_failed based on the result.<br>-m4_define([_PKG_CONFIG],<br>-[if test -n "$$1"; then<br>- pkg_cv_[]$1="$$1"<br>- elif test -n "$PKG_CONFIG"; then<br>- PKG_CHECK_EXISTS([$3],<br>- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`<br>- test "x$?" != "x0" && pkg_failed=yes ],<br>- [pkg_failed=yes])<br>- else<br>- pkg_failed=untried<br>-fi[]dnl<br>-])dnl _PKG_CONFIG<br>-<br>-dnl _PKG_SHORT_ERRORS_SUPPORTED<br>-dnl ---------------------------<br>-dnl Internal check to see if pkg-config supports short errors.<br>-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],<br>-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])<br>-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then<br>- _pkg_short_errors_supported=yes<br>-else<br>- _pkg_short_errors_supported=no<br>-fi[]dnl<br>-])dnl _PKG_SHORT_ERRORS_SUPPORTED<br>-<br>-<br>-dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],<br>-dnl [ACTION-IF-NOT-FOUND])<br>-dnl --------------------------------------------------------------<br>-dnl Since: 0.4.0<br>-dnl<br>-dnl Note that if there is a possibility the first call to<br>-dnl PKG_CHECK_MODULES might not happen, you should be sure to include an<br>-dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac<br>-AC_DEFUN([PKG_CHECK_MODULES],<br>-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl<br>-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl<br>-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl<br>-<br>-pkg_failed=no<br>-AC_MSG_CHECKING([for $1])<br>-<br>-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])<br>-_PKG_CONFIG([$1][_LIBS], [libs], [$2])<br>-<br>-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS<br>-and $1[]_LIBS to avoid the need to call pkg-config.<br>-See the pkg-config man page for more details.])<br>-<br>-if test $pkg_failed = yes; then<br>- AC_MSG_RESULT([no])<br>- _PKG_SHORT_ERRORS_SUPPORTED<br>- if test $_pkg_short_errors_supported = yes; then<br>- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`<br>- else <br>- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`<br>- fi<br>- # Put the nasty error message in config.log where it belongs<br>- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD<br>-<br>- m4_default([$4], [AC_MSG_ERROR(<br>-[Package requirements ($2) were not met:<br>-<br>-$$1_PKG_ERRORS<br>-<br>-Consider adjusting the PKG_CONFIG_PATH environment variable if you<br>-installed software in a non-standard prefix.<br>-<br>-_PKG_TEXT])[]dnl<br>- ])<br>-elif test $pkg_failed = untried; then<br>- AC_MSG_RESULT([no])<br>- m4_default([$4], [AC_MSG_FAILURE(<br>-[The pkg-config script could not be found or is too old. Make sure it<br>-is in your PATH or set the PKG_CONFIG environment variable to the full<br>-path to pkg-config.<br>-<br>-_PKG_TEXT<br>-<br>-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl<br>- ])<br>-else<br>- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS<br>- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS<br>- AC_MSG_RESULT([yes])<br>- $3<br>-fi[]dnl<br>-])dnl PKG_CHECK_MODULES<br>-<br>-<br>-dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],<br>-dnl [ACTION-IF-NOT-FOUND])<br>-dnl ---------------------------------------------------------------------<br>-dnl Since: 0.29<br>-dnl<br>-dnl Checks for existence of MODULES and gathers its build flags with<br>-dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags<br>-dnl and VARIABLE-PREFIX_LIBS from --libs.<br>-dnl<br>-dnl Note that if there is a possibility the first call to<br>-dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to<br>-dnl include an explicit call to PKG_PROG_PKG_CONFIG in your<br>-dnl configure.ac.<br>-AC_DEFUN([PKG_CHECK_MODULES_STATIC],<br>-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl<br>-_save_PKG_CONFIG=$PKG_CONFIG<br>-PKG_CONFIG="$PKG_CONFIG --static"<br>-PKG_CHECK_MODULES($@)<br>-PKG_CONFIG=$_save_PKG_CONFIG[]dnl<br>-])dnl PKG_CHECK_MODULES_STATIC<br>-<br>-<br>-dnl PKG_INSTALLDIR([DIRECTORY])<br>-dnl -------------------------<br>-dnl Since: 0.27<br>-dnl<br>-dnl Substitutes the variable pkgconfigdir as the location where a module<br>-dnl should install pkg-config .pc files. By default the directory is<br>-dnl $libdir/pkgconfig, but the default can be changed by passing<br>-dnl DIRECTORY. The user can override through the --with-pkgconfigdir<br>-dnl parameter.<br>-AC_DEFUN([PKG_INSTALLDIR],<br>-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])<br>-m4_pushdef([pkg_description],<br>- [pkg-config installation directory @<:@]pkg_default[@:>@])<br>-AC_ARG_WITH([pkgconfigdir],<br>- [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,<br>- [with_pkgconfigdir=]pkg_default)<br>-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])<br>-m4_popdef([pkg_default])<br>-m4_popdef([pkg_description])<br>-])dnl PKG_INSTALLDIR<br>-<br>-<br>-dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])<br>-dnl --------------------------------<br>-dnl Since: 0.27<br>-dnl<br>-dnl Substitutes the variable noarch_pkgconfigdir as the location where a<br>-dnl module should install arch-independent pkg-config .pc files. By<br>-dnl default the directory is $datadir/pkgconfig, but the default can be<br>-dnl changed by passing DIRECTORY. The user can override through the<br>-dnl --with-noarch-pkgconfigdir parameter.<br>-AC_DEFUN([PKG_NOARCH_INSTALLDIR],<br>-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])<br>-m4_pushdef([pkg_description],<br>- [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])<br>-AC_ARG_WITH([noarch-pkgconfigdir],<br>- [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,<br>- [with_noarch_pkgconfigdir=]pkg_default)<br>-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])<br>-m4_popdef([pkg_default])<br>-m4_popdef([pkg_description])<br>-])dnl PKG_NOARCH_INSTALLDIR<br>-<br>-<br>-dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,<br>-dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])<br>-dnl -------------------------------------------<br>-dnl Since: 0.28<br>-dnl<br>-dnl Retrieves the value of the pkg-config variable for the given module.<br>-AC_DEFUN([PKG_CHECK_VAR],<br>-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl<br>-AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl<br>-<br>-_PKG_CONFIG([$1], [variable="][$3]["], [$2])<br>-AS_VAR_COPY([$1], [pkg_cv_][$1])<br>-<br>-AS_VAR_IF([$1], [""], [$5], [$4])dnl<br>-])dnl PKG_CHECK_VAR<br>-<br>-m4_include([../autoconf/ast_check_gnu_make.m4])<br>-m4_include([../autoconf/ast_ext_lib.m4])<br>-m4_include([../autoconf/ast_ext_tool_check.m4])<br>-m4_include([../autoconf/ast_gcc_attribute.m4])<br>-m4_include([../autoconf/ast_pkgconfig.m4])<br>-m4_include([../autoconf/ast_prog_sed.m4])<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7199">change 7199</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/7199"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ie0fd113aff6eac44924c0bd0c900833c6c86a6d9 </div>
<div style="display:none"> Gerrit-Change-Number: 7199 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>