Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 489508
Collapse All | Expand All

(-)./configure.ac.orig (-2 / +2 lines)
Lines 3639-3645 Link Here
3639
  ])
3639
  ])
3640
])
3640
])
3641
AS_IF([test "${enable_qt}" != "no"], [
3641
AS_IF([test "${enable_qt}" != "no"], [
3642
  PKG_CHECK_MODULES([QT], [QtCore >= 5 QtWidgets QtGui],, [
3642
  PKG_CHECK_MODULES([QT], [Qt5Core >= 5 Qt5Widgets Qt5Gui],, [
3643
    PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [
3643
    PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [
3644
      AS_IF([test -n "${enable_qt}"],[
3644
      AS_IF([test -n "${enable_qt}"],[
3645
        AC_MSG_ERROR([${QT_PKG_ERRORS}.])
3645
        AC_MSG_ERROR([${QT_PKG_ERRORS}.])
Lines 3684-3690 Link Here
3684
       VLC_ADD_LIBS([qt4], [-Wl,-framework,Cocoa])
3684
       VLC_ADD_LIBS([qt4], [-Wl,-framework,Cocoa])
3685
  ])
3685
  ])
3686
3686
3687
  QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)"
3687
  QT_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core|sed 's:/bin::')"
3688
  AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
3688
  AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
3689
  AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
3689
  AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
3690
  AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
3690
  AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])

Return to bug 489508