[patch] point configure in the right direction

vlc-2.1.4-qt5.patch (text/plain), 900 bytes, created by 4nykey on 2014-06-21 10:56:58 UTC

--- ./configure.ac.orig	2014-06-21 13:07:30.140448193 +0300
+++ ./configure.ac	2014-06-21 13:08:19.047946666 +0300
@@ -3639,7 +3639,7 @@
   ])
 ])
 AS_IF([test "${enable_qt}" != "no"], [
-  PKG_CHECK_MODULES([QT], [QtCore >= 5 QtWidgets QtGui],, [
+  PKG_CHECK_MODULES([QT], [Qt5Core >= 5 Qt5Widgets Qt5Gui],, [
     PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [
       AS_IF([test -n "${enable_qt}"],[
         AC_MSG_ERROR([${QT_PKG_ERRORS}.])
@@ -3684,7 +3684,7 @@
        VLC_ADD_LIBS([qt4], [-Wl,-framework,Cocoa])
   ])
 
-  QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)"
+  QT_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core|sed 's:/bin::')"
   AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
   AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
   AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])