Also search for -qt5 versions of Qt5 utils (#2)

configure.ac

@@ -110,6 +110,14 @@ AC_CHECK_LIB(Qt5Widgets, main,
   [HAVE_QT5="yes"],
   [AC_MSG_ERROR([Qt5Widgets library not found])])
 
+AC_CHECK_PROGS(MOC, [moc-qt5 moc])
+AC_CHECK_PROGS(UIC, [uic-qt5 uic])
+AC_CHECK_PROGS(RCC, [rcc-qt5 rcc])
+AC_CHECK_PROGS(LRELEASE, [lrelease-qt5 lrelease])
+if test -z "$MOC" || test -z "$UIC" || test -z "$RCC" || test -z "$LRELEASE"; then
+   AC_MSG_ERROR([Qt utility programs moc, uic, rcc and lrelease are required.])
+fi
+
 if test "x$HAVE_QT5" = "xyes"; then
    QT_CXXFLAGS=`$PKG_CONFIG --cflags Qt5Core Qt5Gui Qt5Xml Qt5Widgets`
 

src/Makefile.in

@@ -55,16 +55,16 @@ QTDIR = @QTDIR@
 PATH := $(QTDIR)/bin:$(PATH)
 
 ui_%.h: %.ui
-	uic -o $@ $<
+	@UIC@ -o $@ $<
 
 uic_%.cpp: %.h
-	uic -o $@ $<
+	@UIC@ -o $@ $<
 
 moc_%.cpp: %.h
-	moc -o $@ $<
+	@MOC@ -o $@ $<
 
 %.qm: %.ts
-	lrelease $< -qm $@
+	@LRELEASE@ $< -qm $@
 
 MOC = \
 	moc_dvbcut.cpp \
@@ -117,7 +117,7 @@ $(topdir)/bin:
 	mkdir $@
 
 qrc_icons.cpp:
-	rcc -name icons -o $@ ../icons/icons.qrc
+	@RCC@ -name icons -o $@ ../icons/icons.qrc
 
 $(topdir)/bin/dvbcut$(EXEEXT): dvbcut$(EXEEXT)
 	$(INSTALL_PROGRAM) dvbcut$(EXEEXT) $(topdir)/bin/dvbcut$(EXEEXT)