diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-12-15 05:02:51 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-12-15 05:02:51 (GMT) |
| commit | 7bb7793bc0dbda7ccf3844c9e222408246e374f6 (patch) | |
| tree | 4e39d0b994fbe960b305f8be14a1eef27d20e323 /configure | |
| parent | 2c63c4b85d7209991ad7117ec932da121821de78 (diff) | |
| parent | 0f3cde14533060cd7a46f897e7db938166dff56a (diff) | |
| download | cpython-7bb7793bc0dbda7ccf3844c9e222408246e374f6.zip cpython-7bb7793bc0dbda7ccf3844c9e222408246e374f6.tar.gz cpython-7bb7793bc0dbda7ccf3844c9e222408246e374f6.tar.bz2 | |
merge 3.4 (#15506)
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 36 |
1 files changed, 34 insertions, 2 deletions
@@ -650,6 +650,8 @@ USE_SIGNAL_MODULE TCLTK_LIBS TCLTK_INCLUDES LIBFFI_INCLUDEDIR +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH PKG_CONFIG SHLIBS CFLAGSFORSHARED @@ -830,7 +832,10 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP' +CPP +PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR' # Initialize some variables set by options. @@ -1518,6 +1523,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. @@ -9420,7 +9430,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 @@ -9518,6 +9536,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 |