summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-09-10 19:55:19 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-09-10 19:55:19 (GMT)
commit80f45a09985d8396209045db236eabb0f8f3bce4 (patch)
treecda1005d65a9038253e98a920c043451471c012c /configure
parent84c809be5ac34a7a7bf89285e42c9fb6b5f05065 (diff)
downloadcpython-80f45a09985d8396209045db236eabb0f8f3bce4.zip
cpython-80f45a09985d8396209045db236eabb0f8f3bce4.tar.gz
cpython-80f45a09985d8396209045db236eabb0f8f3bce4.tar.bz2
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é. ........
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure16
1 files changed, 14 insertions, 2 deletions
diff --git a/configure b/configure
index 7e6654d..7313145 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 84586 .
+# From configure.in Revision: 84675 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for python 3.1.
#
@@ -4870,6 +4870,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
@@ -7472,7 +7476,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"
;;
IRIX/5*) LDSHARED="ld -shared";;
@@ -13380,6 +13384,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
@@ -14072,6 +14078,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
@@ -14611,6 +14618,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