Merged revisions 77587 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77587 | ronald.oussoren | 2010-01-17 20:27:57 +0100 (Sun, 17 Jan 2010) | 8 lines

  This patch ensures that the configure-script mentions checking for --enable-universalsdk
  and that it doesn't default to the 10.4u SDK when that SDK does not exist.

  (This affects OSX)

  This patch should fix most of issue 4834, although I haven't gotten enough
  information from the user to be sure.
........

diff --git a/configure b/configure
index ba7ca60c8e891a82d7bc4333b3d07ae02d08e04d..b92c79d532835c686451c80b6a473cd6c5429343 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 77864 .
+# From configure.in Revision: 78065 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 2.6.
 #
@@ -1871,12 +1871,18 @@ define_xopen_source=yes
 
 CONFIG_ARGS="$ac_configure_args"
 
+{ echo "$as_me:$LINENO: checking for --enable-universalsdk" >&5
+echo $ECHO_N "checking for --enable-universalsdk... $ECHO_C" >&6; }
 # Check whether --enable-universalsdk was given.
 if test "${enable_universalsdk+set}" = set; then
   enableval=$enable_universalsdk;
        case $enableval in
        yes)
                enableval=/Developer/SDKs/MacOSX10.4u.sdk
+               if test ! -d "${enableval}"
+               then
+                       enableval=/
+               fi
                ;;
        esac
        case $enableval in
@@ -1886,9 +1892,16 @@ if test "${enable_universalsdk+set}" = set; then
                ;;
        *)
                UNIVERSALSDK=$enableval
+               if test ! -d "${UNIVERSALSDK}"
+               then
+                       { { echo "$as_me:$LINENO: error: --enable-universalsdk specifies non-existing SDK: ${UNIVERSALSDK}" >&5
+echo "$as_me: error: --enable-universalsdk specifies non-existing SDK: ${UNIVERSALSDK}" >&2;}
+   { (exit 1); exit 1; }; }
+               fi
                ;;
        esac
 
+
 else
 
        UNIVERSALSDK=
@@ -1896,6 +1909,14 @@ else
 
 fi
 
+if test -n "${UNIVERSALSDK}"
+then
+       { echo "$as_me:$LINENO: result: ${UNIVERSALSDK}" >&5
+echo "${ECHO_T}${UNIVERSALSDK}" >&6; }
+else
+       { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
 
 
 

diff --git a/configure.in b/configure.in
index a130ec4392a1f4923951c33e3ff579d0b2f8e574..01d1b6fa76af4fcb3d3be9bc2fb5a6a55be530c3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -69,12 +69,17 @@ define_xopen_source=yes
 AC_SUBST(CONFIG_ARGS)
 CONFIG_ARGS="$ac_configure_args"
 
+AC_MSG_CHECKING([for --enable-universalsdk])
 AC_ARG_ENABLE(universalsdk,
        AC_HELP_STRING(--enable-universalsdk@<:@=SDKDIR@:>@, Build against Mac OS X 10.4u SDK (ppc/i386)),
 [
        case $enableval in
        yes)
                enableval=/Developer/SDKs/MacOSX10.4u.sdk
+               if test ! -d "${enableval}"
+               then
+                       enableval=/
+               fi
                ;;
        esac
        case $enableval in
@@ -84,12 +89,23 @@ AC_ARG_ENABLE(universalsdk,
                ;;
        *)
                UNIVERSALSDK=$enableval
+               if test ! -d "${UNIVERSALSDK}"
+               then
+                       AC_MSG_ERROR([--enable-universalsdk specifies non-existing SDK: ${UNIVERSALSDK}])
+               fi
                ;;
        esac
+       
 ],[
        UNIVERSALSDK=
        enable_universalsdk=
 ])
+if test -n "${UNIVERSALSDK}"
+then
+       AC_MSG_RESULT(${UNIVERSALSDK})
+else
+       AC_MSG_RESULT(no)
+fi
 AC_SUBST(UNIVERSALSDK)
 
 AC_SUBST(ARCH_RUN_32BIT)