diff options
author | Ned Deily <nad@acm.org> | 2014-11-20 10:11:03 (GMT) |
---|---|---|
committer | Ned Deily <nad@acm.org> | 2014-11-20 10:11:03 (GMT) |
commit | 3f1d0b31218f54c94d42659a30580cda3a4e68ea (patch) | |
tree | edb3aa425907d73a94d820667ec657fef6c8d1d9 /configure | |
parent | a86c091a736020d823f1676acec7319bc5493f2c (diff) | |
download | cpython-3f1d0b31218f54c94d42659a30580cda3a4e68ea.zip cpython-3f1d0b31218f54c94d42659a30580cda3a4e68ea.tar.gz cpython-3f1d0b31218f54c94d42659a30580cda3a4e68ea.tar.bz2 |
Issue 22878: PEP 477 - "make install" and "make altinstall" integration
The backport of ensurepip to 2.7.9 allows pip to optionally be installed
or upgraded using the bundled pip provided by the new ensurepip module.
The option can be specified persistently using the configure option:
./configure --with-ensurepip[=upgrade|install|no]
It can also be overridden on either the "install" or "altinstall" targets:
make [alt]install ENSUREPIP=[upgrade|install|no]
For Python 2, the default option is "no" (do not install pip).
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 30 |
1 files changed, 30 insertions, 0 deletions
@@ -624,6 +624,7 @@ ac_includes_default="\ #endif" ac_subst_vars='LTLIBOBJS +ENSUREPIP SRCDIRS THREADHEADERS UNICODE_OBJS @@ -807,6 +808,7 @@ with_libm with_libc enable_big_digits enable_unicode +with_ensurepip ' ac_precious_vars='build_alias host_alias @@ -1486,6 +1488,9 @@ Optional Packages: --with-fpectl enable SIGFPE catching --with-libm=STRING math library --with-libc=STRING C library + --with(out)-ensurepip=[=OPTION] + "install" or "upgrade" using bundled pip, default is + "no" Some influential environment variables: CC C compiler command @@ -14604,6 +14609,31 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 $as_echo "done" >&6; } +# ensurepip option +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ensurepip" >&5 +$as_echo_n "checking for ensurepip... " >&6; } + +# Check whether --with-ensurepip was given. +if test "${with_ensurepip+set}" = set; then : + withval=$with_ensurepip; +else + with_ensurepip=no +fi + +case $with_ensurepip in #( + yes|upgrade) : + ENSUREPIP=upgrade ;; #( + install) : + ENSUREPIP=install ;; #( + no) : + ENSUREPIP=no ;; #( + *) : + as_fn_error $? "--with-ensurepip=upgrade|install|no" "$LINENO" 5 ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENSUREPIP" >&5 +$as_echo "$ENSUREPIP" >&6; } + + # generate output files ac_config_files="$ac_config_files Makefile.pre Modules/Setup.config Misc/python.pc" |