sb120: #i106059# handle case correctly when no explicit --with[out]-system-python is given

(transplanted from e66f992d250510fdd587b64aee80352a667d52f6)

2 files changed, 13 insertions, 13 deletions

diff --git a/configure b/configure
index 7524601a7ab5..6b86fbabe62b 100755
--- a/configure
+++ b/configure
@@ -7060,7 +7060,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 
@@ -7081,7 +7081,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 
@@ -8936,7 +8936,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 ;;
 esac
-rm -f -r conftest*
+rm -f conftest*
   if test $ac_cv_sys_file_offset_bits = unknown; then
     { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
@@ -9057,7 +9057,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 ;;
 esac
-rm -f -r conftest*
+rm -f conftest*
   fi
 fi
 
@@ -11082,7 +11082,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   stlvisok=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
       { echo "$as_me:$LINENO: result: $stlvisok" >&5
 echo "${ECHO_T}$stlvisok" >&6; }
@@ -14965,8 +14965,8 @@ if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then
 echo "${ECHO_T}compiling against MacOSX10.4u.sdk (python version 2.3)" >&6; }
    PYTHON_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3"
    PYTHON_LIBS="-framework Python"
-elif test -n "$with_system_python" -o -n "$with_system_libs" && \
-	test "$with_system_python" != "no"; then
+elif test "$with_system_python" != "no" -o -n "$with_system_libs"; then
+   with_system_python=yes
    { echo "$as_me:$LINENO: result: external" >&5
 echo "${ECHO_T}external" >&6; }
 
@@ -15161,7 +15161,7 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; }
    PYTHON_CFLAGS="-I$python_include"
    PYTHON_LIBS="-lpython$python_version"
 fi
-if test "$with_system_python" != "no" ; then
+if test "$with_system_python" = "yes" ; then
    SYSTEM_PYTHON=YES
       save_CPPFLAGS="$CPPFLAGS"
    CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
@@ -19974,7 +19974,7 @@ _ACEOF
       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
     done
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl dylib la dll; do
+    for ac_extension in a so sl; do
       if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
 	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
 	ac_im_usrlibdir=$ac_im_libdir; break
@@ -20127,7 +20127,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl dylib la dll; do
+  for ac_extension in a so sl; do
     if test -r "$ac_dir/libX11.$ac_extension"; then
       ac_x_libraries=$ac_dir
       break 2
diff --git a/configure.in b/configure.in
index 73c64175c2fc..5c2ba1cbf3c5 100644
--- a/configure.in
+++ b/configure.in
@@ -3728,8 +3728,8 @@ if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then
    AC_MSG_RESULT([compiling against MacOSX10.4u.sdk (python version 2.3)])
    PYTHON_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3"
    PYTHON_LIBS="-framework Python"
-elif test -n "$with_system_python" -o -n "$with_system_libs" && \
-	test "$with_system_python" != "no"; then
+elif test "$with_system_python" != "no" -o -n "$with_system_libs"; then
+   with_system_python=yes
    AC_MSG_RESULT([external])
    AM_PATH_PYTHON([2.2])
 
@@ -3738,7 +3738,7 @@ elif test -n "$with_system_python" -o -n "$with_system_libs" && \
    PYTHON_CFLAGS="-I$python_include"
    PYTHON_LIBS="-lpython$python_version"
 fi
-if test "$with_system_python" != "no" ; then
+if test "$with_system_python" = "yes" ; then
    SYSTEM_PYTHON=YES
    dnl check if the headers really work:
    save_CPPFLAGS="$CPPFLAGS"