basic android abb works, distcheck fails; refs #24

ax_check_qt.m4

@@ -38,6 +38,7 @@
 
 
 AC_DEFUN([AX_CXX_QT_TOOL], [
+  PKG_PROG_PKG_CONFIG
   if test -z "$HAVE_$1"; then
     HAVE_$1=1
     AC_MSG_CHECKING([for $2])
@@ -61,7 +62,7 @@ AC_DEFUN([AX_CXX_QT_TOOL], [
       fi
     fi
     AC_SUBST($1)
-    AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1)
+    AM_CONDITIONAL(HAVE_$1, test $HAVE_[$1] -eq 1)
     if test $HAVE_$1 -eq 1; then
       AC_MSG_RESULT([$$1])
     else
@@ -79,24 +80,6 @@ AC_DEFUN([AX_CXX_QT_TOOLS], [
   AX_CXX_QT_TOOL(LRELEASE, lrelease)
 ])
 
-AC_DEFUN([AX_CHECK_VALID_FLAG], [
-  AC_MSG_CHECKING([m4_default([$2], [for valid flag in "$1"])])
-  save_cppflags="$CPPFLAGS"
-  newflag="no"
-  for test_flag in $1; do
-    CPPFLAGS+=" ${test_flag}"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
-      newflag="$test_flag"
-      CPPFLAGS="$save_cppflags"
-      CPPFLAGS+=" ${test_flag}"
-      break;
-    ])
-    CPPFLAGS="$save_cppflags"
-  done
-  AC_SUBST(CPPFLAGS)
-  AC_MSG_RESULT([$newflag])
-])
-
 AC_DEFUN([AX_CHECK_QT], [
   qt_modules="$2"
   qt_modules_optional="$3"
@@ -148,8 +131,11 @@ AC_DEFUN([AX_CHECK_QT], [
       fi
     ], [HAVE_$1=0])
   ])
-  AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1)
-  AX_CHECK_VALID_FLAG([-fPIC -fPIE], [position independent code flag])
+  AM_CONDITIONAL(HAVE_$1, test $HAVE_[$1] -eq 1)
+  AX_CHECK_VALID_CXX_FLAG([-fPIC -fPIE], [position independent code flag])
+  if test "${MINGW}" != "no"; then
+    AX_CHECK_VALID_CXX_FLAG([-Wl,-subsystem,windows], [windows console flag])
+  fi
   AC_SUBST(QTDIR)
   AC_SUBST(QT_PLUGIN_PATH)
   AC_SUBST(CPPFLAGS)
@@ -176,7 +162,7 @@ qrc_%.cxx: %.qrc
 %.qm: %.ts
 	${LRELEASE} $< -qm [$][@]
 
-#%.ts: ${LANGUAGE_FILES}
+#%.ts: ${LANGUAGE_FILES:%=%}
 #	${LUPDATE} -no-obsolete \
 #	           -target-language ${@:${LANGUAGE_FILE_BASE}_%.ts=%} \
 #	           -ts [$][@] $<