Applied Graham's setup.py.in-2.diff patch to fix Mac OSX compile prob…

…lems. Ref MODPYTHON-65
grisha · Aug 20, 2005 · 804ba37 · 804ba37
1 parent f5896f7
commit 804ba37
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/dist/setup.py.in b/dist/setup.py.in
@@ -157,12 +157,13 @@ import string
 from distutils import sysconfig
 
 if sys.platform == "darwin":
-    sysconfig._config_vars["LDSHARED"] = \
-            string.replace(sysconfig.get_config_var("LDSHARED"), \
-            " -bundle "," -bundle -flat_namespace -undefined suppress ")
-    sysconfig._config_vars["BLDSHARED"] = \
-            string.replace(sysconfig.get_config_var("BLDSHARED"), \
-            " -bundle "," -bundle -flat_namespace -undefined suppress ")
+    if not '-undefined' in sysconfig.get_config_var("LDSHARED").split():
+        sysconfig._config_vars["LDSHARED"] = \
+                string.replace(sysconfig.get_config_var("LDSHARED"), \
+                " -bundle "," -bundle -flat_namespace -undefined suppress ")
+        sysconfig._config_vars["BLDSHARED"] = \
+                string.replace(sysconfig.get_config_var("BLDSHARED"), \
+                " -bundle "," -bundle -flat_namespace -undefined suppress ")
 
 setup(name="mod_python",
       version=VER,

diff --git a/src/include/mpversion.h b/src/include/mpversion.h
@@ -1,5 +1,5 @@
 #define MPV_MAJOR 3
 #define MPV_MINOR 2
 #define MPV_PATCH 0
-#define MPV_BUILD 20050816
-#define MPV_STRING "3.2.0-dev-20050816"
+#define MPV_BUILD 20050820
+#define MPV_STRING "3.2.0-dev-20050820"