--- Python-2.2/configure.in.org	Fri Dec  7 15:38:26 2001
+++ Python-2.2/configure.in	Mon Feb 17 16:19:26 2003
@@ -284,20 +284,28 @@
               if $CC -o conftest$ac_exeext conftest.$ac_objext 2>&5 \
                  && test -s conftest$ac_exeext && ./conftest$ac_exeext
               then
-                 LINKCC="\$(PURIFY) \$(CC)"
+                 case $ac_sys_system in
+                 AIX*)
+                    LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp \"\" \$(LIBRARY); \$(CC)";;
+                 dgux*)
+                    LINKCC="LD_RUN_PATH=$libdir \$(CC)";;
+                 Monterey64*)
+                    LINKCC="\$(CC) -L/usr/lib/ia64l64";;
+                 *) LINKCC="\$(PURIFY) \$(CC)";;
+                esac
               else
-                 LINKCC="\$(PURIFY) \$(CXX)"
+                 case $ac_sys_system in
+                 AIX*)
+                    LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp \"\" \$(LIBRARY); \$(CXX)";;
+                 dgux*)
+                    LINKCC="LD_RUN_PATH=$libdir \$(CXX)";;
+                 Monterey64*)
+                    LINKCC="\$(CXX) -L/usr/lib/ia64l64";;
+                 *) LINKCC="\$(PURIFY) \$(CXX)";;
+                esac
               fi
               rm -fr conftest*
         fi
-	case $ac_sys_system in
-	AIX*)
-	   LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp \"\" \$(LIBRARY); $(LINKCC)";;
-	dgux*)
-	   LINKCC="LD_RUN_PATH=$libdir $(LINKCC)";;
-	Monterey64*)
-	   LINKCC="$(LINKCC) -L/usr/lib/ia64l64";;
-	esac
 fi
 AC_MSG_RESULT($LINKCC)
 
@@ -761,11 +769,11 @@
 	case $ac_sys_system/$ac_sys_release in
 	AIX*)
 		BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:Modules/python.exp"
-		LDSHARED="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp"
+		LDSHARED="\$(BINLIBDEST)/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/python.exp"
 		;;
 	BeOS*)
 		BLDSHARED="\$(srcdir)/Modules/ld_so_beos $LDLIBRARY"
-		LDSHARED="\$(BINLIBDEST)/config/ld_so_beos \$(LIBDIR)/$LDLIBRARY"
+		LDSHARED="\$(BINLIBDEST)/ld_so_beos \$(LIBDIR)/$LDLIBRARY"
 		;;
 	IRIX/5*) LDSHARED="ld -shared";;
 	IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
@@ -917,7 +925,7 @@
 # checks for system dependent C++ extensions support
 case "$ac_sys_system" in
 	AIX*)	AC_MSG_CHECKING(for genuine AIX C++ extensions support)
-		AC_TRY_LINK([#include "/usr/lpp/xlC/include/load.h"],
+		AC_TRY_LINK([#include "/usr/vacpp/include/load.h"],
 			    [loadAndInit("", 0, "")],
 			    [AC_DEFINE(AIX_GENUINE_CPLUSPLUS)
 			     AC_MSG_RESULT(yes)],
--- Python-2.2/configure.org	Fri Dec  7 15:38:25 2001
+++ Python-2.2/configure	Mon Feb 17 19:55:26 2003
@@ -1420,20 +1420,28 @@
               if $CC -o conftest$ac_exeext conftest.$ac_objext 2>&5 \
                  && test -s conftest$ac_exeext && ./conftest$ac_exeext
               then
-                 LINKCC="\$(PURIFY) \$(CC)"
+		 case $ac_sys_system in
+	 	 AIX*)
+		    LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp \"\" \$(LIBRARY); \$(CC)";;
+	 	 dgux*)
+		    LINKCC="LD_RUN_PATH=$libdir \$(CC)";;
+	 	 Monterey64*)
+		    LINKCC="\$(CC) -L/usr/lib/ia64l64";;
+		 *) LINKCC="\$(PURIFY) \$(CC)";;
+	 	esac
               else
-                 LINKCC="\$(PURIFY) \$(CXX)"
+		 case $ac_sys_system in
+		 AIX*)
+	   	   LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp \"\" \$(LIBRARY); \$(CXX)";;
+		 dgux*)
+	   	   LINKCC="LD_RUN_PATH=$libdir \$(CXX)";;
+		 Monterey64*)
+	   	   LINKCC="\$(CXX) -L/usr/lib/ia64l64";;
+		 *) LINKCC="\$(PURIFY) \$(CXX)";;
+		 esac
               fi
               rm -fr conftest*
         fi
-	case $ac_sys_system in
-	AIX*)
-	   LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp \"\" \$(LIBRARY); $(LINKCC)";;
-	dgux*)
-	   LINKCC="LD_RUN_PATH=$libdir $(LINKCC)";;
-	Monterey64*)
-	   LINKCC="$(LINKCC) -L/usr/lib/ia64l64";;
-	esac
 fi
 echo "$ac_t""$LINKCC" 1>&6
 
@@ -3147,11 +3155,11 @@
 	case $ac_sys_system/$ac_sys_release in
 	AIX*)
 		BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:Modules/python.exp"
-		LDSHARED="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp"
+		LDSHARED="\$(BINLIBDEST)/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/python.exp"
 		;;
 	BeOS*)
 		BLDSHARED="\$(srcdir)/Modules/ld_so_beos $LDLIBRARY"
-		LDSHARED="\$(BINLIBDEST)/config/ld_so_beos \$(LIBDIR)/$LDLIBRARY"
+		LDSHARED="\$(BINLIBDEST)/ld_so_beos \$(LIBDIR)/$LDLIBRARY"
 		;;
 	IRIX/5*) LDSHARED="ld -shared";;
 	IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
@@ -3388,7 +3396,7 @@
 #define $ac_tr_lib 1
 EOF
 
-  LIBS="-ldld $LIBS"
+  LIBS="-ldld -lC $LIBS"
 
 else
   echo "$ac_t""no" 1>&6
@@ -3402,7 +3410,7 @@
 		cat > conftest.$ac_ext <<EOF
 #line 3404 "configure"
 #include "confdefs.h"
-#include "/usr/lpp/xlC/include/load.h"
+#include "/usr/vacpp/include/load.h"
 int main() {
 loadAndInit("", 0, "")
 ; return 0; }