Update version string to 2.8-BRANCH. Prefix compiler arguments supplied through

CFLAGS environment variable to configure with -Wc,.

3 files changed, 19 insertions, 7 deletions

diff --git a/configure b/configure
index 5203a61..5669a54 100755
--- a/configure
+++ b/configure
@@ -1851,16 +1851,22 @@ else
 fi
 
 CFLAGS1=""
+for arg in ${CFLAGS}
+do
+    CFLAGS1="${CFLAGS1} -Wc,$arg"
+done
+
+CFLAGS2=""
 if test -x /usr/bin/lipo; then
     LDFLAGS3=""
     ARCHITECTURES=`/usr/bin/lipo -info $HTTPD | sed -e 's/.*://'`
     for ARCH in $ARCHITECTURES; do
-        CFLAGS1="${CFLAGS1} -Wc,'-arch ${ARCH}'"
+        CFLAGS2="${CFLAGS2} -Wc,'-arch ${ARCH}'"
         LDFLAGS3="${LDFLAGS3} -arch ${ARCH}"
     done
 fi
 
-CFLAGS="${CFLAGS} ${CFLAGS1}"
+CFLAGS="${CFLAGS1} ${CFLAGS2}"
 LDFLAGS="${LDFLAGS} ${LDFLAGS1} ${LDFLAGS2} ${LDFLAGS3}"
 LDLIBS="${LDLIBS} ${LDLIBS1} ${LDLIBS2} ${LDLIBS3}"
 
diff --git a/configure.ac b/configure.ac
index 2cddad1..994bcdc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,16 +141,22 @@ else
 fi
 
 CFLAGS1=""
+for arg in ${CFLAGS}
+do
+    CFLAGS1="${CFLAGS1} -Wc,$arg"
+done
+
+CFLAGS2=""
 if test -x /usr/bin/lipo; then
     LDFLAGS3=""
     ARCHITECTURES=`/usr/bin/lipo -info $HTTPD | sed -e 's/.*://'`
     for ARCH in $ARCHITECTURES; do
-        CFLAGS1="${CFLAGS1} -Wc,'-arch ${ARCH}'" 
-        LDFLAGS3="${LDFLAGS3} -arch ${ARCH}" 
+        CFLAGS2="${CFLAGS2} -Wc,'-arch ${ARCH}'"
+        LDFLAGS3="${LDFLAGS3} -arch ${ARCH}"
     done
 fi
 
-CFLAGS="${CFLAGS} ${CFLAGS1}"
+CFLAGS="${CFLAGS1} ${CFLAGS2}"
 LDFLAGS="${LDFLAGS} ${LDFLAGS1} ${LDFLAGS2} ${LDFLAGS3}"
 LDLIBS="${LDLIBS} ${LDLIBS1} ${LDLIBS2} ${LDLIBS3}"
 
diff --git a/mod_wsgi.c b/mod_wsgi.c
index 26ce791..453df6b 100644
--- a/mod_wsgi.c
+++ b/mod_wsgi.c
@@ -245,8 +245,8 @@ static char *apr_off_t_toa(apr_pool_t *p, apr_off_t n)
 /* Version and module information. */
 
 #define MOD_WSGI_MAJORVERSION_NUMBER 2
-#define MOD_WSGI_MINORVERSION_NUMBER 7
-#define MOD_WSGI_VERSION_STRING "2.7"
+#define MOD_WSGI_MINORVERSION_NUMBER 8
+#define MOD_WSGI_VERSION_STRING "2.8-BRANCH"
 
 #if AP_SERVER_MAJORVERSION_NUMBER < 2
 module MODULE_VAR_EXPORT wsgi_module;