Bug 895238 - Avoid using perl regex with grep(1) for portability. r=glandium
authorJan Beich <jbeich@tormail.org>
Thu, 18 Jul 2013 10:17:28 -0400
changeset 151362 1b7afc0839857760b56120b0102ab59bef78fff7
parent 151361 8bc7cd7071b2f8bd26a6a843723028696edbf485
child 151363 b632352da2e716e1a22028406bd1158cbc8fcfb2
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs895238
milestone25.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 895238 - Avoid using perl regex with grep(1) for portability. r=glandium
configure.in
--- a/configure.in
+++ b/configure.in
@@ -4793,17 +4793,17 @@ then
     [  --with-qtdir=\$dir       Specify Qt directory ],
     [ QTDIR=$withval])
 
     if test -z "$QTDIR"; then
         AC_CHECK_PROGS(HOST_QMAKE, $HOST_QMAKE qmake, "")
     else
         HOST_QMAKE="$QTDIR/bin/qmake"
     fi
-    QT_VERSION=`$HOST_QMAKE -v | grep 'Using Qt version' | grep -oP '\d+\.\d+\.\d+'`
+    QT_VERSION=`$HOST_QMAKE -v | grep 'Using Qt version' | egrep -o '[[0-9]]+\.[[0-9]]+\.[[0-9]]+'`
 
     if test -z "$QTDIR"; then
         case $QT_VERSION in
         5.*)
             AC_MSG_RESULT("Using qt5: $QT_VERSION")
             PKG_CHECK_MODULES(MOZ_QT, Qt5Gui Qt5Network Qt5Core Qt5OpenGL Qt5Widgets Qt5PrintSupport, ,
             [
               AC_MSG_ERROR([$MOZ_QT_PKG_ERRORS Need qtbase development packages, (On Ubuntu, you might try installing the packages qtbase5-dev libqt5opengl5-dev.)])