[git] Pinentry - branch, master, updated. pinentry-1.0.0-5-g1acb06a

[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 "The standard pinentry collection".

The branch, master has been updated
       via  1acb06aac3dd08f573d7c2e3be75226346e61ed2 (commit)
      from  cc0d783cf03a814df48c03ddcbb4d09115e9596d (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 1acb06aac3dd08f573d7c2e3be75226346e61ed2
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 90c4a6e..35d9ae2 100644
--- a/m4/qt.m4
+++ b/m4/qt.m4
@@ -60,18 +60,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
-- 
The standard pinentry collection
http://git.gnupg.org