Merge branch 'release/4.5.20'

GrahamDumpleton · Oct 3, 2017 · 1c50749 · 1c50749
2 parents ea9c33b + 042d395
commit 1c50749
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   release-notes/version-4.5.20
    release-notes/version-4.5.19
    release-notes/version-4.5.18
    release-notes/version-4.5.17

diff --git a/docs/release-notes/version-4.5.20.rst b/docs/release-notes/version-4.5.20.rst
@@ -0,0 +1,13 @@
+==============
+Version 4.5.20
+==============
+
+Version 4.5.20 of mod_wsgi can be obtained from:
+
+  https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.5.20
+
+Bugs Fixed
+----------
+
+* Installation on MacOS X using ``setup.py`` or ``pip`` would fail if Xcode
+  9.0 was installed.
diff --git a/setup.py b/setup.py
@@ -290,10 +290,17 @@ def get_apu_includes():
 # case we manually set the locations of the Apache and APR header files.
 
 if (not os.path.exists(APR_CONFIG) and
+        os.path.exists('/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk')):
+    INCLUDEDIR = '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/apache2'
+    APR_INCLUDES = ['-I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/apr-1']
+    APU_INCLUDES = []
+
+elif (not os.path.exists(APR_CONFIG) and
         os.path.exists('/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-migrator/sdks/MacOSX.sdk')):
     INCLUDEDIR = '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-migrator/sdks/MacOSX.sdk/usr/include/apache2'
     APR_INCLUDES = ['-I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-migrator/sdks/MacOSX.sdk/usr/include/apr-1']
     APU_INCLUDES = []
+
 else:
     APR_INCLUDES = get_apr_includes().split()
     APU_INCLUDES = get_apu_includes().split()

diff --git a/src/server/wsgi_version.h b/src/server/wsgi_version.h
@@ -25,8 +25,8 @@
 
 #define MOD_WSGI_MAJORVERSION_NUMBER 4
 #define MOD_WSGI_MINORVERSION_NUMBER 5
-#define MOD_WSGI_MICROVERSION_NUMBER 19
-#define MOD_WSGI_VERSION_STRING "4.5.19"
+#define MOD_WSGI_MICROVERSION_NUMBER 20
+#define MOD_WSGI_VERSION_STRING "4.5.20"
 
 /* ------------------------------------------------------------------------- */