[git] GPGME - branch, master, updated. gpgme-1.8.0-15-g211844f

[by Raphael Kubo da Costa]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  211844f049d714cd4d5aab96347705cb0c209c5d (commit)
      from  da5343a9d2c8c0ca6431162aac4bd5c73b4ae6dd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 211844f049d714cd4d5aab96347705cb0c209c5d
Author: Raphael Kubo da Costa <rakuco at FreeBSD.org>
Date:   Sun Dec 18 11:41:33 2016 +0100

    Qt: Make sure extended grep is used with '|'.
    
    * m4/qt.m4: Use grep -E when using the alternation character.
    --
    
    POSIX specifies '|' is only supposed to work as an alternation special
    character when grep is used in extended mode. The code worked fine
    with GNU grep because it accepts extended regular expressions by
    default, but other POSIX-compliant implementations might fail and take
    it literally.
    
    Signed-off-by: Raphael Kubo da Costa <rakuco at FreeBSD.org>

diff --git a/m4/qt.m4 b/m4/qt.m4
index e7aac41..700f4e0 100644
--- a/m4/qt.m4
+++ b/m4/qt.m4
@@ -32,18 +32,18 @@ AC_DEFUN([FIND_QT],
     AC_CHECK_TOOL(MOC, moc)
     AC_MSG_CHECKING([moc version])
     mocversion=`$MOC -v 2>&1`
-    mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
+    mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
     if test x"$mocversiongrep" != x"$mocversion"; then
       AC_MSG_RESULT([no])
       # moc was not the qt5 one, try with moc-qt5
       AC_CHECK_TOOL(MOC2, moc-qt5)
       mocversion=`$MOC2 -v 2>&1`
-      mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
+      mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"`
       if test x"$mocversiongrep" != x"$mocversion"; then
         AC_CHECK_TOOL(QTCHOOSER, qtchooser)
         qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
         mocversion=`$qt5tooldir/moc -v 2>&1`
-        mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
+        mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
         if test x"$mocversiongrep" != x"$mocversion"; then
           # no valid moc found
           have_qt5_libs="no";

-----------------------------------------------------------------------

Summary of changes:
 m4/qt.m4 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org