works with new build environment, but still missing resources and translations

ax_check_qt.m4

@@ -82,6 +82,7 @@ AC_DEFUN([AX_CHECK_VALID_FLAG], [
 
 AC_DEFUN([AX_CHECK_QT], [
   qt_modules="$2"
+  qt_modules_optional="$3"
   AX_CXX_QT_TOOLS
   HAVE_$1=0
   PKG_PROG_PKG_CONFIG
@@ -89,38 +90,59 @@ AC_DEFUN([AX_CHECK_QT], [
     HAVE_$1=1
     AC_DEFINE([HAVE_$1])
     AM_CPPFLAGS+=" ${[$1]5_CFLAGS}"
+    MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}"
     AM_CXXFLAGS+=" ${[$1]5_CFLAGS}"
     LIBS+=" ${[$1]5_LIBS}"
+    if test -n "${qt_modules_optional}"; then
+      PKG_CHECK_MODULES([$1]5_OPTIONAL, [${qt_modules_optional//Qt/Qt5}], [
+        AM_CPPFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}"
+        MOC_FLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}"
+        AM_CXXFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}"
+        LIBS+=" ${[$1]5_OPTIONAL_LIBS}"
+      ], [
+        AC_MSG_NOTICE([Not found: ${qt_modules_optional//Qt/Qt5}])
+      ])
+    fi
   ], [
     PKG_CHECK_MODULES([$1], [${qt_modules}], [
       HAVE_$1=1
       AC_DEFINE([HAVE_$1])
       AM_CPPFLAGS+=" ${$1_CFLAGS}"
+      MOC_FLAGS+=" -DHAVE_$1=1 ${$1_CFLAGS}"
       AM_CXXFLAGS+=" ${$1_CFLAGS}"
       LIBS+=" ${$1_LIBS}"
+      if test -n "$3"; then
+        PKG_CHECK_MODULES($1_OPTIONAL, [${qt_modules_optional}], [
+          AM_CPPFLAGS+=" ${$1_OPTIONAL_CFLAGS}"
+          MOC_FLAGS+=" ${$1_OPTIONAL_CFLAGS}"
+          AM_CXXFLAGS+=" ${$1_OPTIONAL_CFLAGS}"
+          LIBS+=" ${$1_OPTIONAL_LIBS}"
+        ], [
+          AC_MSG_NOTICE([Not found: ${qt_modules_optional}])
+        ])
+      fi
     ], [HAVE_$1=0])
   ])
   AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1)
   AX_CHECK_VALID_FLAG([-fPIC -fPIE], [position independent code flag])
   AC_SUBST(AM_CPPFLAGS)
+  AC_SUBST(MOC_FLAGS)
   AC_SUBST(AM_CXXFLAGS)
   AX_ADDITIONAL_QT_RULES_HACK='
-#BUILT_SOURCES += $(patsubst %.ui, ui_%.hxx, $(filter %.ui, $(SOURCES))))
-#BUILT_SOURCES += $(patsubst %.hxx, moc_%.cxx, $(shell grep -l Q_OBJECT $(HEADERS)))1
 ui_%.hxx: %.ui
-	${UIC} -o [$][@] $<
+	$(UIC) -o [$][@] $<
 
 moc_%.cxx: %.hxx
-	${MOC} -o [$][@] $<
+	$(MOC) $(MOC_FLAGS) -o [$][@] $<
 
 qrc_%.cxx: %.qrc
-	${RCC} -o [$][@] $<'
+	$(RCC) -o [$][@] $<'
   AC_SUBST(AX_ADDITIONAL_QT_RULES_HACK)
 ])
 
 AC_DEFUN([AX_REQUIRE_QT], [
-  AX_CHECK_QT([$1], [$2])
+  AX_CHECK_QT([$1], [$2], [$3])
   if ! test "$HAVE_$1" -eq 1; then
      AC_MSG_ERROR([Required Qt modules not found: $2])
   fi
-])
+])