Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
64e8f6ec
Commit
64e8f6ec
authored
Dec 15, 2014
by
Benjamin Peterson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use autoconf macro to check for pkg-config (closes #15506)
parent
7a6a9735
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
3 deletions
+38
-3
Misc/NEWS
Misc/NEWS
+3
-0
configure
configure
+34
-2
configure.ac
configure.ac
+1
-1
No files found.
Misc/NEWS
View file @
64e8f6ec
...
...
@@ -62,6 +62,9 @@ IDLE
Build
-----
- Issue #15506: Use standard PKG_PROG_PKG_CONFIG autoconf macro in the configure
script.
- Issue #23032: Fix installer build failures on OS X 10.4 Tiger
by disabling assembly code in the OpenSSL build.
...
...
configure
View file @
64e8f6ec
...
...
@@ -648,6 +648,8 @@ USE_SIGNAL_MODULE
TCLTK_LIBS
TCLTK_INCLUDES
LIBFFI_INCLUDEDIR
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
PKG_CONFIG
SHLIBS
CFLAGSFORSHARED
...
...
@@ -818,7 +820,10 @@ CFLAGS
LDFLAGS
LIBS
CPPFLAGS
CPP'
CPP
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR'
# Initialize some variables set by options.
...
...
@@ -1501,6 +1506,11 @@ Some influential environment variables:
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
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.
...
...
@@ -8828,7 +8838,15 @@ $as_echo "no" >&6; }
fi
if
test
-n
"
$ac_tool_prefix
"
;
then
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
...
...
@@ -8926,6 +8944,20 @@ 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
...
...
configure.ac
View file @
64e8f6ec
...
...
@@ -2271,7 +2271,7 @@ LIBS="$withval $LIBS"
],
[AC_MSG_RESULT(no)])
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
PKG_PROG_PKG_CONFIG
# Check for use of the system expat library
AC_MSG_CHECKING(for --with-system-expat)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment