Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 14ae959

Browse files
benjaminpbenjaminp
committed
update configure
1 parent fcaf910 commit 14ae959

1 file changed

Lines changed: 85 additions & 11 deletions

File tree

‎configure‎

Lines changed: 85 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# From configure.in Revision: 64085 .
2+
# From configure.in Revision: 64990 .
33
# Guess values for system-dependent variables and create Makefiles.
44
# Generated by GNU Autoconf 2.61 for python 3.0.
55
#
@@ -701,6 +701,7 @@ INSTALL_DATA
701701
LN
702702
OPT
703703
BASECFLAGS
704+
UNIVERSAL_ARCH_FLAGS
704705
OTHER_LIBTOOL_OPT
705706
LIBTOOL_CRUFT
706707
SO
@@ -1322,6 +1323,9 @@ Optional Features:
13221323
Optional Packages:
13231324
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
13241325
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
1326+
--with-universal-archs=ARCH
1327+
select architectures for universal build ("32-bit",
1328+
"64-bit" or "all")
13251329
--with-framework-name=FRAMEWORK
13261330
specify an alternate name of the framework built
13271331
with --enable-framework
@@ -1845,6 +1849,16 @@ cat >>confdefs.h <<\_ACEOF
18451849
_ACEOF
18461850

18471851

1852+
# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
1853+
# certain features on Mac OS X, so we need _DARWIN_C_SOURCE to re-enable
1854+
# them.
1855+
1856+
cat >>confdefs.h <<\_ACEOF
1857+
#define _DARWIN_C_SOURCE 1
1858+
_ACEOF
1859+
1860+
1861+
18481862
define_xopen_source=yes
18491863

18501864
# Arguments passed to configure.
@@ -1878,6 +1892,27 @@ fi
18781892

18791893

18801894

1895+
UNIVERSAL_ARCHS="32-bit"
1896+
{ echo "$as_me:$LINENO: checking for --with-universal-archs" >&5
1897+
echo $ECHO_N "checking for --with-universal-archs... $ECHO_C" >&6; }
1898+
1899+
# Check whether --with-universal-archs was given.
1900+
if test "${with_universal_archs+set}" = set; then
1901+
withval=$with_universal_archs;
1902+
{ echo "$as_me:$LINENO: result: $withval" >&5
1903+
echo "${ECHO_T}$withval" >&6; }
1904+
UNIVERSAL_ARCHS="$withval"
1905+
1906+
else
1907+
1908+
{ echo "$as_me:$LINENO: result: 32-bit" >&5
1909+
echo "${ECHO_T}32-bit" >&6; }
1910+
1911+
fi
1912+
1913+
1914+
1915+
18811916

18821917
# Check whether --with-framework-name was given.
18831918
if test "${with_framework_name+set}" = set; then
@@ -1922,9 +1957,14 @@ if test "${enable_framework+set}" = set; then
19221957
PYTHONFRAMEWORKPREFIX=$enableval
19231958
PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR
19241959
FRAMEWORKINSTALLFIRST="frameworkinstallstructure"
1925-
FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools"
1926-
FRAMEWORKALTINSTALLFIRST="${FRAMEWORKINSTALLFIRST} bininstall maninstall"
1927-
FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkaltinstallunixtools"
1960+
FRAMEWORKALTINSTALLFIRST="frameworkinstallstructure bininstall maninstall"
1961+
if test "$UNIVERSAL_ARCHS" = "all"
1962+
then
1963+
FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkinstallunixtools4way"
1964+
else
1965+
FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkaltinstallunixtools"
1966+
fi
1967+
19281968
if test "x${prefix}" = "xNONE" ; then
19291969
FRAMEWORKUNIXTOOLSPREFIX="${ac_default_prefix}"
19301970
else
@@ -1961,6 +2001,12 @@ else
19612001
fi
19622002
enable_framework=
19632003

2004+
if test "$UNIVERSAL_ARCHS" = "all"
2005+
then
2006+
FRAMEWORKINSTALLLAST=update4wayuniversal
2007+
FRAMEWORKALTINSTALLLAST=update4wayuniversal
2008+
fi
2009+
19642010
fi
19652011

19662012

@@ -4454,6 +4500,11 @@ then
44544500
fi
44554501

44564502

4503+
4504+
# The -arch flags for universal builds on OSX
4505+
UNIVERSAL_ARCH_FLAGS=
4506+
4507+
44574508
# tweak BASECFLAGS based on compiler and platform
44584509
case $GCC in
44594510
yes)
@@ -4534,7 +4585,25 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing_ok" >&6; }
45344585
# -Wno-long-double, -no-cpp-precomp, and -mno-fused-madd
45354586
# used to be here, but non-Apple gcc doesn't accept them.
45364587
if test "${enable_universalsdk}"; then
4537-
BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
4588+
UNIVERSAL_ARCH_FLAGS=""
4589+
if test "$UNIVERSAL_ARCHS" = "32-bit" ; then
4590+
UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"
4591+
4592+
elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
4593+
UNIVERSAL_ARCH_FLAGS="-arch ppc64 -arch x86_64"
4594+
4595+
elif test "$UNIVERSAL_ARCHS" = "all" ; then
4596+
UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
4597+
4598+
else
4599+
{ { echo "$as_me:$LINENO: error: proper usage is --with-universalarch=32-bit|64-bit|all" >&5
4600+
echo "$as_me: error: proper usage is --with-universalarch=32-bit|64-bit|all" >&2;}
4601+
{ (exit 1); exit 1; }; }
4602+
4603+
fi
4604+
4605+
4606+
BASECFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
45384607
fi
45394608

45404609
;;
@@ -12869,6 +12938,12 @@ then
1286912938
if test ${cur_target} '>' 10.2; then
1287012939
cur_target=10.3
1287112940
fi
12941+
if test "${UNIVERSAL_ARCHS}" = "all"; then
12942+
# Ensure that the default platform for a 4-way
12943+
# universal build is OSX 10.5, that's the first
12944+
# OS release where 4-way builds make sense.
12945+
cur_target='10.5'
12946+
fi
1287212947
CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
1287312948

1287412949
# Make sure that MACOSX_DEPLOYMENT_TARGET is set in the
@@ -12879,10 +12954,10 @@ then
1287912954
export MACOSX_DEPLOYMENT_TARGET
1288012955

1288112956
EXPORT_MACOSX_DEPLOYMENT_TARGET=''
12882-
if test ${MACOSX_DEPLOYMENT_TARGET-${cur_target}} '>' 10.2
12957+
if test ${MACOSX_DEPLOYMENT_TARGET} '>' 10.2
1288312958
then
1288412959
if test "${enable_universalsdk}"; then
12885-
LDFLAGS="-arch i386 -arch ppc -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
12960+
LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
1288612961
fi
1288712962
LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
1288812963
BLDSHARED="$LDSHARED"
@@ -22345,8 +22420,6 @@ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
2234522420
esac
2234622421

2234722422

22348-
22349-
2235022423
# Check whether right shifting a negative integer extends the sign bit
2235122424
# or fills with zeros (like the Cray J90, according to Tim Peters).
2235222425
{ echo "$as_me:$LINENO: checking whether right shift extends the sign bit" >&5
@@ -24901,6 +24974,7 @@ INSTALL_DATA!$INSTALL_DATA$ac_delim
2490124974
LN!$LN$ac_delim
2490224975
OPT!$OPT$ac_delim
2490324976
BASECFLAGS!$BASECFLAGS$ac_delim
24977+
UNIVERSAL_ARCH_FLAGS!$UNIVERSAL_ARCH_FLAGS$ac_delim
2490424978
OTHER_LIBTOOL_OPT!$OTHER_LIBTOOL_OPT$ac_delim
2490524979
LIBTOOL_CRUFT!$LIBTOOL_CRUFT$ac_delim
2490624980
SO!$SO$ac_delim
@@ -24912,7 +24986,6 @@ CFLAGSFORSHARED!$CFLAGSFORSHARED$ac_delim
2491224986
SHLIBS!$SHLIBS$ac_delim
2491324987
USE_SIGNAL_MODULE!$USE_SIGNAL_MODULE$ac_delim
2491424988
SIGNAL_OBJS!$SIGNAL_OBJS$ac_delim
24915-
USE_THREAD_MODULE!$USE_THREAD_MODULE$ac_delim
2491624989
_ACEOF
2491724990

2491824991
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -24954,6 +25027,7 @@ _ACEOF
2495425027
ac_delim='%!_!# '
2495525028
for ac_last_try in false false false false false :; do
2495625029
cat >conf$$subs.sed <<_ACEOF
25030+
USE_THREAD_MODULE!$USE_THREAD_MODULE$ac_delim
2495725031
LDLAST!$LDLAST$ac_delim
2495825032
THREADOBJ!$THREADOBJ$ac_delim
2495925033
DLINCLDIR!$DLINCLDIR$ac_delim
@@ -24973,7 +25047,7 @@ SRCDIRS!$SRCDIRS$ac_delim
2497325047
LTLIBOBJS!$LTLIBOBJS$ac_delim
2497425048
_ACEOF
2497525049

24976-
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
25050+
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
2497725051
break
2497825052
elif $ac_last_try; then
2497925053
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

0 commit comments

Comments
 (0)