From 943ee96fc92b0686386e549af331b6f2e32f864f Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sat, 15 Aug 2015 12:36:10 +0200 Subject: [PATCH] build system: Qt: don't assume GNU sed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit \(…\) seems to be a GNU extension to sed, and MacOS uses BSD sed which doesn't support it. --- ChangeLog | 3 +++ ac/qt5.m4 | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 930ed0426..364eaae95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-08-15 Moritz Bunkus + * build system: bug fix: fixed Qt platform plugin detection on + MacOS. + * Released v8.3.0. * MKVToolNix GUI: chapter editor enhancement: pressing return will diff --git a/ac/qt5.m4 b/ac/qt5.m4 index c8134a861..d96c901d0 100644 --- a/ac/qt5.m4 +++ b/ac/qt5.m4 @@ -201,8 +201,8 @@ return 0; if test x"$wanted_plugin" != x; then plugins_dir= - for dir in `echo $QT_LIBS | sed -e 's/-l[^ ]*\( \|$\)//g' -e 's/-L//g'` ; do - if test -f "$dir/../plugins/platforms/libq${wanted_plugin}.a" ; then + for dir in `echo " $QT_LIBS " | sed -e 's/ -l[^ ]*//g' -e 's/-L//g'` ; do + if test -f "$dir/../plugins/platforms/libq${wanted_plugin}.a"; then plugins_dir="$dir/../plugins" break fi