Commit 9ea10544 authored by Christophe Mutricy's avatar Christophe Mutricy

Default more cleanly on moc and uic

parent a0bc0a69
...@@ -4928,9 +4928,9 @@ AS_IF([test "${enable_qt4}" != "no" && ...@@ -4928,9 +4928,9 @@ AS_IF([test "${enable_qt4}" != "no" &&
enableqt4=true enableqt4=true
VLC_ADD_LDFLAGS([qt4],[$QT4_LIBS]) VLC_ADD_LDFLAGS([qt4],[$QT4_LIBS])
VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS]) VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS])
AC_PATH_PROG(MOC, moc-qt4, moc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin) AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
AC_PATH_PROG(RCC, rcc, rcc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin) AC_PATH_PROG(RCC, rcc, rcc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
AC_PATH_PROG(UIC, uic-qt4, uic,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin) AC_PATH_PROGS(UIC, [uic-qt4 uic], uic,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
], ],
AS_IF([test "${enable_qt4}" = "yes"],[ AS_IF([test "${enable_qt4}" = "yes"],[
AC_MSG_ERROR(QT4 library not found) AC_MSG_ERROR(QT4 library not found)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment