tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r696032 - /tomcat/connectors/trunk/jk/native/configure.in
Date Tue, 16 Sep 2008 20:05:34 GMT
Author: rjung
Date: Tue Sep 16 13:05:34 2008
New Revision: 696032

URL: http://svn.apache.org/viewvc?rev=696032&view=rev
Log:
Improve sed expresion added in r695003.
LDFLAGS could already include "Wl,", so we shouldn't
add them a second time.
Problem reported by Brian Rectanus.

Modified:
    tomcat/connectors/trunk/jk/native/configure.in

Modified: tomcat/connectors/trunk/jk/native/configure.in
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/configure.in?rev=696032&r1=696031&r2=696032&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/configure.in (original)
+++ tomcat/connectors/trunk/jk/native/configure.in Tue Sep 16 13:05:34 2008
@@ -108,8 +108,13 @@
                 APXSCPPFLAGS=""
                 dnl sed magic needed to prepend each token with "-Wl," s.t. libtool
                 dnl detects those arguments correctly as ld flags.
+                dnl Prevent double Wl by first stripping it.
+                dnl Allow space and tab as separators.
                 dnl Double square brackets needed, because single ones will be removed by
autoconf.
-                APXSLDFLAGS="`$APXS -q LDFLAGS_SHLIB | $SED -e 's/\([[^ ]]*\)/-Wl,\1/g'`"
+                APXSLDFLAGS="`$APXS -q LDFLAGS_SHLIB | \
+                    $SED -e 's/\([[ 	]]\{1,\}\)-Wl,/\1/g' \
+                         -e 's/^-Wl,//g' \
+                         -e 's/\([[^ 	]]\{1,\}\)/-Wl,\1/g'`"
             else
                 WEBSERVER="apache-2.0"
                 APRINCLUDEDIR=""
@@ -123,8 +128,13 @@
                 APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"
                 dnl sed magic needed to prepend each token with "-Wl," s.t. libtool
                 dnl detects those arguments correctly as ld flags.
+                dnl Prevent double Wl by first stripping it.
+                dnl Allow space and tab as separators.
                 dnl Double square brackets needed, because single ones will be removed by
autoconf.
-                APXSLDFLAGS="`$APXS -q LDFLAGS | $SED -e 's/\([[^ ]]*\)/-Wl,\1/g'`"
+                APXSLDFLAGS="`$APXS -q LDFLAGS | \
+                    $SED -e 's/\([[ 	]]\{1,\}\)-Wl,/\1/g' \
+                         -e 's/^-Wl,//g' \
+                         -e 's/\([[^ 	]]\{1,\}\)/-Wl,\1/g'`"
                 APACHE_CONFIG_VARS="`${APXS} -q exp_installbuilddir`/config_vars.mk"
                 LIBTOOL=`$APXS -q LIBTOOL`
             fi
@@ -534,7 +544,15 @@
 fi
 dnl the APXSLDFLAGS is given to the linker (for APRVARS).
 if ${TEST} -n "${LDFLAGS}" ; then
-    TMPLDFLAGS="`${ECHO} ${LDFLAGS} | $SED -e 's/\([[^ ]]*\)/-Wl,\1/g'`"
+    dnl sed magic needed to prepend each token with "-Wl," s.t. libtool
+    dnl detects those arguments correctly as ld flags.
+    dnl Prevent double Wl by first stripping it.
+    dnl Allow space and tab as separators.
+    dnl Double square brackets needed, because single ones will be removed by autoconf.
+    TMPLDFLAGS="`${ECHO} ${LDFLAGS} | \
+        $SED -e 's/\([[ 	]]\{1,\}\)-Wl,/\1/g' \
+             -e 's/^-Wl,//g' \
+             -e 's/\([[^ 	]]\{1,\}\)/-Wl,\1/g'`"
     APXSLDFLAGS="${APXSLDFLAGS} ${TMPLDFLAGS}"
 fi
 AC_SUBST(APXSCFLAGS)



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message