From: Stefan Fritsch <sf@apache.org>
Date: Fri, 26 Nov 2010 20:10:55 +0000 (+0000)
Subject: improve hack to not break if a fixed version of flex is used
X-Git-Tag: 2.3.10~178
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1bb69047c990a1092f852d15ea331f118c577654;p=apache

improve hack to not break if a fixed version of flex is used


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1039546 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/Makefile.in b/server/Makefile.in
index 8067122f56..508c6e1f47 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -101,5 +101,5 @@ util_expr_scan.c util_expr_parse.c util_expr_parse.h: util_expr_scan.l util_expr
 	done
 	# work around flex bug
 	# http://sourceforge.net/tracker/?func=detail&aid=3029024&group_id=97492&atid=618177
-	perl -0777 -p -i -e 's,\n(void|int) ap_expr_yy[gs]et_column.*?\n\},,gs' \
+	perl -0777 -p -i -e 's,\n(void|int) ap_expr_yy[gs]et_column[^\n]+\)\n.*?\n\},,gs' \
 		$(builddir)/util_expr_scan.c