remove plat-mac references

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 63bac44a0ccc8f0eb857fa4c047c8d4bedb65c92..c1d8d06d66b30c9fce30c98ab4b7c8061324848e 100644 (file)
--- 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 11343d2b318749b8bc8962fc563dd95e357718e5..abe60a77c5a039aec49a08535e7ee580f10a3e08 100755 (executable)
--- 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 9c7a4b27a1eb8ca21b5555707306200ef4a76573..fd6f68d1d18d92c633bf83713c13f4e097366a4f 100644 (file)
--- 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