mirror of
https://github.com/pyenv/pyenv.git
synced 2024-11-07 20:31:01 -05:00
Patch 3.10.0 configure (#2155)
* Fix "PKG_PROG_PKG_CONFIG: command not found"
Apply f146ca36f8
* bpo-45350: Rerun autoreconf with the pkg-config macros (GH-28707)
This commit is contained in:
parent
552d943762
commit
d79bda4602
1 changed files with 535 additions and 0 deletions
|
@ -0,0 +1,535 @@
|
|||
From f146ca36f81075f222aa3a1595042597d96dfad3 Mon Sep 17 00:00:00 2001
|
||||
From: Pablo Galindo Salgado <Pablogsal@gmail.com>
|
||||
Date: Mon, 4 Oct 2021 00:39:54 +0100
|
||||
Subject: [PATCH] bpo-45350: Rerun autoreconf with the pkg-config macros
|
||||
(GH-28707)
|
||||
|
||||
diff --git a/aclocal.m4 b/aclocal.m4
|
||||
index 987bfdf215..2f1bd37528 100644
|
||||
--- a/aclocal.m4
|
||||
+++ b/aclocal.m4
|
||||
@@ -275,3 +275,347 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
|
||||
AC_SUBST([OPENSSL_LDFLAGS])
|
||||
])
|
||||
|
||||
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
|
||||
+# serial 11 (pkg-config-0.29.1)
|
||||
+
|
||||
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
|
||||
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
|
||||
+dnl
|
||||
+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 the Free Software Foundation; either version 2 of the License, or
|
||||
+dnl (at your option) any later version.
|
||||
+dnl
|
||||
+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 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+dnl General Public License for more details.
|
||||
+dnl
|
||||
+dnl 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 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
+dnl 02111-1307, USA.
|
||||
+dnl
|
||||
+dnl As a special exception to the GNU General Public License, if you
|
||||
+dnl distribute this file as part of a program that contains a
|
||||
+dnl configuration script generated by Autoconf, you may include it under
|
||||
+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],
|
||||
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
|
||||
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
|
||||
+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], [directories to add to pkg-config's search path])
|
||||
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
|
||||
+
|
||||
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
|
||||
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
|
||||
+fi
|
||||
+if test -n "$PKG_CONFIG"; then
|
||||
+ _pkg_min_version=m4_default([$1], [0.9.0])
|
||||
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
|
||||
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
|
||||
+ AC_MSG_RESULT([yes])
|
||||
+ else
|
||||
+ AC_MSG_RESULT([no])
|
||||
+ PKG_CONFIG=""
|
||||
+ fi
|
||||
+fi[]dnl
|
||||
+])dnl PKG_PROG_PKG_CONFIG
|
||||
+
|
||||
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
+dnl -------------------------------------------------------------------
|
||||
+dnl Since: 0.18
|
||||
+dnl
|
||||
+dnl Check to see whether a particular set of modules exists. Similar to
|
||||
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
|
||||
+dnl
|
||||
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
+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_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
+if test -n "$PKG_CONFIG" && \
|
||||
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
|
||||
+ m4_default([$2], [:])
|
||||
+m4_ifvaln([$3], [else
|
||||
+ $3])dnl
|
||||
+fi])
|
||||
+
|
||||
+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],
|
||||
+[if test -n "$$1"; then
|
||||
+ pkg_cv_[]$1="$$1"
|
||||
+ elif test -n "$PKG_CONFIG"; then
|
||||
+ PKG_CHECK_EXISTS([$3],
|
||||
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
|
||||
+ test "x$?" != "x0" && pkg_failed=yes ],
|
||||
+ [pkg_failed=yes])
|
||||
+ else
|
||||
+ pkg_failed=untried
|
||||
+fi[]dnl
|
||||
+])dnl _PKG_CONFIG
|
||||
+
|
||||
+dnl _PKG_SHORT_ERRORS_SUPPORTED
|
||||
+dnl ---------------------------
|
||||
+dnl Internal check to see if pkg-config supports short errors.
|
||||
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
|
||||
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
+ _pkg_short_errors_supported=yes
|
||||
+else
|
||||
+ _pkg_short_errors_supported=no
|
||||
+fi[]dnl
|
||||
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
|
||||
+
|
||||
+
|
||||
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
|
||||
+dnl [ACTION-IF-NOT-FOUND])
|
||||
+dnl --------------------------------------------------------------
|
||||
+dnl Since: 0.4.0
|
||||
+dnl
|
||||
+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 explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
|
||||
+AC_DEFUN([PKG_CHECK_MODULES],
|
||||
+[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][_LIBS], [linker flags for $1, overriding pkg-config])dnl
|
||||
+
|
||||
+pkg_failed=no
|
||||
+AC_MSG_CHECKING([for $1])
|
||||
+
|
||||
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
|
||||
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
|
||||
+
|
||||
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
|
||||
+and $1[]_LIBS to avoid the need to call pkg-config.
|
||||
+See the pkg-config man page for more details.])
|
||||
+
|
||||
+if test $pkg_failed = yes; then
|
||||
+ AC_MSG_RESULT([no])
|
||||
+ _PKG_SHORT_ERRORS_SUPPORTED
|
||||
+ if test $_pkg_short_errors_supported = yes; then
|
||||
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
|
||||
+ else
|
||||
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
|
||||
+ fi
|
||||
+ # Put the nasty error message in config.log where it belongs
|
||||
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
|
||||
+
|
||||
+ m4_default([$4], [AC_MSG_ERROR(
|
||||
+[Package requirements ($2) were not met:
|
||||
+
|
||||
+$$1_PKG_ERRORS
|
||||
+
|
||||
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
+installed software in a non-standard prefix.
|
||||
+
|
||||
+_PKG_TEXT])[]dnl
|
||||
+ ])
|
||||
+elif test $pkg_failed = untried; then
|
||||
+ AC_MSG_RESULT([no])
|
||||
+ m4_default([$4], [AC_MSG_FAILURE(
|
||||
+[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
|
||||
+path to pkg-config.
|
||||
+
|
||||
+_PKG_TEXT
|
||||
+
|
||||
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
|
||||
+ ])
|
||||
+else
|
||||
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
|
||||
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
|
||||
+ AC_MSG_RESULT([yes])
|
||||
+ $3
|
||||
+fi[]dnl
|
||||
+])dnl PKG_CHECK_MODULES
|
||||
+
|
||||
+
|
||||
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
|
||||
+dnl [ACTION-IF-NOT-FOUND])
|
||||
+dnl ---------------------------------------------------------------------
|
||||
+dnl Since: 0.29
|
||||
+dnl
|
||||
+dnl Checks for existence of MODULES and gathers its build flags with
|
||||
+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],
|
||||
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
|
||||
+m4_pushdef([pkg_description],
|
||||
+ [pkg-config installation directory @<:@]pkg_default[@:>@])
|
||||
+AC_ARG_WITH([pkgconfigdir],
|
||||
+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
|
||||
+ [with_pkgconfigdir=]pkg_default)
|
||||
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
|
||||
+m4_popdef([pkg_default])
|
||||
+m4_popdef([pkg_description])
|
||||
+])dnl PKG_INSTALLDIR
|
||||
+
|
||||
+
|
||||
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
|
||||
+dnl --------------------------------
|
||||
+dnl Since: 0.27
|
||||
+dnl
|
||||
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
|
||||
+dnl module should install arch-independent pkg-config .pc files. By
|
||||
+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],
|
||||
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
|
||||
+m4_pushdef([pkg_description],
|
||||
+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
|
||||
+AC_ARG_WITH([noarch-pkgconfigdir],
|
||||
+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
|
||||
+ [with_noarch_pkgconfigdir=]pkg_default)
|
||||
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
|
||||
+m4_popdef([pkg_default])
|
||||
+m4_popdef([pkg_description])
|
||||
+])dnl PKG_NOARCH_INSTALLDIR
|
||||
+
|
||||
+
|
||||
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
|
||||
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
+dnl -------------------------------------------
|
||||
+dnl Since: 0.28
|
||||
+dnl
|
||||
+dnl Retrieves the value of the pkg-config variable for the given module.
|
||||
+AC_DEFUN([PKG_CHECK_VAR],
|
||||
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
|
||||
+
|
||||
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
|
||||
+AS_VAR_COPY([$1], [pkg_cv_][$1])
|
||||
+
|
||||
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
|
||||
+])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
|
||||
+
|
||||
diff --git a/configure b/configure
|
||||
index 753f956469..02d882ed39 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -630,7 +630,6 @@ OPENSSL_RPATH
|
||||
OPENSSL_LDFLAGS
|
||||
OPENSSL_LIBS
|
||||
OPENSSL_INCLUDES
|
||||
-PKG_CONFIG
|
||||
ENSUREPIP
|
||||
SRCDIRS
|
||||
THREADHEADERS
|
||||
@@ -662,6 +661,9 @@ DTRACE
|
||||
TCLTK_LIBS
|
||||
TCLTK_INCLUDES
|
||||
LIBFFI_INCLUDEDIR
|
||||
+PKG_CONFIG_LIBDIR
|
||||
+PKG_CONFIG_PATH
|
||||
+PKG_CONFIG
|
||||
TZPATH
|
||||
SHLIBS
|
||||
CFLAGSFORSHARED
|
||||
@@ -873,7 +875,10 @@ LDFLAGS
|
||||
LIBS
|
||||
CPPFLAGS
|
||||
CPP
|
||||
-PROFILE_TASK'
|
||||
+PROFILE_TASK
|
||||
+PKG_CONFIG
|
||||
+PKG_CONFIG_PATH
|
||||
+PKG_CONFIG_LIBDIR'
|
||||
|
||||
|
||||
# Initialize some variables set by options.
|
||||
@@ -1637,6 +1642,11 @@ Some influential environment variables:
|
||||
CPP C preprocessor
|
||||
PROFILE_TASK
|
||||
Python args for PGO generation task
|
||||
+ PKG_CONFIG path to pkg-config utility
|
||||
+ PKG_CONFIG_PATH
|
||||
+ directories to add to pkg-config's search path
|
||||
+ PKG_CONFIG_LIBDIR
|
||||
+ path overriding pkg-config's built-in search path
|
||||
|
||||
Use these variables to override the choices made by `configure' or to help
|
||||
it to find libraries and programs with nonstandard names/locations.
|
||||
@@ -10542,7 +10552,126 @@ $as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
-PKG_PROG_PKG_CONFIG
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
|
||||
+ if test -n "$ac_tool_prefix"; then
|
||||
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
|
||||
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
+$as_echo_n "checking for $ac_word... " >&6; }
|
||||
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
|
||||
+ $as_echo_n "(cached) " >&6
|
||||
+else
|
||||
+ case $PKG_CONFIG in
|
||||
+ [\\/]* | ?:[\\/]*)
|
||||
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
|
||||
+ ;;
|
||||
+ *)
|
||||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
+for as_dir in $PATH
|
||||
+do
|
||||
+ IFS=$as_save_IFS
|
||||
+ test -z "$as_dir" && as_dir=.
|
||||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
||||
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
+ break 2
|
||||
+ fi
|
||||
+done
|
||||
+ done
|
||||
+IFS=$as_save_IFS
|
||||
+
|
||||
+ ;;
|
||||
+esac
|
||||
+fi
|
||||
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
|
||||
+if test -n "$PKG_CONFIG"; then
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
|
||||
+$as_echo "$PKG_CONFIG" >&6; }
|
||||
+else
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
+$as_echo "no" >&6; }
|
||||
+fi
|
||||
+
|
||||
+
|
||||
+fi
|
||||
+if test -z "$ac_cv_path_PKG_CONFIG"; then
|
||||
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
|
||||
+ # Extract the first word of "pkg-config", so it can be a program name with args.
|
||||
+set dummy pkg-config; ac_word=$2
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
+$as_echo_n "checking for $ac_word... " >&6; }
|
||||
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
|
||||
+ $as_echo_n "(cached) " >&6
|
||||
+else
|
||||
+ case $ac_pt_PKG_CONFIG in
|
||||
+ [\\/]* | ?:[\\/]*)
|
||||
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
|
||||
+ ;;
|
||||
+ *)
|
||||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
+for as_dir in $PATH
|
||||
+do
|
||||
+ IFS=$as_save_IFS
|
||||
+ test -z "$as_dir" && as_dir=.
|
||||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
||||
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
+ break 2
|
||||
+ fi
|
||||
+done
|
||||
+ done
|
||||
+IFS=$as_save_IFS
|
||||
+
|
||||
+ ;;
|
||||
+esac
|
||||
+fi
|
||||
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
|
||||
+if test -n "$ac_pt_PKG_CONFIG"; then
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
|
||||
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
|
||||
+else
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
+$as_echo "no" >&6; }
|
||||
+fi
|
||||
+
|
||||
+ if test "x$ac_pt_PKG_CONFIG" = x; then
|
||||
+ PKG_CONFIG=""
|
||||
+ else
|
||||
+ case $cross_compiling:$ac_tool_warned in
|
||||
+yes:)
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
||||
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
||||
+ac_tool_warned=yes ;;
|
||||
+esac
|
||||
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
|
||||
+ fi
|
||||
+else
|
||||
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
|
||||
+fi
|
||||
+
|
||||
+fi
|
||||
+if test -n "$PKG_CONFIG"; then
|
||||
+ _pkg_min_version=0.9.0
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
|
||||
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
|
||||
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
+$as_echo "yes" >&6; }
|
||||
+ else
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
+$as_echo "no" >&6; }
|
||||
+ PKG_CONFIG=""
|
||||
+ fi
|
||||
+fi
|
||||
|
||||
# Check for use of the system expat library
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-system-expat" >&5
|
||||
--
|
||||
2.29.2.windows.2
|
||||
|
Loading…
Reference in a new issue