regen configure

diff --git a/configure b/configure
index fa63d5fd37438f79bace0583a54776c8243a66e7..95c609878ad5ae7b47532271f282654e266424da 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 79401 .
+# From configure.in Revision: 79975 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.2.
 #
@@ -710,6 +710,7 @@ OTHER_LIBTOOL_OPT
 LIBTOOL_CRUFT
 SO
 LDSHARED
+LDCXXSHARED
 BLDSHARED
 CCSHARED
 LINKFORSHARED
@@ -4699,40 +4700,7 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing" >&6; }
                if test "$UNIVERSAL_ARCHS" = "32-bit" ; then
                   UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"
                   ARCH_RUN_32BIT=""
-                  LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
-
-                   # You have to use different flags on various versions of
-                  # OSX to extract PPC code from an universal binary, basically
-                   # '-arch ppc' on OSX 10.4 and '-arch ppc7400' on anything
-                   # newer.
-                   # Because '-arch pp7400' works on OSX 10.5 or higher this
-                   # test is only present in the '32-bit' branch, all other
-                   # branches require OSX 10.5 to compile.
-
-                  { echo "$as_me:$LINENO: checking lipo flag for extracting ppc code" >&5
-echo $ECHO_N "checking lipo flag for extracting ppc code... $ECHO_C" >&6; }
-                  FN="test.$$"
-                  cat >${FN}.c <<-EOF
-                       int main() { return 0; }
-EOF
-                  ${CC} ${CFLAGS} -arch ppc -arch i386 -o ${FN} ${FN}.c -isysroot ${UNIVERSALSDK}
-                  if test $? != 0 ; then
-                          rm ${FN} ${FN}.c
-                          { echo "$as_me:$LINENO: result: failed, assumee -extract ppc7400" >&5
-echo "${ECHO_T}failed, assumee -extract ppc7400" >&6; }
-                  else
-                          lipo "${FN}" -extract ppc7400 -output "${FN}.out" 2>/dev/null
-                          if test $? != 0 ; then
-                              LIPO_32BIT_FLAGS="-extract ppc -extract i386"
-                              { echo "$as_me:$LINENO: result: \"'-extract ppc'\"" >&5
-echo "${ECHO_T}\"'-extract ppc'\"" >&6; }
-                          else
-                              { echo "$as_me:$LINENO: result: \"'-extract ppc7400'\"" >&5
-echo "${ECHO_T}\"'-extract ppc7400'\"" >&6; }
-                          fi
-                          rm -f ${FN} ${FN}.c ${FN}.out
-                  fi
-
+                  LIPO_32BIT_FLAGS=""
                 elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
                   UNIVERSAL_ARCH_FLAGS="-arch ppc64 -arch x86_64"
                   LIPO_32BIT_FLAGS=""
@@ -14663,6 +14631,7 @@ esac
 
 
 
+
 # SO is the extension of shared libraries `(including the dot!)
 # -- usually .so, .sl on HP-UX, .dll on Cygwin
 { echo "$as_me:$LINENO: checking SO" >&5
@@ -14715,36 +14684,47 @@ then
        IRIX/5*) LDSHARED="ld -shared";;
        IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
        SunOS/5*)
-               if test "$GCC" = "yes"
-               then LDSHARED='$(CC) -shared'
-               else LDSHARED='$(CC) -G';
+               if test "$GCC" = "yes" ; then
+                       LDSHARED='$(CC) -shared'
+                       LDCXXSHARED='$(CXX) -shared'
+               else
+                       LDSHARED='$(CC) -G'
+                       LDCXXSHARED='$(CXX) -G'
                fi ;;
        hp*|HP*)
-               if test "$GCC" = "yes"
-               then LDSHARED='$(CC) -shared'
-               else LDSHARED='ld -b';
+               if test "$GCC" = "yes" ; then
+                       LDSHARED='$(CC) -shared'
+                       LDCXXSHARED='$(CXX) -shared'
+               else
+                       LDSHARED='ld -b'
                fi ;;
        OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
        Darwin/1.3*)
                LDSHARED='$(CC) $(LDFLAGS) -bundle'
+               LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
                if test "$enable_framework" ; then
                        # Link against the framework. All externals should be defined.
                        BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                        LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+                       LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                else
                        # No framework. Ignore undefined symbols, assuming they come from Python
                        LDSHARED="$LDSHARED -undefined suppress"
+                       LDCXXSHARED="$LDCXXSHARED -undefined suppress"
                fi ;;
        Darwin/1.4*|Darwin/5.*|Darwin/6.*)
                LDSHARED='$(CC) $(LDFLAGS) -bundle'
+               LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
                if test "$enable_framework" ; then
                        # Link against the framework. All externals should be defined.
                        BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                        LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+                       LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                else
                        # No framework, use the Python app as bundle-loader
                        BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
                        LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
+                       LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
                fi ;;
        Darwin/*)
                # Use -undefined dynamic_lookup whenever possible (10.3 and later).
@@ -14756,26 +14736,35 @@ then
                                LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
                        fi
                        LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
+                       LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle -undefined dynamic_lookup'
                        BLDSHARED="$LDSHARED"
                else
                        LDSHARED='$(CC) $(LDFLAGS) -bundle'
+                       LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
                        if test "$enable_framework" ; then
                                # Link against the framework. All externals should be defined.
                                BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                                LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+                               LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                        else
                                # No framework, use the Python app as bundle-loader
                                BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
                                LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
+                               LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
                        fi
                fi
                ;;
-       Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';;
-       BSD/OS*/4*) LDSHARED="gcc -shared";;
+       Linux*|GNU*|QNX*)
+               LDSHARED='$(CC) -shared'
+               LDCXXSHARED='$(CXX) -shared';;
+       BSD/OS*/4*)
+               LDSHARED="gcc -shared"
+               LDCXXSHARED="g++ -shared";;
        FreeBSD*)
                if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
                then
                        LDSHARED='$(CC) -shared ${LDFLAGS}'
+                       LDCXXSHARED='$(CXX) -shared ${LDFLAGS}'
                else
                        LDSHARED="ld -Bshareable ${LDFLAGS}"
                fi;;
@@ -14783,6 +14772,7 @@ then
                if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
                then
                                LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
+                               LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
                else
                                case `uname -r` in
                                [01].* | 2.[0-7] | 2.[0-7].*)
@@ -14790,22 +14780,33 @@ then
                                   ;;
                                *)
                                   LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
+                                  LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
                                   ;;
                                esac
                fi;;
-       NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
+       NetBSD*|DragonFly*)
+               LDSHARED="cc -shared ${LDFLAGS}"
+               LDCXXSHARED="c++ -shared ${LDFLAGS}";;
        OpenUNIX*|UnixWare*)
-               if test "$GCC" = "yes"
-               then LDSHARED='$(CC) -shared'
-               else LDSHARED='$(CC) -G'
+               if test "$GCC" = "yes" ; then
+                       LDSHARED='$(CC) -shared'
+                       LDCXXSHARED='$(CXX) -shared'
+               else
+                       LDSHARED='$(CC) -G'
+                       LDCXXSHARED='$(CXX) -G'
                fi;;
-       SCO_SV*) LDSHARED='$(CC) -Wl,-G,-Bexport';;
-       CYGWIN*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base";;
+       SCO_SV*)
+               LDSHARED='$(CC) -Wl,-G,-Bexport'
+               LDCXXSHARED='$(CXX) -Wl,-G,-Bexport';;
+       CYGWIN*)
+               LDSHARED="gcc -shared -Wl,--enable-auto-image-base"
+               LDCXXSHARED="g++ -shared -Wl,--enable-auto-image-base";;
        *)      LDSHARED="ld";;
        esac
 fi
 { echo "$as_me:$LINENO: result: $LDSHARED" >&5
 echo "${ECHO_T}$LDSHARED" >&6; }
+LDCXXSHARED=${LDCXXSHARED-$LDSHARED}
 BLDSHARED=${BLDSHARED-$LDSHARED}
 # CCSHARED are the C *flags* used to create objects to go into a shared
 # library (module) -- this is only needed for a few systems
@@ -28088,9 +28089,9 @@ OTHER_LIBTOOL_OPT!$OTHER_LIBTOOL_OPT$ac_delim
 LIBTOOL_CRUFT!$LIBTOOL_CRUFT$ac_delim
 SO!$SO$ac_delim
 LDSHARED!$LDSHARED$ac_delim
+LDCXXSHARED!$LDCXXSHARED$ac_delim
 BLDSHARED!$BLDSHARED$ac_delim
 CCSHARED!$CCSHARED$ac_delim
-LINKFORSHARED!$LINKFORSHARED$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -28132,6 +28133,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+LINKFORSHARED!$LINKFORSHARED$ac_delim
 CFLAGSFORSHARED!$CFLAGSFORSHARED$ac_delim
 SHLIBS!$SHLIBS$ac_delim
 PKG_CONFIG!$PKG_CONFIG$ac_delim
@@ -28158,7 +28160,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` = 24; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 25; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5