diff options
| author | Raphael Kubo da Costa <[email protected]> | 2016-12-18 10:41:33 +0000 |
|---|---|---|
| committer | Andre Heinecke <[email protected]> | 2016-12-19 09:36:17 +0000 |
| commit | 211844f049d714cd4d5aab96347705cb0c209c5d (patch) | |
| tree | b8aabe65f96baac12ef2e984c94888235b67ac49 /m4 | |
| parent | cpp: Ensure that hasSecret is correct after update (diff) | |
| download | gpgme-211844f049d714cd4d5aab96347705cb0c209c5d.tar.gz gpgme-211844f049d714cd4d5aab96347705cb0c209c5d.zip | |
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 <[email protected]>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/qt.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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"; |