Fix Qt5 build errors when not adding MOC5/UIC5/RCC5 to the configure …

…command line. From original commit: http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=1a59af2e7ebcc6bd2aff28d2baea3fc83ec0fd0f configure: try harder to find the right Qt5 build tools First check for Qt build tools in the host_bins directory from the Qt5Core pkg-config file. This fixes the situation where both Qt4 and Qt5 are installed but the global moc/uic/etc. are the Qt4 version, which would result in build failures.
Warzone2100 · Feb 5, 2016 · 9411baa · 9411baa
1 parent 86c367f
commit 9411baa
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -104,9 +104,11 @@ QT5_PLUGIN=`$PKG_CONFIG --variable=exec_prefix Qt5Core`
 AC_SUBST([QT5_PLUGIN])
 QT5_VERSION=`$PKG_CONFIG --modversion Qt5Core`
 AC_SUBST(QT5_VERSION)
-AC_PATH_PROGS(MOC5, [moc-qt5 moc])
-AC_PATH_PROGS(UIC5, [uic-qt5 uic])
-AC_PATH_PROGS(RCC5, [rcc-qt5 rcc])
+QT_PATH=`$PKG_CONFIG --variable=exec_prefix Qt5Core`
+QT_HOST_PATH=`$PKG_CONFIG --variable=host_bins Qt5Core`
+AC_PATH_PROGS(MOC5, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin"])
+AC_PATH_PROGS(UIC5, [uic-qt5 uic], uic, ["${QT_HOST_PATH}" "${QT_PATH}/bin"])
+AC_PATH_PROGS(RCC5, [rcc-qt5 rcc], rcc, ["${QT_HOST_PATH}" "${QT_PATH}/bin"])
 
 # Check for compiler
 case ${CC} in