Merge branch 'ss/msvc' into maint

diff --git a/configure.ac b/configure.ac
index 89e2590bd6926a52d8f57e0dfc164360809c90d2..0cd9f4680b84bccd0a98193c401b13749b05b833 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -471,6 +471,13 @@ if test -n "$ASCIIDOC"; then
        esac
 fi
 
+if grep -a ascii configure.ac >/dev/null; then
+  AC_MSG_RESULT([Using 'grep -a' for sane_grep])
+  SANE_TEXT_GREP=-a
+else
+  SANE_TEXT_GREP=
+fi
+GIT_CONF_SUBST([SANE_TEXT_GREP])
 
 ## Checks for libraries.
 AC_MSG_NOTICE([CHECKS for libraries])