[vlc-commits] configure: search Qt programs also in contrib dir

Jean-Baptiste Kempf git at videolan.org
Wed Sep 26 17:31:34 CEST 2012


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Sep 26 17:28:35 2012 +0200| [811bee5933dd115b6d5ffb9370e58a0842c963ea] | committer: Jean-Baptiste Kempf

configure: search Qt programs also in contrib dir

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=811bee5933dd115b6d5ffb9370e58a0842c963ea
---

 configure.ac |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index a4a2bb6..3b9cb77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3535,9 +3535,9 @@ AS_IF([test "${enable_qt}" != "no"], [
   ])
 
   QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)"
-  AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, [${QT_PATH}/bin])
-  AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin])
-  AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, [${QT_PATH}/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])
 ])
 AM_CONDITIONAL(ENABLE_QT4, [test "$enable_qt" != "no"])
 



More information about the vlc-commits mailing list