fixes from several projects

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)

ax_init_standard_project.m4

@@ -430,7 +430,7 @@ AC_DEFUN([AX_PKG_REQUIRE], [
     ], [
       for x in ${$1_CFLAGS}; do
         AC_MSG_NOTICE([search for $3 in ${x[#]-I}])
-        for f in $(find ${x[#]-I} -name "$3"); do
+        for f in $(find ${x[#]-I} -name "$3" 2> /dev/null); do
           if test -f "$f"; then
             $1_found=${tmp_package}
             $1_CFLAGS+=" -I${f%/*}"
@@ -446,7 +446,7 @@ AC_DEFUN([AX_PKG_REQUIRE], [
         tmp_includedir=$(${PKG_CONFIG} --variable=includedir $tmp_package)
         for x in ${tmp_includedir}; do
           AC_MSG_NOTICE([search for $3 in $x])
-          for f in $(find ${x} -name "$3"); do
+          for f in $(find ${x} -name "$3" 2> /dev/null); do
             if test -f "$f"; then
               $1_found=${tmp_package}
               $1_CFLAGS+=" -I${f%/*}"
@@ -501,7 +501,7 @@ AC_DEFUN([AX_PKG_CHECK], [
   ], [
     HAVE_$1=0
   ])
-  AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1)
+  AM_CONDITIONAL(HAVE_$1, test $HAVE_[$1] -eq 1)
   AC_SUBST(HAVE_$1)
   AC_SUBST(CPPFLAGS)
   AC_SUBST(CXXFLAGS)
@@ -532,3 +532,95 @@ AC_DEFUN([AX_REQUIRE_HEADER], [
     ], [])
   ], [])
 ])
+
+# Check within a list of CPP-Flags for the first that is usable and
+# configure it
+#  - parameter:
+#     $1 = white-space separated list of alternative flags
+#     $2 = module name (optional, if different from id)
+AC_DEFUN([AX_CHECK_VALID_CPP_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 in $CPPFLAGS])
+])
+
+# Check within a list of CXX-Flags for the first that is usable and
+# configure it
+#  - parameter:
+#     $1 = white-space separated list of alternative flags
+#     $2 = module name (optional, if different from id)
+AC_DEFUN([AX_CHECK_VALID_CXX_FLAG], [
+  AC_MSG_CHECKING([m4_default([$2], [for valid flag in "$1"])])
+  save_cxxflags="$CXXFLAGS"
+  newflag="no"
+  for test_flag in $1; do
+    CXXFLAGS+=" ${test_flag}"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
+      newflag="$test_flag"
+      CXXFLAGS="$save_cxxflags"
+      CXXFLAGS+=" ${test_flag}"
+      break;
+    ])
+    CXXFLAGS="$save_cxxflags"
+  done
+  AC_SUBST(CXXFLAGS)
+  AC_MSG_RESULT([$newflag in $CXXFLAGS])
+])
+
+# Check within a list of C-Flags for the first that is usable and
+# configure it
+#  - parameter:
+#     $1 = white-space separated list of alternative flags
+#     $2 = module name (optional, if different from id)
+AC_DEFUN([AX_CHECK_VALID_C_FLAG], [
+  AC_MSG_CHECKING([m4_default([$2], [for valid flag in "$1"])])
+  save_cflags="$CFLAGS"
+  newflag="no"
+  for test_flag in $1; do
+    CFLAGS+=" ${test_flag}"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
+      newflag="$test_flag"
+      CFLAGS="$save_cflags"
+      CFLAGS+=" ${test_flag}"
+      break;
+    ])
+    CFLAGS="$save_cflags"
+  done
+  AC_SUBST(CFLAGS)
+  AC_MSG_RESULT([$newflag in $CFLAGS])
+])
+
+# Check within a list of LD-Flags for the first that is usable and
+# configure it
+#  - parameter:
+#     $1 = white-space separated list of alternative flags
+#     $2 = module name (optional, if different from id)
+AC_DEFUN([AX_CHECK_VALID_LD_FLAG], [
+  AC_MSG_CHECKING([m4_default([$2], [for valid flag in "$1"])])
+  save_ldflags="$LDFLAGS"
+  newflag="no"
+  for test_flag in $1; do
+    LDFLAGS+=" ${test_flag}"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
+      newflag="$test_flag"
+      LDFLAGS="$save_ldflags"
+      LDFLAGS+=" ${test_flag}"
+      break;
+    ])
+    LDFLAGS="$save_ldflags"
+  done
+  AC_SUBST(LDFLAGS)
+  AC_MSG_RESULT([$newflag in $LDFLAGS])
+])

bootstrap.sh

@@ -842,6 +842,7 @@ This Package contains all files required for developement.
 /usr/%_lib/pkgconfig
 /usr/include/*
 %doc
+/usr/share/@PACKAGE_NAME@
 /usr/share/doc/packages/@PACKAGE_NAME@/html
 EOF2
 fi)
@@ -865,6 +866,7 @@ ${HEADER}prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=\${exec_prefix}/lib
 includedir=\${prefix}/include
+translationsdir=@datadir@/@PACKAGE_NAME@/translations
 
 Name: @PACKAGE_NAME@
 Description: @DESCRIPTION@