Don't try and auto guess whether should link with framework or library when

Python framework present on MacOS X as which one works properly seems to be
unreliable. Always use framework if present and if people have issues because
of broken MacPorts Python installations, they can specify --disable-framework
option to 'configure' script instead.

2 files changed, 42 insertions, 56 deletions

diff --git a/configure b/configure
index 8a85103..9350014 100755
--- a/configure
+++ b/configure
@@ -1195,6 +1195,7 @@ if test -n "$ac_init_help"; then
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-framework     disable mod_wsgi framework link
   --disable-embedded      disable mod_wsgi embedded mode
   --enable-py3k           enable mod_wsgi Python 3.X support
 
@@ -1624,6 +1625,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+# Check whether --enable-framework was given.
+if test "${enable_framework+set}" = set; then
+  enableval=$enable_framework; ENABLE_FRAMEWORK=$enableval
+else
+  ENABLE_FRAMEWORK=yes
+fi
+
+
 # Check whether --enable-embedded was given.
 if test "${enable_embedded+set}" = set; then
   enableval=$enable_embedded; ENABLE_EMBEDDED=$enableval
@@ -1829,7 +1838,8 @@ PYTHONFRAMEWORK=`${PYTHON} -c 'from sys import stdout; \
     from distutils import sysconfig; \
     stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'`
 
-if test "${PYTHONFRAMEWORKDIR}" = "no-framework"; then
+if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \
+        "${ENABLE_FRAMEWORK}" != "yes"; then
     LDFLAGS1="-L${PYTHONLIBDIR}"
     LDFLAGS2="-L${PYTHONCFGDIR}"
 
@@ -1841,33 +1851,18 @@ if test "${PYTHONFRAMEWORKDIR}" = "no-framework"; then
         from distutils import sysconfig; \
         stdout.write(sysconfig.get_config_var("SYSLIBS"))'`
 else
-    if test "${PYTHON_VERSION}" != "2.3" && \
-            test "${PYTHON_VERSION}" != "2.4" && \
-            test "${PYTHON_VERSION}" != "2.5" && \
-            test -f "${PYTHONCFGDIR}/libpython${PYTHON_VERSION}.a"; then
-        LDFLAGS2="-L${PYTHONCFGDIR}"
-
-        LDLIBS1="-lpython${PYTHON_VERSION}"
-        LDLIBS2=`${PYTHON} -c 'from sys import stdout; \
-            from distutils import sysconfig; \
-            stdout.write(sysconfig.get_config_var("LIBS"))'`
-        LDLIBS3=`${PYTHON} -c 'from sys import stdout; \
-            from distutils import sysconfig; \
-            stdout.write(sysconfig.get_config_var("SYSLIBS"))'`
-    else
-        LDFLAGS1="-Wl,-F${PYTHONFRAMEWORKPREFIX} -framework ${PYTHONFRAMEWORK}"
-
-        VERSION="${PYTHON_VERSION}"
-        STRING="${PYTHONFRAMEWORKDIR}/Versions/${VERSION}/${PYTHONFRAMEWORK}"
-        LDFLAGS2=`${PYTHON} -c "from sys import stdout; \
-            from distutils import sysconfig; \
-            stdout.write(sysconfig.get_config_var(
-            \"LINKFORSHARED\").replace(\"${STRING}\", ''))"`
-
-        LDLIBS1=`${PYTHON} -c 'from sys import stdout; \
-            from distutils import sysconfig; \
-            stdout.write(sysconfig.get_config_var("LIBS"))'`
-    fi
+    LDFLAGS1="-Wl,-F${PYTHONFRAMEWORKPREFIX} -framework ${PYTHONFRAMEWORK}"
+
+    VERSION="${PYTHON_VERSION}"
+    STRING="${PYTHONFRAMEWORKDIR}/Versions/${VERSION}/${PYTHONFRAMEWORK}"
+    LDFLAGS2=`${PYTHON} -c "from sys import stdout; \
+        from distutils import sysconfig; \
+        stdout.write(sysconfig.get_config_var(
+        \"LINKFORSHARED\").replace(\"${STRING}\", ''))"`
+
+    LDLIBS1=`${PYTHON} -c 'from sys import stdout; \
+        from distutils import sysconfig; \
+        stdout.write(sysconfig.get_config_var("LIBS"))'`
 fi
 
 CFLAGS=""
diff --git a/configure.ac b/configure.ac
index 9db0d1a..d6b1264 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,11 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(mod_wsgi.c)
 
+AC_ARG_ENABLE(framework, AC_HELP_STRING([--disable-framework],
+            [disable mod_wsgi framework link]),
+            [ENABLE_FRAMEWORK=$enableval],
+	    [ENABLE_FRAMEWORK=yes])
+
 AC_ARG_ENABLE(embedded, AC_HELP_STRING([--disable-embedded],
             [disable mod_wsgi embedded mode]),
             [ENABLE_EMBEDDED=$enableval],
@@ -119,7 +124,8 @@ PYTHONFRAMEWORK=`${PYTHON} -c 'from sys import stdout; \
     from distutils import sysconfig; \
     stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'`
 
-if test "${PYTHONFRAMEWORKDIR}" = "no-framework"; then
+if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \
+        "${ENABLE_FRAMEWORK}" != "yes"; then
     LDFLAGS1="-L${PYTHONLIBDIR}"
     LDFLAGS2="-L${PYTHONCFGDIR}"
 
@@ -131,33 +137,18 @@ if test "${PYTHONFRAMEWORKDIR}" = "no-framework"; then
         from distutils import sysconfig; \
         stdout.write(sysconfig.get_config_var("SYSLIBS"))'`
 else
-    if test "${PYTHON_VERSION}" != "2.3" && \
-            test "${PYTHON_VERSION}" != "2.4" && \
-            test "${PYTHON_VERSION}" != "2.5" && \
-            test -f "${PYTHONCFGDIR}/libpython${PYTHON_VERSION}.a"; then
-        LDFLAGS2="-L${PYTHONCFGDIR}"
-
-        LDLIBS1="-lpython${PYTHON_VERSION}"
-        LDLIBS2=`${PYTHON} -c 'from sys import stdout; \
-            from distutils import sysconfig; \
-            stdout.write(sysconfig.get_config_var("LIBS"))'`
-        LDLIBS3=`${PYTHON} -c 'from sys import stdout; \
-            from distutils import sysconfig; \
-            stdout.write(sysconfig.get_config_var("SYSLIBS"))'`
-    else
-        LDFLAGS1="-Wl,-F${PYTHONFRAMEWORKPREFIX} -framework ${PYTHONFRAMEWORK}"
-
-        VERSION="${PYTHON_VERSION}"
-        STRING="${PYTHONFRAMEWORKDIR}/Versions/${VERSION}/${PYTHONFRAMEWORK}"
-        LDFLAGS2=`${PYTHON} -c "from sys import stdout; \
-            from distutils import sysconfig; \
-            stdout.write(sysconfig.get_config_var(
-            \"LINKFORSHARED\").replace(\"${STRING}\", ''))"`
-
-        LDLIBS1=`${PYTHON} -c 'from sys import stdout; \
-            from distutils import sysconfig; \
-            stdout.write(sysconfig.get_config_var("LIBS"))'`
-    fi
+    LDFLAGS1="-Wl,-F${PYTHONFRAMEWORKPREFIX} -framework ${PYTHONFRAMEWORK}"
+
+    VERSION="${PYTHON_VERSION}"
+    STRING="${PYTHONFRAMEWORKDIR}/Versions/${VERSION}/${PYTHONFRAMEWORK}"
+    LDFLAGS2=`${PYTHON} -c "from sys import stdout; \
+        from distutils import sysconfig; \
+        stdout.write(sysconfig.get_config_var(
+        \"LINKFORSHARED\").replace(\"${STRING}\", ''))"`
+
+    LDLIBS1=`${PYTHON} -c 'from sys import stdout; \
+        from distutils import sysconfig; \
+        stdout.write(sysconfig.get_config_var("LIBS"))'`
 fi
 
 CFLAGS=""