summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-05-31 00:20:59 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-05-31 00:20:59 (GMT)
commitfc8dca27d330f0c7c47713d2557f190c517c170e (patch)
treec77f67c6f881308e12ad6714b94d98e3d5eb143a
parentec2c46b94e483059859f9d082623ef369dae35d7 (diff)
downloadcpython-fc8dca27d330f0c7c47713d2557f190c517c170e.zip
cpython-fc8dca27d330f0c7c47713d2557f190c517c170e.tar.gz
cpython-fc8dca27d330f0c7c47713d2557f190c517c170e.tar.bz2
remove plat-mac references
-rw-r--r--Makefile.pre.in10
-rwxr-xr-xconfigure33
-rw-r--r--configure.in19
3 files changed, 4 insertions, 58 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 63bac44..c1d8d06 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -803,16 +803,6 @@ EXTRAPLATDIR= @EXTRAPLATDIR@
EXTRAMACHDEPPATH=@EXTRAMACHDEPPATH@
MACHDEPS= $(PLATDIR) $(EXTRAPLATDIR)
XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax
-PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
- plat-mac/lib-scriptpackages/_builtinSuites \
- plat-mac/lib-scriptpackages/CodeWarrior \
- plat-mac/lib-scriptpackages/Explorer \
- plat-mac/lib-scriptpackages/Finder \
- plat-mac/lib-scriptpackages/Netscape \
- plat-mac/lib-scriptpackages/StdSuites \
- plat-mac/lib-scriptpackages/SystemEvents \
- plat-mac/lib-scriptpackages/Terminal
-PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
LIBSUBDIRS= tkinter site-packages test test/output test/data \
test/decimaltestdata \
encodings \
diff --git a/configure b/configure
index 11343d2..abe60a7 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 63205 .
+# From configure.in Revision: 63697 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.0.
#
@@ -669,8 +669,6 @@ FRAMEWORKALTINSTALLLAST
FRAMEWORKUNIXTOOLSPREFIX
MACHDEP
SGI_ABI
-EXTRAPLATDIR
-EXTRAMACHDEPPATH
CONFIGURE_MACOSX_DEPLOYMENT_TARGET
EXPORT_MACOSX_DEPLOYMENT_TARGET
CC
@@ -2146,27 +2144,6 @@ fi
{ echo "$as_me:$LINENO: result: $MACHDEP" >&5
echo "${ECHO_T}$MACHDEP" >&6; }
-# And add extra plat-mac for darwin
-
-
-{ echo "$as_me:$LINENO: checking EXTRAPLATDIR" >&5
-echo $ECHO_N "checking EXTRAPLATDIR... $ECHO_C" >&6; }
-if test -z "$EXTRAPLATDIR"
-then
- case $MACHDEP in
- darwin)
- EXTRAPLATDIR="\$(PLATMACDIRS)"
- EXTRAMACHDEPPATH="\$(PLATMACPATH)"
- ;;
- *)
- EXTRAPLATDIR=""
- EXTRAMACHDEPPATH=""
- ;;
- esac
-fi
-{ echo "$as_me:$LINENO: result: $EXTRAPLATDIR" >&5
-echo "${ECHO_T}$EXTRAPLATDIR" >&6; }
-
# Record the configure-time value of MACOSX_DEPLOYMENT_TARGET,
# it may influence the way we can build extensions, so distutils
# needs to check it
@@ -24878,8 +24855,6 @@ FRAMEWORKALTINSTALLLAST!$FRAMEWORKALTINSTALLLAST$ac_delim
FRAMEWORKUNIXTOOLSPREFIX!$FRAMEWORKUNIXTOOLSPREFIX$ac_delim
MACHDEP!$MACHDEP$ac_delim
SGI_ABI!$SGI_ABI$ac_delim
-EXTRAPLATDIR!$EXTRAPLATDIR$ac_delim
-EXTRAMACHDEPPATH!$EXTRAMACHDEPPATH$ac_delim
CONFIGURE_MACOSX_DEPLOYMENT_TARGET!$CONFIGURE_MACOSX_DEPLOYMENT_TARGET$ac_delim
EXPORT_MACOSX_DEPLOYMENT_TARGET!$EXPORT_MACOSX_DEPLOYMENT_TARGET$ac_delim
CC!$CC$ac_delim
@@ -24922,6 +24897,8 @@ LINKFORSHARED!$LINKFORSHARED$ac_delim
CFLAGSFORSHARED!$CFLAGSFORSHARED$ac_delim
SHLIBS!$SHLIBS$ac_delim
USE_SIGNAL_MODULE!$USE_SIGNAL_MODULE$ac_delim
+SIGNAL_OBJS!$SIGNAL_OBJS$ac_delim
+USE_THREAD_MODULE!$USE_THREAD_MODULE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -24963,8 +24940,6 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-SIGNAL_OBJS!$SIGNAL_OBJS$ac_delim
-USE_THREAD_MODULE!$USE_THREAD_MODULE$ac_delim
LDLAST!$LDLAST$ac_delim
THREADOBJ!$THREADOBJ$ac_delim
DLINCLDIR!$DLINCLDIR$ac_delim
@@ -24984,7 +24959,7 @@ SRCDIRS!$SRCDIRS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.in b/configure.in
index 9c7a4b2..fd6f68d 100644
--- a/configure.in
+++ b/configure.in
@@ -322,25 +322,6 @@ then
fi
AC_MSG_RESULT($MACHDEP)
-# And add extra plat-mac for darwin
-AC_SUBST(EXTRAPLATDIR)
-AC_SUBST(EXTRAMACHDEPPATH)
-AC_MSG_CHECKING(EXTRAPLATDIR)
-if test -z "$EXTRAPLATDIR"
-then
- case $MACHDEP in
- darwin)
- EXTRAPLATDIR="\$(PLATMACDIRS)"
- EXTRAMACHDEPPATH="\$(PLATMACPATH)"
- ;;
- *)
- EXTRAPLATDIR=""
- EXTRAMACHDEPPATH=""
- ;;
- esac
-fi
-AC_MSG_RESULT($EXTRAPLATDIR)
-
# Record the configure-time value of MACOSX_DEPLOYMENT_TARGET,
# it may influence the way we can build extensions, so distutils
# needs to check it