Avoid grep option `-q` for Solaris (#166)

Also utilize variable ${FGREP} set by configure

diff --git a/expat/Changes b/expat/Changes
index 6697792ea991e5944385a4b23725cb961f3c07ac..cc8045fb997db9ceec8fdebb7dc73db867ad30f9 100644 (file)
--- a/expat/Changes
+++ b/expat/Changes
@@ -2,6 +2,13 @@ NOTE: We are looking for help with a few things:
       https://github.com/libexpat/libexpat/labels/help%20wanted
       If you can help, please get in touch.  Thanks!
 
+Release 2.2.? ???????????????????
+        Other changes:
+            #166  Avoid grep option `-q` for Solaris
+
+        Special thanks to:
+            Rainer Jung
+
 Release 2.2.5 Tue October 31 2017
         Bug fixes:
               #8  If the parser runs out of memory, make sure its internal

diff --git a/expat/configure.ac b/expat/configure.ac
index c24f518c845286238fffbade5737503b73069988..d2b0f07e84f676a06a9e8bbd0eb9048e005cdbb4 100644 (file)
--- a/expat/configure.ac
+++ b/expat/configure.ac
@@ -106,8 +106,8 @@ AC_ARG_WITH([xmlwf], [
 AS_HELP_STRING([--without-xmlwf], [do not build xmlwf])], [], [with_xmlwf=yes])
 AM_CONDITIONAL([WITH_XMLWF], [test x${with_xmlwf} = xyes])
 
-AM_CONDITIONAL([MINGW], [echo -- "${host}" | fgrep -q mingw])
-AM_CONDITIONAL([UNICODE], [echo -- "${CPPFLAGS}${CFLAGS}" | fgrep -q XML_UNICODE])
+AM_CONDITIONAL([MINGW], [echo -- "${host}" | ${FGREP} mingw >/dev/null])
+AM_CONDITIONAL([UNICODE], [echo -- "${CPPFLAGS}${CFLAGS}" | ${FGREP} XML_UNICODE >/dev/null])
 
 
 AC_ARG_WITH([libbsd], [