Fix 'warning: stray \ before -' (#1141)

grep 3.8 started detecting overly-escaped regex patterns

diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4
index 46a0bee8be8592f789f02c70b7869bb75a3c8f5b..462383e0514506104e5c9cb80d3b69c15339c685 100644 (file)
--- a/acinclude/krb5.m4
+++ b/acinclude/krb5.m4
@@ -192,7 +192,7 @@ main(void)
         return 0;
 }
   ]])],  [ squid_cv_working_gssapi=yes ], [ squid_cv_working_gssapi=no ], [:])])
-  AS_IF([test "x$squid_cv_working_gssapi" = "xno" -a `echo $LIBS | grep -i -c "\-L"` -gt 0],[
+  AS_IF([test "x$squid_cv_working_gssapi" = "xno" -a `echo $LIBS | grep -i -c "[-]L"` -gt 0],[
     AC_MSG_NOTICE([Check Runtime library path !])
   ])
 ])
@@ -284,7 +284,7 @@ main(void)
         return 0;
 }
   ]])], [ squid_cv_working_krb5=yes ], [ squid_cv_working_krb5=no ],[:])])
-  AS_IF([test "x$squid_cv_working_krb5" = "xno" -a `echo $LIBS | grep -i -c "\-L"` -gt 0],[
+  AS_IF([test "x$squid_cv_working_krb5" = "xno" -a `echo $LIBS | grep -i -c "[-]L"` -gt 0],[
     AC_MSG_NOTICE([Check Runtime library path !])
   ])
 ])

diff --git a/configure.ac b/configure.ac
index 65572f655d34f911ac4f01a06eaa924b7836c7bc..75b4a51a37045e414365df219d336d8c5814c673 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -91,7 +91,7 @@ AS_IF([test "x$BUILDCXX" = "x"],[
 AC_SUBST(BUILDCXX)
 
 # If the user did not specify a C++ version.
-user_cxx=`echo "$PRESET_CXXFLAGS" | grep -o -E "\-std="`
+user_cxx=`echo "$PRESET_CXXFLAGS" | grep -o -E "[-]std="`
 AS_IF([test "x$user_cxx" = "x"],[
   # Check for C++11 compiler support
   AX_CXX_COMPILE_STDCXX_11([noext],[mandatory])

diff --git a/errors/Makefile.am b/errors/Makefile.am
index 19a48e2fb69ba89f5399818807683ae09f11532d..a6644e4e014028964d85953a41adf50afa4d3c8e 100644 (file)
--- a/errors/Makefile.am
+++ b/errors/Makefile.am
@@ -53,7 +53,7 @@ translate-warn:
 
 $(TRANSLATE_LANGUAGES): $(ERROR_TEMPLATES)
 
-NOTIDY=`$(PO2HTML) --help | grep -o "\-\-notidy"`
+NOTIDY=`$(PO2HTML) --help | grep -o "[-]-notidy"`
 
 .po.lang:
        if test "$(PO2HTML)" != "" && test "$(PO2HTML)" != "no" && test "$(PO2HTML)" != "off" && test -f $(top_srcdir)/errors/en.po; then \

diff --git a/test-suite/buildtests/layer-01-minimal.opts b/test-suite/buildtests/layer-01-minimal.opts
index 54e3e8312647153a9890d229807b42a9070c6d27..c12b5a28e29cc5a0b3bd51499d5bdc9254c272d6 100644 (file)
--- a/test-suite/buildtests/layer-01-minimal.opts
+++ b/test-suite/buildtests/layer-01-minimal.opts
@@ -17,10 +17,10 @@ MAKETEST="distcheck"
 #
 #
 # The options for this level can be easily generated semi-automatically from configure.ac by:
-#      grep -E "^AC_ARG_ENABLE" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >disable.opts
+#      grep -E "^AC_ARG_ENABLE" ./configure.ac | grep -o -E "[0-9a-z-]+[,]" | grep -o -E "[^,]+" >disable.opts
 # followed by insertion of '   --disable-' and '\' strings
 #
-#      grep -E "^AC_ARG_WITH" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >without.opts
+#      grep -E "^AC_ARG_WITH" ./configure.ac | grep -o -E "[0-9a-z-]+[,]" | grep -o -E "[^,]+" >without.opts
 # followed by insertion of '   --without-' and ' \' strings
 #
 # sometimes it's just too automatic.. Following options should be just stripped

diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts
index 0d9b9df420e7025bec7bfaeaf6c2bb896de819da..55789faf981d638550685d79bc3ebd11e4993f6d 100644 (file)
--- a/test-suite/buildtests/layer-02-maximus.opts
+++ b/test-suite/buildtests/layer-02-maximus.opts
@@ -17,10 +17,10 @@ MAKETEST="distcheck"
 #
 #
 # The options for this level can be easily generated semi-automatically from configure.ac by:
-#      grep -E "^AC_ARG_ENABLE" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >disable.opts
+#      grep -E "^AC_ARG_ENABLE" ./configure.ac | grep -o -E "[0-9a-z-]+[,]" | grep -o -E "[^,]+" >disable.opts
 # followed by insertion of '   --enable-' and '\' strings
 #
-#      grep -E "^AC_ARG_WITH" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >without.opts
+#      grep -E "^AC_ARG_WITH" ./configure.ac | grep -o -E "[0-9a-z-]+[,]" | grep -o -E "[^,]+" >without.opts
 # followed by insertion of '   --with-' and ' \' strings
 #
 # sometimes it's just too automatic..

diff --git a/test-suite/buildtests/layer-04-noauth-everything.opts b/test-suite/buildtests/layer-04-noauth-everything.opts
index 685ea7f4fc9d41f9f48d3f233695f935f8588b0d..0e9d5446e1ef9c56f9d0577ea48fd988e5c8cd5b 100644 (file)
--- a/test-suite/buildtests/layer-04-noauth-everything.opts
+++ b/test-suite/buildtests/layer-04-noauth-everything.opts
@@ -17,10 +17,10 @@ MAKETEST="distcheck"
 #
 #
 # The options for this level can be easily generated semi-automatically from configure.ac by:
-#      grep -E "^AC_ARG_ENABLE" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >disable.opts
+#      grep -E "^AC_ARG_ENABLE" ./configure.ac | grep -o -E "[0-9a-z-]+[,]" | grep -o -E "[^,]+" >disable.opts
 # followed by insertion of '   --enable-' and '\' strings
 #
-#      grep -E "^AC_ARG_WITH" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >without.opts
+#      grep -E "^AC_ARG_WITH" ./configure.ac | grep -o -E "[0-9a-z-]+[,]" | grep -o -E "[^,]+" >without.opts
 # followed by insertion of '   --with-' and ' \' strings
 #
 # sometimes it's just too automatic..