Change version string to 2.4c2 (second release candidate). Revert change to2.4c2

add -Wl, in front of all linker flags. This means it may break with Apache
2.3 again. Need to work out why apxs has changed in Apache 2.3 rather than
working around it. May be a bug in Apache 2.3.

3 files changed, 10 insertions, 10 deletions

diff --git a/configure b/configure
index 1da0d0d..529342e 100755
--- a/configure
+++ b/configure
@@ -1835,10 +1835,10 @@ fi
 LDFLAGS="${LDFLAGS} ${LDFLAGS1} ${LDFLAGS2} ${LDFLAGS3}"
 LDLIBS="${LDLIBS} ${LDLIBS1} ${LDLIBS2} ${LDLIBS3}"
 
-LDFLAGS=`echo ${LDFLAGS} | \
- sed -e "s/-Wl,\([^ ][^ ]*\)/\1/g" -e "s/\([^ ][^ ]*\)/-Wl,\1/g"`
-LDLIBS=`echo ${LDLIBS} | \
- sed -e "s/-Wl,\([^ ][^ ]*\)/\1/g" -e "s/\([^ ][^ ]*\)/-Wl,\1/g"`
+#LDFLAGS=`echo ${LDFLAGS} | \
+# sed -e "s/-Wl,\([[^ ]][[^ ]]*\)/\1/g" -e "s/\([[^ ]][[^ ]]*\)/-Wl,\1/g"`
+#LDLIBS=`echo ${LDLIBS} | \
+# sed -e "s/-Wl,\([[^ ]][[^ ]]*\)/\1/g" -e "s/\([[^ ]][[^ ]]*\)/-Wl,\1/g"`
 
 
 
diff --git a/configure.ac b/configure.ac
index 2c46e2c..5dea0b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl  vim: set sw=4 expandtab :
 dnl
-dnl  Copyright 2007-2008 GRAHAM DUMPLETON
+dnl  Copyright 2007-2009 GRAHAM DUMPLETON
 dnl 
 dnl  Licensed under the Apache License, Version 2.0 (the "License");
 dnl  you may not use this file except in compliance with the License.
@@ -129,10 +129,10 @@ fi
 LDFLAGS="${LDFLAGS} ${LDFLAGS1} ${LDFLAGS2} ${LDFLAGS3}"
 LDLIBS="${LDLIBS} ${LDLIBS1} ${LDLIBS2} ${LDLIBS3}"
 
-LDFLAGS=`echo ${LDFLAGS} | \
- sed -e "s/-Wl,\([[^ ]][[^ ]]*\)/\1/g" -e "s/\([[^ ]][[^ ]]*\)/-Wl,\1/g"`
-LDLIBS=`echo ${LDLIBS} | \
- sed -e "s/-Wl,\([[^ ]][[^ ]]*\)/\1/g" -e "s/\([[^ ]][[^ ]]*\)/-Wl,\1/g"`
+#LDFLAGS=`echo ${LDFLAGS} | \
+# sed -e "s/-Wl,\([[^ ]][[^ ]]*\)/\1/g" -e "s/\([[^ ]][[^ ]]*\)/-Wl,\1/g"`
+#LDLIBS=`echo ${LDLIBS} | \
+# sed -e "s/-Wl,\([[^ ]][[^ ]]*\)/\1/g" -e "s/\([[^ ]][[^ ]]*\)/-Wl,\1/g"`
 
 AC_SUBST(CFLAGS)
 AC_SUBST(LDFLAGS)
diff --git a/mod_wsgi.c b/mod_wsgi.c
index 0b6e09b..9dffe23 100644
--- a/mod_wsgi.c
+++ b/mod_wsgi.c
@@ -246,7 +246,7 @@ static char *apr_off_t_toa(apr_pool_t *p, apr_off_t n)
 
 #define MOD_WSGI_MAJORVERSION_NUMBER 2
 #define MOD_WSGI_MINORVERSION_NUMBER 4
-#define MOD_WSGI_VERSION_STRING "2.4c1"
+#define MOD_WSGI_VERSION_STRING "2.4c2"
 
 #if AP_SERVER_MAJORVERSION_NUMBER < 2
 module MODULE_VAR_EXPORT wsgi_module;