From 6dcc5c96c5abc018728d92d90e147bb7e544f63c Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Thu, 22 Jun 2017 01:01:40 +1000 Subject: [PATCH] configure: Add --with-moc/uic/rcc options For cross-compiling, it's easier to be able to specify the actual paths to the tools --- configure.ac | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index c5719aa..cad15f2 100644 --- a/configure.ac +++ b/configure.ac @@ -2910,9 +2910,18 @@ AG_GST_CHECK_FEATURE(QT, [Qt elements], qt, [ PKG_CHECK_MODULES(QT, Qt5Core Qt5Gui Qt5Qml Qt5Quick >= 5.4.0, [ QT_PATH=`$PKG_CONFIG --variable=exec_prefix Qt5Core` QT_HOST_PATH=`$PKG_CONFIG --variable=host_bins Qt5Core` - AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin"]) - AC_PATH_PROGS(RCC, [rcc-qt5 rcc], rcc, ["${QT_HOST_PATH}" "${QT_PATH}/bin"]) - AC_PATH_PROGS(UIC, [uic-qt5 uic], uic, ["${QT_HOST_PATH}" "${QT_PATH}/bin"]) + AC_ARG_WITH([moc], + AS_HELP_STRING([--with-moc], [Set location of qt moc tool]), + [MOC=$withval]) + AC_PATH_PROGS(MOC, [moc-qt5 moc], [moc], ["${QT_HOST_PATH}" "${QT_PATH}/bin"]) + AC_ARG_WITH([rcc], + AS_HELP_STRING([--with-rcc], [Set location of qt rcc tool]), + [RCC=$withval]) + AC_PATH_PROGS(RCC, [rcc-qt5 rcc], [rcc], ["${QT_HOST_PATH}" "${QT_PATH}/bin"]) + AC_ARG_WITH([uic], + AS_HELP_STRING([--with-uic], [Set location of qt uic tool]), + [UIC=$withval]) + AC_PATH_PROGS(UIC, [uic-qt5 uic], [uic], ["${QT_HOST_PATH}" "${QT_PATH}/bin"]) if test "x$MOC" = "x" || test "x$UIC" = "x" || test "x$RCC" = "x"; then AC_MSG_WARN([One of the required qt build programs was not found]) HAVE_QT="no" -- 2.7.4