Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1988)

Side by Side Diff: configure.ac

Issue 16235: Add python-config.sh for use during cross compilation.
Patch Set: Created 6 years, 9 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « configure ('k') | Makefile.pre.in » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 dnl *********************************************** 1 dnl ***********************************************
2 dnl * Please run autoreconf to test your changes! * 2 dnl * Please run autoreconf to test your changes! *
3 dnl *********************************************** 3 dnl ***********************************************
4 4
5 # Set VERSION so we only need to edit in one place (i.e., here) 5 # Set VERSION so we only need to edit in one place (i.e., here)
6 m4_define(PYTHON_VERSION, 3.3) 6 m4_define(PYTHON_VERSION, 3.3)
7 7
8 AC_PREREQ(2.65) 8 AC_PREREQ(2.65)
9 9
10 AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/) 10 AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/)
(...skipping 899 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 then 910 then
911 LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' 911 LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
912 RUNSHARED=DYLD_FRAMEWORK_PATH="`pwd`:$DYLD_FRAMEWORK_PATH" 912 RUNSHARED=DYLD_FRAMEWORK_PATH="`pwd`:$DYLD_FRAMEWORK_PATH"
913 BLDLIBRARY='' 913 BLDLIBRARY=''
914 else 914 else
915 BLDLIBRARY='$(LDLIBRARY)' 915 BLDLIBRARY='$(LDLIBRARY)'
916 fi 916 fi
917 917
918 # Other platforms follow 918 # Other platforms follow
919 if test $enable_shared = "yes"; then 919 if test $enable_shared = "yes"; then
920 PY_ENABLE_SHARED=1
920 AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library .]) 921 AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library .])
921 case $ac_sys_system in 922 case $ac_sys_system in
922 CYGWIN*) 923 CYGWIN*)
923 LDLIBRARY='libpython$(LDVERSION).dll.a' 924 LDLIBRARY='libpython$(LDVERSION).dll.a'
924 DLLLIBRARY='libpython$(LDVERSION).dll' 925 DLLLIBRARY='libpython$(LDVERSION).dll'
925 ;; 926 ;;
926 SunOS*) 927 SunOS*)
927 LDLIBRARY='libpython$(LDVERSION).so' 928 LDLIBRARY='libpython$(LDVERSION).so'
928 BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(LDVERSION)' 929 BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(LDVERSION)'
929 RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} 930 RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
965 BLDLIBRARY='-L. -lpython$(LDVERSION)' 966 BLDLIBRARY='-L. -lpython$(LDVERSION)'
966 RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}' 967 RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}'
967 ;; 968 ;;
968 AIX*) 969 AIX*)
969 LDLIBRARY='libpython$(LDVERSION).so' 970 LDLIBRARY='libpython$(LDVERSION).so'
970 RUNSHARED=LIBPATH=`pwd`:${LIBPATH} 971 RUNSHARED=LIBPATH=`pwd`:${LIBPATH}
971 ;; 972 ;;
972 973
973 esac 974 esac
974 else # shared is disabled 975 else # shared is disabled
976 PY_ENABLE_SHARED=0
975 case $ac_sys_system in 977 case $ac_sys_system in
976 CYGWIN*) 978 CYGWIN*)
977 BLDLIBRARY='$(LIBRARY)' 979 BLDLIBRARY='$(LIBRARY)'
978 LDLIBRARY='libpython$(LDVERSION).dll.a' 980 LDLIBRARY='libpython$(LDVERSION).dll.a'
979 ;; 981 ;;
980 esac 982 esac
981 fi 983 fi
982 984
983 if test "$cross_compiling" = yes; then 985 if test "$cross_compiling" = yes; then
984 RUNSHARED= 986 RUNSHARED=
(...skipping 2936 matching lines...) Expand 10 before | Expand all | Expand 10 after
3921 AC_SUBST(SOABI) 3923 AC_SUBST(SOABI)
3922 AC_MSG_CHECKING(ABIFLAGS) 3924 AC_MSG_CHECKING(ABIFLAGS)
3923 AC_MSG_RESULT($ABIFLAGS) 3925 AC_MSG_RESULT($ABIFLAGS)
3924 AC_MSG_CHECKING(SOABI) 3926 AC_MSG_CHECKING(SOABI)
3925 SOABI='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS} 3927 SOABI='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS}
3926 AC_MSG_RESULT($SOABI) 3928 AC_MSG_RESULT($SOABI)
3927 3929
3928 AC_MSG_CHECKING(LDVERSION) 3930 AC_MSG_CHECKING(LDVERSION)
3929 LDVERSION='$(VERSION)$(ABIFLAGS)' 3931 LDVERSION='$(VERSION)$(ABIFLAGS)'
3930 AC_MSG_RESULT($LDVERSION) 3932 AC_MSG_RESULT($LDVERSION)
3933
3934 dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
3935 AC_SUBST(PY_ENABLE_SHARED)
3936 LIBPL="${prefix}/lib/python${VERSION}/config-${LDVERSION}"
3937 AC_SUBST(LIBPL)
3931 3938
3932 # SO is the extension of shared libraries `(including the dot!) 3939 # SO is the extension of shared libraries `(including the dot!)
3933 # -- usually .so, .sl on HP-UX, .dll on Cygwin 3940 # -- usually .so, .sl on HP-UX, .dll on Cygwin
3934 AC_MSG_CHECKING(SO) 3941 AC_MSG_CHECKING(SO)
3935 if test -z "$SO" 3942 if test -z "$SO"
3936 then 3943 then
3937 case $ac_sys_system in 3944 case $ac_sys_system in
3938 hp*|HP*) 3945 hp*|HP*)
3939 case `uname -m` in 3946 case `uname -m` in
3940 ia64) SO=.so;; 3947 ia64) SO=.so;;
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
4634 AC_MSG_RESULT($have_ipa_pure_const_bug) 4641 AC_MSG_RESULT($have_ipa_pure_const_bug)
4635 if test "$have_ipa_pure_const_bug" = yes; then 4642 if test "$have_ipa_pure_const_bug" = yes; then
4636 AC_DEFINE(HAVE_IPA_PURE_CONST_BUG, 1, 4643 AC_DEFINE(HAVE_IPA_PURE_CONST_BUG, 1,
4637 [Define if gcc has the ipa-pure-const bug.]) 4644 [Define if gcc has the ipa-pure-const bug.])
4638 fi 4645 fi
4639 ;; 4646 ;;
4640 esac 4647 esac
4641 fi 4648 fi
4642 4649
4643 # generate output files 4650 # generate output files
4644 AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc) 4651 AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-con fig.sh)
4645 AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix]) 4652 AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
4646 AC_OUTPUT 4653 AC_OUTPUT
4647 4654
4648 echo "creating Modules/Setup" 4655 echo "creating Modules/Setup"
4649 if test ! -f Modules/Setup 4656 if test ! -f Modules/Setup
4650 then 4657 then
4651 cp $srcdir/Modules/Setup.dist Modules/Setup 4658 cp $srcdir/Modules/Setup.dist Modules/Setup
4652 fi 4659 fi
4653 4660
4654 echo "creating Modules/Setup.local" 4661 echo "creating Modules/Setup.local"
4655 if test ! -f Modules/Setup.local 4662 if test ! -f Modules/Setup.local
4656 then 4663 then
4657 echo "# Edit this file for local setup changes" >Modules/Setup.local 4664 echo "# Edit this file for local setup changes" >Modules/Setup.local
4658 fi 4665 fi
4659 4666
4660 echo "creating Makefile" 4667 echo "creating Makefile"
4661 $SHELL $srcdir/Modules/makesetup -c $srcdir/Modules/config.c.in \ 4668 $SHELL $srcdir/Modules/makesetup -c $srcdir/Modules/config.c.in \
4662 -s Modules Modules/Setup.config \ 4669 -s Modules Modules/Setup.config \
4663 Modules/Setup.local Modules/Setup 4670 Modules/Setup.local Modules/Setup
4664 mv config.c Modules 4671 mv config.c Modules
OLDNEW
« no previous file with comments | « configure ('k') | Makefile.pre.in » ('j') | no next file with comments »

RSS Feeds Recent Issues | This issue
This is Rietveld 894c83f36cb7+