summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authordoko@ubuntu.com <doko@ubuntu.com>2014-05-07 11:08:51 (GMT)
committerdoko@ubuntu.com <doko@ubuntu.com>2014-05-07 11:08:51 (GMT)
commit4ce74dc54cbb4baea01e028260bc2e0cd86f67e5 (patch)
tree84dac7f86323a94700bbcfb31d6e640b59020fb3 /configure.ac
parent591550579699ef14ea4baf56bf3319eedbcd4f44 (diff)
parente5de66eaa75c77ac1628f2408fc1238ec643288d (diff)
downloadcpython-4ce74dc54cbb4baea01e028260bc2e0cd86f67e5.zip
cpython-4ce74dc54cbb4baea01e028260bc2e0cd86f67e5.tar.gz
cpython-4ce74dc54cbb4baea01e028260bc2e0cd86f67e5.tar.bz2
- Issue #17752: Fix distutils tests when run from the installed location.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac12
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index b470ce4..b2f519f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -928,7 +928,7 @@ AC_MSG_CHECKING(LDLIBRARY)
if test "$enable_framework"
then
LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
- RUNSHARED=DYLD_FRAMEWORK_PATH="`pwd`:$DYLD_FRAMEWORK_PATH"
+ RUNSHARED=DYLD_FRAMEWORK_PATH=`pwd`${DYLD_FRAMEWORK_PATH:+:${DYLD_FRAMEWORK_PATH}}
BLDLIBRARY=''
else
BLDLIBRARY='$(LDLIBRARY)'
@@ -946,7 +946,7 @@ if test $enable_shared = "yes"; then
SunOS*)
LDLIBRARY='libpython$(LDVERSION).so'
BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(LDVERSION)'
- RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+ RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
INSTSONAME="$LDLIBRARY".$SOVERSION
if test "$with_pydebug" != yes
then
@@ -956,7 +956,7 @@ if test $enable_shared = "yes"; then
Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
LDLIBRARY='libpython$(LDVERSION).so'
BLDLIBRARY='-L. -lpython$(LDVERSION)'
- RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+ RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
case $ac_sys_system in
FreeBSD*)
SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
@@ -978,16 +978,16 @@ if test $enable_shared = "yes"; then
;;
esac
BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(LDVERSION)'
- RUNSHARED=SHLIB_PATH=`pwd`:${SHLIB_PATH}
+ RUNSHARED=SHLIB_PATH=`pwd`${SHLIB_PATH:+:${SHLIB_PATH}}
;;
Darwin*)
LDLIBRARY='libpython$(LDVERSION).dylib'
BLDLIBRARY='-L. -lpython$(LDVERSION)'
- RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}'
+ RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
;;
AIX*)
LDLIBRARY='libpython$(LDVERSION).so'
- RUNSHARED=LIBPATH=`pwd`:${LIBPATH}
+ RUNSHARED=LIBPATH=`pwd`${LIBPATH:+:${LIBPATH}}
;;
esac