Merged revisions 84680 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84680 | antoine.pitrou | 2010-09-10 21:44:44 +0200 (ven., 10 sept. 2010) | 4 lines

  Issue #941346: Improve the build process under AIX and allow Python to
  be built as a shared library.  Patch by Sébastien Sablé.
........
This commit is contained in:
Antoine Pitrou 2010-09-10 20:03:17 +00:00
parent b170f17bac
commit aabdceba51
6 changed files with 40 additions and 14 deletions

16
configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Revision: 84585 .
# From configure.in Revision: 84676 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for python 2.7.
#
@ -4950,6 +4950,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>confdefs.h
BLDLIBRARY='-L. -lpython$(VERSION)'
RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}'
;;
AIX*)
LDLIBRARY='libpython$(VERSION).so'
RUNSHARED=LIBPATH=`pwd`:${LIBPATH}
;;
esac
else # shared is disabled
@ -7531,7 +7535,7 @@ if test -z "$LDSHARED"
then
case $ac_sys_system/$ac_sys_release in
AIX*)
BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:Modules/python.exp"
BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:Modules/python.exp -L\$(srcdir)"
LDSHARED="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp"
;;
BeOS*)
@ -13753,6 +13757,8 @@ $as_echo "done" >&6; }
# generate output files
ac_config_files="$ac_config_files Makefile.pre Modules/Setup.config Misc/python.pc"
ac_config_files="$ac_config_files Modules/ld_so_aix"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@ -14446,6 +14452,7 @@ do
"Makefile.pre") CONFIG_FILES="$CONFIG_FILES Makefile.pre" ;;
"Modules/Setup.config") CONFIG_FILES="$CONFIG_FILES Modules/Setup.config" ;;
"Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
"Modules/ld_so_aix") CONFIG_FILES="$CONFIG_FILES Modules/ld_so_aix" ;;
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
@ -14985,6 +14992,11 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;}
esac
case $ac_file$ac_mode in
"Modules/ld_so_aix":F) chmod +x Modules/ld_so_aix ;;
esac
done # for ac_tag