compiles for mingw now

ax_check_qt.m4

@@ -42,10 +42,10 @@ AC_DEFUN([AX_CXX_QT_TOOL], [
     HAVE_$1=1
     AC_MSG_CHECKING([for $2])
     AC_ARG_VAR([$1], [path to Qt tool $2])
-    $1=${$1:-$(pkg-config --variable=$2_location Qt5Core)}
-    $1=${$1:-$(pkg-config --variable=host_bins Qt5Core)/$2}
-    $1=${$1:-$(pkg-config --variable=$2_location QtCore)}
-    $1=${$1:-$(pkg-config --variable=host_bins QtCore)/$2}
+    $1=${$1:-$(${ac_tool_prefix}pkg-config --variable=$2_location Qt5Core)}
+    $1=${$1:-$(${ac_tool_prefix}pkg-config --variable=host_bins Qt5Core)/$2}
+    $1=${$1:-$(${ac_tool_prefix}pkg-config --variable=$2_location QtCore)}
+    $1=${$1:-$(${ac_tool_prefix}pkg-config --variable=host_bins QtCore)/$2}
     if ! which "${$1%% *}" > /dev/null; then
       if which "$2" > /dev/null; then
         $1=$2
@@ -75,19 +75,19 @@ AC_DEFUN([AX_CXX_QT_TOOLS], [
 
 AC_DEFUN([AX_CHECK_VALID_FLAG], [
   AC_MSG_CHECKING([m4_default([$2], [for valid flag in "$1"])])
-  save_cxxflags="$CXXFLAGS"
+  save_cppflags="$CPPFLAGS"
   newflag="no"
   for test_flag in $1; do
-    CXXFLAGS+=" ${test_flag}"
+    CPPFLAGS+=" ${test_flag}"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
       newflag="$test_flag"
-      AM_CXXFLAGS+=" ${test_flag}"
-      CXXFLAGS="$save_cxxflags"
+      CPPFLAGS="$save_cppflags"
+      CPPFLAGS+=" ${test_flag}"
       break;
     ])
-    CXXFLAGS="$save_cxxflags"
+    CPPFLAGS="$save_cppflags"
   done
-  AC_SUBST(AM_CXXFLAGS)
+  AC_SUBST(CPPFLAGS)
   AC_MSG_RESULT([$newflag])
 ])
 
@@ -100,28 +100,20 @@ AC_DEFUN([AX_CHECK_QT], [
   PKG_CHECK_MODULES([$1]5, [${qt_modules//Qt/Qt5}], [
     HAVE_$1=1
     AC_DEFINE([HAVE_$1])
-    AM_CPPFLAGS+=" ${[$1]5_CFLAGS}"
+    QTDIR=$(${ac_tool_prefix}pkg-config --variable=prefix Qt5Core)
+    QT_PLUGIN_PATH=${QTDIR}/share/qt5/plugins
+    CPPFLAGS+=" ${[$1]5_CFLAGS}"
     MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}"
-    AM_CXXFLAGS+=" ${[$1]5_CFLAGS}"
+    CXXFLAGS+=" ${[$1]5_CFLAGS}"
     LIBS+=" ${[$1]5_LIBS}"
-    modules=${qt_modules//Qt/Qt5}
-    if test -z "$PKG_REQUIREMENTS"; then
-      PKG_REQUIREMENTS="${modules// /, }"
-    else
-      PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, ${modules// /, }"
-    fi
+    PKG_REQUIREMENTS+=" ${qt_modules//Qt/Qt5}"
     if test -n "${qt_modules_optional}"; then
       PKG_CHECK_MODULES([$1]5_OPTIONAL, [${qt_modules_optional//Qt/Qt5}], [
-        AM_CPPFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}"
+        CPPFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}"
         MOC_FLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}"
-        AM_CXXFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}"
+        CXXFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}"
         LIBS+=" ${[$1]5_OPTIONAL_LIBS}"
-        modules=${qt_modules_optional//Qt/Qt5}
-        if test -z "$PKG_REQUIREMENTS"; then
-          PKG_REQUIREMENTS="${modules// /, }"
-        else
-          PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, ${modules// /, }"
-        fi
+        PKG_REQUIREMENTS+=" ${qt_modules_optional//Qt/Qt5}"
       ], [
         AC_MSG_NOTICE([Not found: ${qt_modules_optional//Qt/Qt5}])
       ])
@@ -130,28 +122,20 @@ AC_DEFUN([AX_CHECK_QT], [
     PKG_CHECK_MODULES([$1], [${qt_modules}], [
       HAVE_$1=1
       AC_DEFINE([HAVE_$1])
-      AM_CPPFLAGS+=" ${$1_CFLAGS}"
+      QTDIR=$(${ac_tool_prefix}pkg-config --variable=prefix QtCore)
+      QT_PLUGIN_PATH=${QTDIR}/share/qt/plugins
+      CPPFLAGS+=" ${$1_CFLAGS}"
       MOC_FLAGS+=" -DHAVE_$1=1 ${$1_CFLAGS}"
-      AM_CXXFLAGS+=" ${$1_CFLAGS}"
+      CXXFLAGS+=" ${$1_CFLAGS}"
       LIBS+=" ${$1_LIBS}"
-      modules=${qt_modules}
-      if test -z "$PKG_REQUIREMENTS"; then
-        PKG_REQUIREMENTS="${modules// /, }"
-      else
-        PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, ${modules// /, }"
-      fi
+      PKG_REQUIREMENTS+=" ${qt_modules}"
       if test -n "$3"; then
         PKG_CHECK_MODULES($1_OPTIONAL, [${qt_modules_optional}], [
-          AM_CPPFLAGS+=" ${$1_OPTIONAL_CFLAGS}"
+          CPPFLAGS+=" ${$1_OPTIONAL_CFLAGS}"
           MOC_FLAGS+=" ${$1_OPTIONAL_CFLAGS}"
-          AM_CXXFLAGS+=" ${$1_OPTIONAL_CFLAGS}"
+          CXXFLAGS+=" ${$1_OPTIONAL_CFLAGS}"
           LIBS+=" ${$1_OPTIONAL_LIBS}"
-          modules=${qt_modules_optional}
-          if test -z "$PKG_REQUIREMENTS"; then
-            PKG_REQUIREMENTS="${modules// /, }"
-          else
-            PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, ${modules// /, }"
-          fi
+          PKG_REQUIREMENTS+=" ${qt_modules_optional}"
         ], [
           AC_MSG_NOTICE([Not found: ${qt_modules_optional}])
         ])
@@ -160,11 +144,16 @@ AC_DEFUN([AX_CHECK_QT], [
   ])
   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(QTDIR)
+  AC_SUBST(QT_PLUGIN_PATH)
+  AC_SUBST(CPPFLAGS)
   AC_SUBST(MOC_FLAGS)
-  AC_SUBST(AM_CXXFLAGS)
+  AC_SUBST(CXXFLAGS)
   AC_SUBST(PKG_REQUIREMENTS)
   AX_ADDITIONAL_QT_RULES_HACK='
+
+LANGUAGE_FILE_BASE ?= translations
+
 ui_%.hxx: %.ui
 	$(UIC) -o [$][@] $<
 
@@ -172,9 +161,21 @@ moc_%.cxx: %.hxx
 	$(MOC) $(MOC_FLAGS) -o [$][@] $<
 
 qrc_%.cxx: %.qrc
-	$(RCC) -o [$][@] $<'
+	$(RCC) -o [$][@] -name ${<:%.qrc=%} $<
   AC_SUBST(AX_ADDITIONAL_QT_RULES_HACK)
-])
+
+#%.qrc: %
+#	cwd=$$(pwd) && cd $< && $(RCC) -project -o $${cwd}/[$][@]
+
+%.qm: %.ts
+	${LRELEASE} $< -qm [$][@]
+
+#%.ts: ${LANGUAGE_FILES}
+#	${LUPDATE} -no-obsolete \
+#	           -target-language ${@:${LANGUAGE_FILE_BASE}_%.ts=%} \
+#	           -ts [$][@] $<
+
+'])
 
 # SYNOPSIS
 #
@@ -222,5 +223,5 @@ AC_DEFUN([AX_REQUIRE_QT], [
 #     AX_QT_NO_KEYWORDS
 
 AC_DEFUN([AX_QT_NO_KEYWORDS], [
-  AM_CPPFLAGS+=" -DQT_NO_KEYWORDS"
+  CPPFLAGS+=" -DQT_NO_KEYWORDS"
 ])

ax_init_standard_project.m4

@@ -68,7 +68,7 @@ dnl refers to ${prefix}.  Thus we have to use `eval' twice.
 #     $3 = filename of makefile.in
 AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [
   sh_add_makefile_target_dep() {
-    sed -i ':a;/^'${1}':.*\\$/{N;s/\\\n//;ta};s/^'${1}':.*$/& '${2}'/' "${srcdir}/${3}"
+    sed -i -e ':a;/^'${1}':.*\\$/{N;s/\\\n//;ta};s/^'${1}':.*$/& '${2}'/' "${srcdir}/${3}"
     if ! egrep -q "${1}:.* ${2}" "${srcdir}/${3}"; then
         echo "${1}: ${2}" >> "${srcdir}/${3}"
     fi
@@ -108,7 +108,15 @@ AC_DEFUN([AX_SUBST], [
 #
 # configures the basic environment
 AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
-  AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_NAME}'"
+  MINGW=no
+  MAC=no
+  case $host in
+    *mingw*) MINGW=yes;;
+    *darwin* | *rhapsody* | *macosx*) MAC=yes;;
+  esac
+  AM_CONDITIONAL(MINGW, test "$MINGW" = "yes")
+  AM_CONDITIONAL(MAC, test "$MAC" = "yes")
+  AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_NAME//-/_}'"
   AX_SUBST(NUMBERS)
   AX_SUBST(HOME)
   README=$(tail -n +3 README)
@@ -134,6 +142,21 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
      PROJECT_ICON="${PROJECT_NAME}-icon.png"
   fi
   AX_SUBST(PROJECT_ICON)
+
+  AC_ARG_ENABLE(pedantic,
+    [AS_HELP_STRING([--enable-pedantic],
+                    [enable all warnings and checks, abort on warnings])],
+    [have_pedantic="$enableval"; test "$enableval" = "yes" &&  \
+       AM_CXXFLAGS="${AM_CXXFLAGS:-} -pedantic-errors -Wall -W -Wfloat-equal -Wundef -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Wmissing-format-attribute -Wno-multichar -Wpacked -Wredundant-decls -Werror -Wshadow -Wcast-qual -Wno-ctor-dtor-privacy"])
+  dnl problem in libs: -Wshadow -Wcast-qual
+  dnl auto.hpp: -Wno-ctor-dtor-privacy (removed)
+  AM_CONDITIONAL(PEDANTIC, test "$enableval" = "yes")
+  if test "$have_pedantic" == "yes"; then
+    AC_MSG_NOTICE([Pedantic compile mode enabled!
+     - all warnings for GNU g++ are enabled
+     - all warnings result in an error
+     - doxygen warnings are treated as error too]); fi
+
   AC_CONFIG_FILES([makefile])
   AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-standard-project-targets], [makefile.in])
   AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-standard-project-targets], [makefile.in])
@@ -174,35 +197,21 @@ AC_DEFUN([AX_USE_CXX], [
   AM_DISTCHECK_CONFIGURE_FLAGS="CXXFLAGS='${CXXFLAGS}' CPPFLAGS='${CPPFLAGS}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
   AC_SUBST(AM_DISTCHECK_CONFIGURE_FLAGS)
 
-  AC_ARG_ENABLE(pedantic,
-    [AS_HELP_STRING([--enable-pedantic],
-                    [enable all warnings and checks, abort on warnings])],
-    [have_pedantic="$enableval"; test "$enableval" = "yes" &&  \
-       AM_CXXFLAGS="${AM_CXXFLAGS:-} -pedantic-errors -Wall -W -Wfloat-equal -Wundef -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Wmissing-format-attribute -Wno-multichar -Wpacked -Wredundant-decls -Werror -Wshadow -Wcast-qual -Wno-ctor-dtor-privacy"])
-  dnl problem in libs: -Wshadow -Wcast-qual
-  dnl auto.hpp: -Wno-ctor-dtor-privacy (removed)
-  AM_CONDITIONAL(PEDANTIC, test "$enableval" = "yes")
-  if test "$have_pedantic" == "yes"; then
-    AC_MSG_NOTICE([Pedantic compile mode enabled!
-     - all warnings for GNU g++ are enabled
-     - all warnings result in an error
-     - doxygen warnings are treated as error too]); fi
-
-  MINGW32=no
-  MAC=no
-  case $host_os in
-    *mingw32*) MINGW32=yes;;
-    *darwin* | *rhapsody* | *macosx*) MAC=yes;;
-  esac
-  AM_CONDITIONAL(MINGW32, test "$MINGW32" = "yes")
-  AM_CONDITIONAL(MAC, test "$MAC" = "yes")
-  
   AC_SUBST(AM_CXXFLAGS)
   AC_SUBST(AM_CPPFLAGS)
   AC_SUBST(AM_LDFLAGS)
   AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-cxx-targets], [src/makefile.in])
   test -f src/makefile.in && cat >> src/makefile.in <<EOF
 #### Begin: Appended by $0
+%.app: %
+	-rm -r [\$][@]
+	\$(MAKE) DESTDIR=[\$][\$](pwd)/[\$][@]/tmp install
+	QTDIR="\${QTDIR}" \
+	QT_PLUGINS="\${QT_PLUGINS}" \
+	QT_PLUGIN_PATH="\${QT_PLUGIN_PATH}" \
+	  \${top_builddir}/mac-create-app-bundle.sh \
+	    [\$][@] [\$][<] [\$][\$](pwd)/[\$][@]/tmp\${prefix}
+
 maintainer-clean-cxx-targets:
 	-rm makefile.in
 #### End: $0
@@ -239,10 +248,22 @@ maintainer-clean-example-targets:
 EOF
 ])
 
+# use this in configure.ac to support HTML data for webservers
+AC_DEFUN([AX_BUILD_HTML], [
+  AC_CONFIG_FILES([html/makefile])
+  AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-example-targets], [html/makefile.in])
+  test -f html/makefile.in && cat >> examples/html.in <<EOF
+#### Begin: Appended by $0
+maintainer-clean-example-targets:
+	-rm makefile.in
+#### End: $0
+EOF
+])
+
 # use this in configure.ac to support C++ libraries
 AC_DEFUN([AX_USE_LIBTOOL], [
   # libtool versioning
-  LIB_MAJOR=m4_eval(x_major+x_minor)
+  LIB_MAJOR=m4_eval(x_major+x_minor_fixed)
   LIB_MINOR=x_least
   LIB_LEAST=x_minor_fixed
   LIB_VERSION="${LIB_MAJOR}:${LIB_MINOR}:${LIB_LEAST}"
@@ -361,7 +382,7 @@ EOF
 # require a specific package, with fallback: test for a header
 #  - parameter:
 #     $1 = unique id (no special characters)
-#     $2 = module name
+#     $2 = module name (optional, if different from id)
 #     $3 = a header file to find (optional)
 #     $4 = alternative module names (space separated, optional)
 #
@@ -372,92 +393,84 @@ EOF
 # fails if not found
 AC_DEFUN([AX_PKG_REQUIRE], [
   PKG_PROG_PKG_CONFIG
-  PKG_CHECK_MODULES([$1], [$2], [
-    if test -n "$3"; then
-      $1_found=0;
-      for p in ${$1_CFLAGS}; do
-        if test -e ${p#-I}/$3; then
-          $1_found=1
-          break
-        fi
-      done
-      if test ${$1_found} -eq 0; then
-        for p in /usr/include ${$1_CFLAGS}; do
-          $1_file=$(find ${p#-I} -name $3)
-          if test -e "${$1_file}"; then
-            AC_MSG_NOTICE([Header file $3 found in sub path as ${$1_file}])
-            $1_CFLAGS="${$1_CFLAGS} -I${$1_file%/$3}"
-            $1_found=1
-            break
-          fi
-        done
-      fi
-      if test ${$1_found} -eq 0; then
-        AC_MSG_WARN([Header file $3 not found in $1_CFLAGS = ${$1_CFLAGS}])
-      fi
-    fi
-    AM_CPPFLAGS+=" ${$1_CFLAGS}"
-    AM_CXXFLAGS+=" ${$1_CFLAGS}"
-    LIBS+=" ${$1_LIBS}"
-    if test -z "$PKG_REQUIREMENTS"; then
-      PKG_REQUIREMENTS="$2"
-    else
-      PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, $2"
-    fi
+  $1_found=no
+  secondpar="m4_default([$2], [$1])"
+  PKG_CHECK_MODULES([$1], [m4_default([$2], [$1])], [
+    $1_found=$secondpar
+    PKG_REQUIREMENTS+=" $secondpar"
   ], [
-    AC_MSG_WARN([Recommended package $2 for feature $1 not installed])
     if test -n "$4"; then
+      AC_MSG_WARN([Recommended package $secondpar for feature $1 not installed, trying $4])
       for pkg in $4; do
         PKG_CHECK_MODULES([$1], [$pkg], [
-          if test -n "$3"; then
-            $1_found=0;
-            for p in ${$1_CFLAGS}; do
-              if test -e ${p#-I}/$3; then
-                $1_found=1
-                break
-              fi
-            done
-            if test ${$1_found} -eq 0; then
-              for p in /usr/include ${$1_CFLAGS}; do
-                $1_file=$(find ${p#-I} -name $3)
-                if test -e ${$1_file}; then
-		  AC_MSG_NOTICE([Header file $3 found in sub path as ${$1_file}])
-                  $1_CFLAGS="${$1_CFLAGS} -I${$1_file%/$3}"
-                  $1_found=1
-                  break
-                fi
-              done
-            fi
-            if test ${$1_found} -eq 0; then
-              AC_MSG_WARN([Header file $3 not found in $1_CFLAGS = ${$1_CFLAGS}])
-            fi
-          fi
-          AM_CPPFLAGS+=" ${$1_CFLAGS}"
-          AM_CXXFLAGS+=" ${$1_CFLAGS}"
-          LIBS+=" ${$1_LIBS}"
-          if test -z "$PKG_REQUIREMENTS"; then
-            PKG_REQUIREMENTS="$pkg"
-          else
-            PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, $pkg"
-          fi
+          PKG_REQUIREMENTS+=" $pkg"
+          $1_found=$pkg
+          break;
         ], [
           AC_MSG_WARN([Recommended package $pkg for feature $1 not installed])
         ])
       done
     fi
   ])
-  AC_SUBST(AM_CPPFLAGS)
-  AC_SUBST(AM_CXXFLAGS)
+  AC_SUBST(CPPFLAGS)
+  AC_SUBST(CXXFLAGS)
   AC_SUBST(PKG_REQUIREMENTS)
-  if test -n "$3"; then
+  if test -n "$3" -a "${$1_found}" != "no"; then
+    tmp_package=${$1_found}
+    $1_found=no
     old_CPPFLAGS=${CPPFLAGS}
     CPPFLAGS=" ${$1_CFLAGS} ${CPPFLAGS}"
     AC_CHECK_HEADER([$3], [
+      $1_found=${tmp_package}
     ], [
-      AC_MSG_ERROR([Required header $3 for feature $1 not found])
+      for x in ${$1_CFLAGS}; do
+        AC_MSG_NOTICE([search for $3 in ${x[#]-I}])
+        for f in $(find ${x[#]-I} -name "$3"); do
+          if test -f "$f"; then
+            $1_found=${tmp_package}
+            $1_CFLAGS+=" -I${f%/*}"
+            AC_MSG_NOTICE([added path ${f%/*}])
+            break;
+          fi
+        done
+        if test "${$1_found}" != "no"; then
+          break;
+        fi
+      done
+      if test "${$1_found}" = "no"; then
+        tmp_includedir=$(${ac_tool_prefix}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
+            if test -f "$f"; then
+              $1_found=${tmp_package}
+              $1_CFLAGS+=" -I${f%/*}"
+              AC_MSG_NOTICE([added path ${f%/*}])
+              break;
+            fi
+          done
+          if test "${$1_found}" != "no"; then
+            break;
+          fi
+        done
+      fi
     ])
     CPPFLAGS=${old_CPPFLAGS}
   fi
+  if test "${$1_found}" = "no"; then
+    if test -n "$3"; then
+      if test -n "$4"; then
+        AC_MSG_ERROR([Feature $1 not found, need header $3 in modules $secondpar or $4])
+      else
+        AC_MSG_ERROR([Feature $1 not found, need header $3 in module $secondpar])
+      fi
+    else
+      AC_MSG_ERROR([Feature $1 not found please install module $secondpar])
+    fi
+  fi
+  CPPFLAGS+=" ${$1_CFLAGS}"
+  CXXFLAGS+=" ${$1_CFLAGS}"
+  LIBS+=" ${$1_LIBS}"
 ])
 
 # check if a specific package exists
@@ -472,8 +485,8 @@ AC_DEFUN([AX_PKG_CHECK], [
   PKG_PROG_PKG_CONFIG
   PKG_CHECK_MODULES([$1], [m4_default([$2], [$1])], [
     HAVE_$1=1
-    AM_CPPFLAGS+=" ${$1_CFLAGS}"
-    AM_CXXFLAGS+=" ${$1_CFLAGS}"
+    CPPFLAGS+=" ${$1_CFLAGS}"
+    CXXFLAGS+=" ${$1_CFLAGS}"
     LIBS+=" ${$1_LIBS}"
     if test -z "$PKG_REQUIREMENTS"; then
       PKG_REQUIREMENTS="m4_default([$2], [$1])"
@@ -485,7 +498,32 @@ AC_DEFUN([AX_PKG_CHECK], [
   ])
   AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1)
   AC_SUBST(HAVE_$1)
-  AC_SUBST(AM_CPPFLAGS)
-  AC_SUBST(AM_CXXFLAGS)
+  AC_SUBST(CPPFLAGS)
+  AC_SUBST(CXXFLAGS)
   AC_SUBST(PKG_REQUIREMENTS)
 ])
+
+# make sure, a specific header exists
+# - parameter:
+#    $1 = header name
+AC_DEFUN([AX_REQUIRE_HEADER], [
+  AC_CHECK_HEADER($1, [], [
+    if test -n "$2"; then
+      found=0
+      for d in $2; do
+        if test -f "${d}/$1"; then
+          AC_MSG_NOTICE([found file ${d}/$1])
+          CPPFLAGS+=" -I${d}"
+          found=1
+          break;
+        else
+          AC_MSG_NOTICE([not found file ${d}/$1])
+        fi
+      done
+    fi
+    if test $found -eq 0; then
+      AC_MSG_ERROR([Header $1 not found])
+    fi
+    ], [])
+  ], [])
+])

bootstrap.sh

@@ -17,7 +17,6 @@
 MY_NAME=${0##*/}
 PROJECT_PATH=$(pwd)
 DEFAULT_PROJECT_NAME=${PROJECT_PATH##*/}
-
 configure=0
 build=0
 overwrite=0
@@ -101,12 +100,14 @@ GENERATED FILES
     * ax_init_standard_project.m4 - auxiliary macro definition file
     * ax_cxx_compile_stdcxx_11.m4 - auxiliary macro definition file
     * ax_check_qt.m4 - auxiliary macro definition file
+    * mac-create-app-bundle.sh - script to create apple mac os-x app-bundle
     * AUTHORS - replace your name in AUTHORS before first run
     * configure.ac - global configuration file template
     * makefile.am - global makefile template
     * src/makefile.am - if you enabled AX_USE_CXX
     * src/version.hxx - if you enabled AX_USE_CXX
     * src/version.cxx - if you enabled AX_USE_CXX
+    * html/makefile.am - if you enabled AX_BUILD_HTML
     * scripts/makefile.in - if you enabled AX_USE_SCRIPTS
     * doc/makefile.am - if you enabled AX_USE_DOXYGEN
     * doc/doxyfile.in - if you enabled AX_USE_DOXYGEN
@@ -121,6 +122,7 @@ GENERATED FILES
     * debian/${DEFAULT_PROJECT_NAME}-dev.dirs - if you enabled AX_USE_DEBIAN_PACKAGING
     * debian/rules - if you enabled AX_USE_DEBIAN_PACKAGING
     * debian/compat - if you enabled AX_USE_DEBIAN_PACKAGING
+    * ${DEFAULT_PROJECT_NAME}.spec.in - if you enable AX_USE_RPM_PACKAGING
     * src/${DEFAULT_PROJECT_NAME}.pc.in - if you enabled AX_USE_LIBTOOL
 
 REBUILDING FILES
@@ -147,6 +149,7 @@ FILES TO EDIT
     * README
     * configure.ac
     * src/makefile.am
+    * html/makefile.am
     * test/makefile.am
     * examples/makefile.am
 
@@ -156,6 +159,7 @@ FILE DEPENDENCIES
   configuration a dependent, i.e.:
 
     * test/makefile.am depends on AX_USE_LIBTOOL
+    * html/makefile.am depends on AX_BUILD_HTML
     * doc/doxyfile.in depends on AX_BUILD_EXAMPLES
     * debian/control.in depends on AX_USE_DOXYGEN, AX_USE_CPPUNIT,
       AX_CXX_QT, AX_CXX_CHECK_QT, AX_USE_LIBTOOL
@@ -163,6 +167,8 @@ FILE DEPENDENCIES
     * debian/${DEFAULT_PROJECT_NAME}.dirs depends on AX_USE_LIBTOOL
     * debian/${DEFAULT_PROJECT_NAME}-dev.install depends on AX_USE_LIBTOOL
     * debian/${DEFAULT_PROJECT_NAME}-dev.dirs depends on AX_USE_LIBTOOL
+    * ${DEFAULT_PROJECT_NAME}.spec.in dependson AX_USE_RPM_PACKAGING,
+      AX_USE_LIBTOOL, AX_CXX_CHECK_QT, AX_CXX_QT, AX_USE_CPPUNIT
 
 FILES
 
@@ -189,7 +195,7 @@ FILES
       * Enable Scripts: AX_USE_SCRIPTS
       * Enable Doxygen documentation generation: AX_USE_DOXYGEN
       * Enable Debian packaging by calling "make deb": AX_USE_DEBIAN_PACKAGING
-      * Not yet implemented: AX_USE_RPM_PACKAGING
+      * Enable RPM packaging by calling "make rpm": AX_USE_RPM_PACKAGING
       * Enable C++ testing using CppUnit: AX_USE_CPPUNIT
       * Enable C++ examples, i.e. for libraries: AX_BUILD_EXAMPLES
       * Check for C++11 support: AX_CXX_COMPILE_STDCXX_11 (see ax_cxx_compile_stdcxx_11.m4)
@@ -233,6 +239,10 @@ HEADER='## @id '"\$Id\$"'
 
 '
 
+notice() {
+    echo -e "\e[1;33m$*\e[0m"
+}
+
 run() {
     check=1
     while test $# -gt 0; do
@@ -291,7 +301,7 @@ to() {
         mode="u=rw,g=rw,o=r"
         case "$1" in
             (--condition) shift # test for a tag, abort if not set
-                if ! testtag "$1" configure.ac; then
+                if ! testtag "$1"; then
                     return
                 fi;;
             (--mode) shift # test for a tag, abort if not set
@@ -300,7 +310,7 @@ to() {
         esac
         shift;
     done
-    if checkfile "$1" && test $rebuild -eq 0 \
+    if checkfile "$1" && test $rebuild -eq 0 -o "$1" = "configure.ac" \
         && ! contains "$1" "${rebuildfiles[@]}"; then
         # file already exists and must not be rebuilt
         return 1
@@ -367,9 +377,16 @@ copy ${MY_NAME}
 copy ax_init_standard_project.m4
 copy ax_cxx_compile_stdcxx_11.m4
 copy ax_check_qt.m4
-copy AUTHORS
+copy mac-create-app-bundle.sh
+AUTHOR=$(gpg -K  | sed -n 's,uid *,,p' | sort | head -1)
+if test -z "${AUTHOR}"; then
+    AUTHOR="FIRSTNAME LASTNAME (URL) <EMAIL>"
+fi
+to AUTHORS <<EOF && notice "please edit AUTHORS"
+$AUTHOR
+EOF
 to configure.ac <<EOF && \
-    ( echo "please edit configure.ac, then rerun $0"; exit 0 )
+    ( notice "please edit configure.ac, then rerun $0"; exit 0 )
 ${HEADER}m4_define(x_package_name, ${DEFAULT_PROJECT_NAME}) # project's name
 m4_define(x_major, 0) # project's major version
 m4_define(x_minor, 0) # project's minor version
@@ -387,16 +404,91 @@ AX_INIT_STANDARD_PROJECT
 #AX_USE_RPM_PACKAGING
 #AX_USE_CPPUNIT
 #AX_BUILD_EXAMPLES
+#AX_BUILD_HTML
 
 # qt features, uncomment, what you need:
 #AX_CHECK_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets])
-#AM_CPPFLAGS="${AM_CPPFLAGS} -DQT_NO_KEYWORDS"
+#AX_QT_NO_KEYWORDS
 
 # create output
 AC_OUTPUT
 EOF
 PACKAGE_NAME=$(sed -n 's/.*m4_define *( *x_package_name *, *\([^ ]*\) *).*/\1/p' configure.ac)
-echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_CXX src/makefile.am
+if ! testtag "AX_CHECK_QT" configure.ac && \
+   ! testtag "AX_REQUIRE_QT" configure.ac; then
+    echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | \
+        to --condition AX_USE_CXX src/makefile.am
+else
+    to --condition AX_USE_CXX src/makefile.am <<EOF
+${HEADER}bin_PROGRAMS = ${PACKAGE_NAME}
+
+## required to enable the translation feature
+LANGUAGE_FILE_BASE = ${PACKAGE_NAME}
+
+## list here the Qt plugins your project depends on
+## required to build Mac OS-X app-bundle
+QT_PLUGINS = iconengines imageformats platforms
+
+#### enable if you deliver a KDE/Gnome desktop file
+#applicationsdir = ${datarootdir}/applications
+#dist_applications_DATA = ${PACKAGE_NAME}.desktop
+
+#### enable (ev. instead of bin_PROGRAMS) if you build a library
+#lib_LTLIBRARIES = ${PACKAGE_NAME}.la
+#${PACKAGE_NAME}_la_SOURCES = libmain.cxx version.cxx
+## noop to prevent:
+## «src/makefile.am: error: object 'version.\$(OBJEXT)' created both with
+## libtool and without»
+#${PACKAGE_NAME}_la_CXXFLAGS = \$(AM_CXXFLAGS)
+
+## list headers that are required for build, but that are not installed
+noinst_HEADERS = version.hxx
+
+## list all %.hxx files with Q_OBJECT as moc_%.cxx
+${PACKAGE_NAME//-/_}_MOCFILES = moc_${PACKAGE_NAME}.cxx
+
+## list all %.ui files as ui_%.hxx
+${PACKAGE_NAME//-/_}_UIFILES = ui_${PACKAGE_NAME}.hxx
+
+## list all %.qrc resource files as qrc_%.cxx
+## note: if there exists a directory %, the file %.qrc is generated from that
+${PACKAGE_NAME//-/_}_RESOURCES = qrc_languages.cxx qrc_resources.cxx
+
+## list all final translation files, list all supported languages here
+${PACKAGE_NAME//-/_}_TRANSLATIONS = \${LANGUAGE_FILE_BASE}_en.qm	\\
+     \${LANGUAGE_FILE_BASE}_de.qm \\
+     \${LANGUAGE_FILE_BASE}_fr.qm \\
+     \${LANGUAGE_FILE_BASE}_it.qm
+
+## list all C++ files that need translation
+${PACKAGE_NAME//-/_}_TR_FILES = main.cxx version.cxx
+
+## automatic assembly, no need to change
+${PACKAGE_NAME//-/_}_SOURCES = ${swisssign_pin_entry_TR_FILES} ${BUILT_SOURCES}
+
+## automatic assembly, no need to change
+BUILT_SOURCES = \${${PACKAGE_NAME//-/_}_MOCFILES} \
+                \${${PACKAGE_NAME//-/_}_UIFILES} \
+                \${${PACKAGE_NAME//-/_}_TRANSLATIONS} \
+                \${${PACKAGE_NAME//-/_}_RESOURCES}
+
+## automatic assembly, no need to change
+EXTRA_DIST_TR = \${${PACKAGE_NAME//-/_}_MOCFILES:moc_%.cxx=%.hxx} \
+                \${${PACKAGE_NAME//-/_}_UIFILES:ui_%.hxx=%.ui}
+
+## automatic assembly, no need to change
+## except: adapt the pre-delivered qt_%.qm list (language files you copy from qt
+EXTRA_DIST = \${EXTRA_DIST_TR} \
+             \${${PACKAGE_NAME//-/_}_RESOURCES:qrc_%.cxx:%.qrc} \
+             \${${PACKAGE_NAME//-/_}_TRANSLATIONS:%.qm=%.ts} \
+             qt_de.qm qt_fr.qm
+
+## automatic assembly, no need to change
+LANGUAGE_FILES = \${EXTRA_DIST_TR} \${${PACKAGE_NAME//-/_}_TR_FILES}
+
+MAINTAINERCLEANFILES = makefile.in
+EOF
+fi
 to --condition AX_USE_CXX src/version.hxx <<EOF
 /*! @file
 
@@ -477,91 +569,102 @@ EOF
 echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_SCRIPTS scripts/makefile.am
 echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_DOXYGEN doc/makefile.am
 to --condition AX_USE_CPPUNIT test/makefile.am <<EOF
-${HEADER}AM_CPPFLAGS = -I${top_srcdir}/src -I${top_builddir}/src
-AM_LDFLAGS = -L${top_builddir}/src/.libs
-LDADD = -l${PACKAGE_NAME}
+${HEADER}AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src
+AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs
+LDADD = -l${PACKAGE_NAME#lib}
 
 MAINTAINERCLEANFILES = makefile.in
 EOF
 to --condition AX_BUILD_EXAMPLES examples/makefile.am <<EOF
-${HEADER}AM_CPPFLAGS = -I${top_srcdir}/src -I${top_builddir}/src
-AM_LDFLAGS = -L${top_builddir}/src/.libs
-LDADD = -l${PACKAGE_NAME}
+${HEADER}AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src
+AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs
+LDADD = -l${PACKAGE_NAME#lib}
 
 MAINTAINERCLEANFILES = makefile.in
 EOF
-if testtag AX_USE_DOXYGEN && \
-    ( ! checkfile doc/doxyfile.in || \
-      contains doc/doxyfile.in "${rebuildfiles[@]}" ); then
-    run doxygen -g doc/doxyfile.in
-    if test $exists -eq 0; then
-        run svn add doc/doxyfile.in
-        run svn propset svn:keywords "Id" doc/doxyfile.in
-    fi
-    doxyreplace PROJECT_NAME "@PACKAGE_NAME@"
-    doxyreplace PROJECT_NUMBER "@PACKAGE_VERSION@"
-    doxyreplace PROJECT_BRIEF "@DESCRIPTION@"
-    doxyreplace PROJECT_LOGO "@PROJECT_LOGO@"
-    doxyreplace INLINE_INHERITED_MEMB YES
-    doxyreplace MULTILINE_CPP_IS_BRIEF YES
-    doxyreplace TAB_SIZE 2
-    doxyreplace ALIASES '"id=\\par File-ID\\n"'
-    doxyadd ALIASES '"copy=\\par Copyright\\n"'
-    doxyadd ALIASES '"license=\\par License\\n"'
-    doxyadd ALIASES '"classmutex=\\par Reentrant:\\nAccess is locked with class static mutex @c "'
-    doxyadd ALIASES '"instancemutex=\\par Reentrant:\\nAccess is locked with per instance mutex @c "'
-    doxyadd ALIASES '"mutex=\\par Reentrant:\\nAccess is locked with mutex @c "'
-    doxyreplace ENABLE_PREPROCESSING YES
-    doxyreplace MACRO_EXPANSION YES
-    doxyadd PREDEFINED '"NAMESPACE=@PACKAGE_NAME@"'
-    doxyreplace BUILTIN_STL_SUPPORT YES
-    doxyreplace DISTRIBUTE_GROUP_DOC YES
-    doxyreplace EXTRACT_ALL YES
-    doxyreplace EXTRACT_PACKAGE YES
-    doxyreplace EXTRACT_PRIVATE YES
-    doxyreplace EXTRACT_STATIC YES
-    doxyreplace EXTRACT_LOCAL_CLASSES YES
-    doxyreplace EXTRACT_LOCAL_METHODS YES
-    doxyreplace EXTRACT_ANON_NSPACES YES
-    doxyreplace SHOW_GROUPED_MEMB_INC YES
-    doxyreplace SORT_MEMBERS_CTORS_1ST YES
-    doxyreplace WARN_IF_UNDOCUMENTED NO
-    doxyreplace WARN_LOGFILE doxygen.errors
-    doxyreplace INPUT "@top_srcdir@/src"
-    if testtag AX_USE_SCRIPTS; then
-        doxyadd INPUT "@top_srcdir@/scripts"
-    fi
-    if testtag AX_USE_CPPUNIT; then
-        doxyadd INPUT "@top_srcdir@/test"
-    fi
-    doxyreplace FILE_PATTERNS '*.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.idl *.ddl *.odl *.h *.hh *.hxx *.hpp *.h++ *.cs *.d *.php *.php4 *.php5 *.phtml *.inc *.m *.markdown *.md *.mm *.dox *.py *.f90 *.f *.for *.tcl *.vhd *.vhdl *.ucf *.qsf *.as *.js'
-    doxyadd FILE_PATTERNS *.wt
-    doxyreplace RECURSIVE YES
-    doxyreplace EXCLUDE_PATTERNS "moc_* uic_* qrc_*"
-    if testtag AX_BUILD_EXAMPLES; then
-        doxyreplace EXAMPLE_PATH @top_srcdir@/examples
+to --condition AX_BUILD_HTML html/makefile.am <<EOF
+${HEADER}EXTRA_DIST = \${www_DATA}
+
+wwwdir = \${pkgdatadir}/html
+www_DATA = 
+
+MAINTAINERCLEANFILES = makefile.in
+EOF
+if testtag AX_USE_DOXYGEN; then
+    if ! checkfile doc/doxyfile.in || \
+        contains doc/doxyfile.in "${rebuildfiles[@]}"; then
+        run doxygen -g doc/doxyfile.in
+        if test $exists -eq 0; then
+            run svn add doc/doxyfile.in
+            run svn propset svn:keywords "Id" doc/doxyfile.in
+        fi
+        doxyreplace PROJECT_NAME "@PACKAGE_NAME@"
+        doxyreplace PROJECT_NUMBER "@PACKAGE_VERSION@"
+        doxyreplace PROJECT_BRIEF "@DESCRIPTION@"
+        doxyreplace PROJECT_LOGO "@PROJECT_LOGO@"
+        doxyreplace INLINE_INHERITED_MEMB YES
+        doxyreplace MULTILINE_CPP_IS_BRIEF YES
+        doxyreplace TAB_SIZE 2
+        doxyreplace ALIASES '"id=\\par File-ID\\n"'
+        doxyadd ALIASES '"copy=\\par Copyright\\n"'
+        doxyadd ALIASES '"license=\\par License\\n"'
+        doxyadd ALIASES '"classmutex=\\par Reentrant:\\nAccess is locked with class static mutex @c "'
+        doxyadd ALIASES '"instancemutex=\\par Reentrant:\\nAccess is locked with per instance mutex @c "'
+        doxyadd ALIASES '"mutex=\\par Reentrant:\\nAccess is locked with mutex @c "'
+        doxyreplace ENABLE_PREPROCESSING YES
+        doxyreplace MACRO_EXPANSION YES
+        doxyadd PREDEFINED '"NAMESPACE=@PACKAGE_NAME@"'
+        doxyreplace BUILTIN_STL_SUPPORT YES
+        doxyreplace DISTRIBUTE_GROUP_DOC YES
+        doxyreplace EXTRACT_ALL YES
+        doxyreplace EXTRACT_PACKAGE YES
+        doxyreplace EXTRACT_PRIVATE YES
+        doxyreplace EXTRACT_STATIC YES
+        doxyreplace EXTRACT_LOCAL_CLASSES YES
+        doxyreplace EXTRACT_LOCAL_METHODS YES
+        doxyreplace EXTRACT_ANON_NSPACES YES
+        doxyreplace SHOW_GROUPED_MEMB_INC YES
+        doxyreplace SORT_MEMBERS_CTORS_1ST YES
+        doxyreplace WARN_IF_UNDOCUMENTED NO
+        doxyreplace WARN_LOGFILE doxygen.errors
+        doxyreplace INPUT "@top_srcdir@/src"
+        if testtag AX_USE_SCRIPTS; then
+            doxyadd INPUT "@top_srcdir@/scripts"
+        fi
+        if testtag AX_BUILD_HTML; then
+            doxyadd INPUT "@top_srcdir@/html"
+        fi
+        if testtag AX_USE_CPPUNIT; then
+            doxyadd INPUT "@top_srcdir@/test"
+        fi
+        doxyreplace FILE_PATTERNS '*.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.idl *.ddl *.odl *.h *.hh *.hxx *.hpp *.h++ *.cs *.d *.php *.php4 *.php5 *.phtml *.inc *.m *.markdown *.md *.mm *.dox *.py *.f90 *.f *.for *.tcl *.vhd *.vhdl *.ucf *.qsf *.as *.js *.wt'
+        doxyreplace RECURSIVE YES
+        doxyreplace EXCLUDE_PATTERNS "moc_* uic_* qrc_*"
+        if testtag AX_BUILD_EXAMPLES; then
+            doxyreplace EXAMPLE_PATH @top_srcdir@/examples
+        fi
+        doxyreplace EXAMPLE_RECURSIVE YES
+        doxyreplace FILTER_PATTERNS '*.wt=doxygen-webtester.sed'
+        doxyreplace SOURCE_BROWSER YES
+        doxyreplace INLINE_SOURCES YES
+        doxyreplace GENERATE_TESTLIST YES
+        doxyreplace GENERATE_TREEVIEW NO
+        doxyreplace SEARCHENGINE YES
+        doxyreplace GENERATE_HTML YES
+        doxyreplace GENERATE_LATEX NO
+        doxyreplace LATEX_BATCHMODE YES
+        doxyreplace LATEX_HIDE_INDICES YES
+        doxyreplace COMPACT_RTF YES
+        doxyreplace RTF_HYPERLINKS YES
+        doxyreplace GENERATE_TAGFILE "@PACKAGE_NAME@.doxytag"
+        doxyreplace HIDE_UNDOC_RELATIONS NO
+        doxyreplace HAVE_DOT YES
+        doxyreplace CLASS_GRAPH YES
+        doxyreplace TEMPLATE_RELATIONS YES
+        doxyreplace DOT_IMAGE_FORMAT svg
+        doxyreplace INTERACTIVE_SVG YES
+        doxyreplace DOT_TRANSPARENT YES
     fi
-    doxyreplace EXAMPLE_RECURSIVE YES
-    doxyreplace FILTER_PATTERNS '*.wt=doxygen-webtester.sed'
-    doxyreplace SOURCE_BROWSER YES
-    doxyreplace INLINE_SOURCES YES
-    doxyreplace GENERATE_TESTLIST YES
-    doxyreplace GENERATE_TREEVIEW NO
-    doxyreplace SEARCHENGINE YES
-    doxyreplace GENERATE_HTML YES
-    doxyreplace GENERATE_LATEX NO
-    doxyreplace LATEX_BATCHMODE YES
-    doxyreplace LATEX_HIDE_INDICES YES
-    doxyreplace COMPACT_RTF YES
-    doxyreplace RTF_HYPERLINKS YES
-    doxyreplace GENERATE_TAGFILE "@PACKAGE_NAME@.doxytag"
-    doxyreplace HIDE_UNDOC_RELATIONS NO
-    doxyreplace HAVE_DOT YES
-    doxyreplace CLASS_GRAPH YES
-    doxyreplace TEMPLATE_RELATIONS YES
-    doxyreplace DOT_IMAGE_FORMAT svg
-    doxyreplace INTERACTIVE_SVG YES
-    doxyreplace DOT_TRANSPARENT YES
 fi
 if testtag AX_USE_DEBIAN_PACKAGING; then
     checkdir debian
@@ -576,10 +679,11 @@ EOF
 Source: @PACKAGE_NAME@
 Priority: extra
 Maintainer: @AUTHOR@
-Build-Depends: debhelper, pkg-config, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CXX_CHECK_QT; then echo -n ", qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools"; fi)
+Build-Depends: debhelper, subversion, pkg-config, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CXX_CHECK_QT; then echo -n ", qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools"; fi)
 
 Package: @PACKAGE_NAME@
-$(if testtag AX_USE_LIBTOOL; then echo "Section: libs"; fi)Architecture: any
+Section: $(if testtag AX_USE_LIBTOOL; then echo  "libs"; fi)
+Architecture: any
 Depends: \${shlibs:Depends}, \${misc:Depends}
 Description: @DESCRIPTION@
 @README_DEB@
@@ -616,8 +720,98 @@ ${HEADER}%:
 EOF
     echo 7 | to debian/compat
 fi
+to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME}.spec.in <<EOF
+Summary: @DESCRIPTION@
+Name: @PACKAGE_NAME@
+Version: @VERSION@
+Release: 1
+License: LGPL
+Group: $(if testtag AX_USE_LIBTOOL; then
+  echo Development/Libraries/C++;
+else
+  echo Applications/...;
+fi)
+Source0: %{name}-%{version}.tar.gz
+BuildRequires: pkg-config, subversion, autotools-devel, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; fi; if testtag AX_CXX_QT || testtag AX_CXX_CHECK_QT; then echo -n ", qtbase5-devel | libqt4-devel, qtbase5-devel-tools | qt4-devel-tools"; fi)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+$(if testtag AX_USE_CPPUNIT; then
+cat <<EOF2
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
+BuildRequires: cppunit-devel
+%else%if 0%{?suse_version} || 0%{?sles_version}
+BuildRequires: libcppunit-devel
+%endif%endif
+EOF2
+fi)
+
+%description
+@README@
+$(if testtag AX_USE_LIBTOOL; then
+echo
+echo This package contains only the shared libraries required at runtime.
+fi)
+
+
+%prep
+%setup -q
+./configure --prefix=/usr \
+            --docdir=/usr/share/doc/packages/@PACKAGE_NAME@ \
+            --libdir=/usr/%_lib
+
+%build
+make
+
+%install
+DESTDIR=\$RPM_BUILD_ROOT make install
+
+%clean
+rm -rf \$RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+/usr/bin/*
+$(if testtag AX_USE_LIBTOOL; then
+echo '/usr/%_lib/@PACKAGE_NAME@.so.*'
+fi)
+%doc
+/usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS
+/usr/share/doc/packages/@PACKAGE_NAME@/COPYING
+/usr/share/doc/packages/@PACKAGE_NAME@/ChangeLog
+/usr/share/doc/packages/@PACKAGE_NAME@/INSTALL
+/usr/share/doc/packages/@PACKAGE_NAME@/NEWS
+/usr/share/doc/packages/@PACKAGE_NAME@/README
+
+$(if testtag AX_USE_LIBTOOL; then
+cat <<EOF2
+%package devel
+Summary: C++ Wrapper around OpenSSL, PCSC and Cryptoki (development files)
+Group: Development/Libraries/C++
+Requires: @PACKAGE_NAME@ = @VERSION@
+
+%description devel
+@README@
+
+This Package contains all files required for developement.
+
+%files devel
+%defattr(-,root,root,-)
+/usr/%_lib/@PACKAGE_NAME@.so
+/usr/%_lib/@PACKAGE_NAME@.a
+/usr/%_lib/pkgconfig
+/usr/%_lib/@PACKAGE_NAME@.la
+/usr/include/
+/usr/share/pkgconfig
+%doc
+/usr/share/doc/packages/@PACKAGE_NAME@/html
+/usr/share/doc/packages/@PACKAGE_NAME@/@PACKAGE_NAME@.spec
+EOF2
+fi)
+
+%changelog
+
+EOF
 SUBDIRS=""
-for d in src test scripts doc examples; do
+for d in src test scripts doc examples html; do
     test -d $d && SUBDIRS="${SUBDIRS} $d"
 done
 to makefile.am<<EOF
@@ -634,7 +828,7 @@ includedir=\${prefix}/include
 Name: @PACKAGE_NAME@
 Description: @DESCRIPTION@
 Version: @VERSION@
-Libs: -L\${libdir} -l@PACKAGE_NAME@ @LDFLAGS@
+Libs: -L\${libdir} -l${PACKAGE_NAME#lib} @LDFLAGS@
 Cflags: -I\${includedir} @CPPFLAGS@
 Requires: @PKG_REQUIREMENTS@
 EOF

configure.ac

@@ -26,7 +26,7 @@ AX_BUILD_EXAMPLES
 AX_CHECK_QT([QT], [QtNetwork QtGui], [QtWidgets])
 AX_PKG_CHECK([PROXY], [libproxy-1.0])
 
-if test "$HAVE_QT" -eq 0 -a "$HAVE_PROXY" -eq 0; then
+if test "$HAVE_QT" -ne 1 -a "$HAVE_PROXY" -ne 1; then
    AC_MSG_ERROR([Either Qt or Google Proxy is required.])
 fi
 

mac-create-app-bundle.sh

@@ -0,0 +1,103 @@
+#!/bin/bash -ex
+
+## @id $Id$
+##
+## Create Mac OS-X App Bundle from built file
+##
+## Parameters:
+##  $1: name of the app-target
+##  $2: name of the project
+##  $3: installation source
+##
+##       1         2         3         4         5         6         7         8
+## 45678901234567890123456789012345678901234567890123456789012345678901234567890
+
+if test "$(uname -s)" != "Darwin"; then
+    echo "**** ERROR: run on Mac OS-X: $0"
+    exit 1
+fi
+test -n "$1"
+test -n "$2"
+test -d "$3"
+target="$(pwd)/${1}/Contents/MacOS"
+
+# Step 1: create and fill app directory structure
+mkdir -p ${1}/Contents/{Resources,MacOS}
+! test -d ${3}/bin || \
+     find ${3}/bin -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/MacOS/ \;
+executablefile=$(ls -1 ${1}/Contents/MacOS/ | head -1)
+! test -d ${3}/lib || \
+    find ${3}/lib -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/MacOS/ \;
+! test -d ${3}/share/${2} || \
+    find ${3}/share/${2} -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/Resources/ \;
+! test -d ${3}/share/${2} || rmdir ${3}/share/${2}
+! test -d ${3}/share || \
+    find ${3}/share -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/Resources/ \;
+! test -d ${3}/bin || rmdir ${3}/bin
+! test -d ${3}/lib || rmdir ${3}/lib
+! test -d ${3}/share || rmdir ${3}/share
+! test -d ${3} || \
+    find ${3} -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/Resources/ \;
+! test -d ${3} || rmdir ${3}
+! test -d ${1}/tmp || rm -r ${1}/tmp
+
+# Step 2: copy qt plugins, if necessary
+for f in ${QT_PLUGINS}; do
+    test -d ${target}/${f} \
+        || cp -r ${QT_PLUGIN_PATH}/${f} ${target}/${f} \
+        || exit 1
+done
+
+# Step 3: resolve all library dependencies
+found=1
+oldpath="$(pwd)"
+while [ $found -ne 0 ]; do
+    found=0
+    cd "${target}"
+    for file in $(find . -type f); do
+        for lib in $(otool -L ${file} | tail -n +2 \
+            | egrep '/opt/local/|'"${HOME}" \
+            | grep -v $file | awk '{print $1}'); do
+            found=1
+            test -f ${lib##*/} \
+                || ( \
+                cp ${lib} . \
+                && chmod u+w ${lib##*/} \
+                ) \
+                || exit 1
+            install_name_tool -change ${lib} \
+                @executable_path/${lib##*/} ${file} \
+                || exit 1
+        done
+    done
+done
+cd ${oldpath}
+
+# Step 4: if necessary, install qt_menu.nib
+if test -n "${QTDIR}"; then
+    MENU_NIB=$(find ${QTDIR} -name .svn -prune -o -name qt_menu.nib -print \
+               | head -1)
+    if test -e "${MENU_NIB}"; then
+        rsync -r "${MENU_NIB}" ${1}/Contents/Resources/
+        test -d ${1}/Contents/Resources/qt_menu.nib
+    fi
+fi
+
+# Step 5: copy or create info.plist
+infoplist=$(find ${1}/Contents/Resources -name Info.plist)
+if test -f "${infoplist}"; then
+    mv "${infoplist}" ${1}/Contents/Info.plist
+else
+    cat > ${1}/Contents/Info.plist <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>CFBundleIdentifier</key>
+    <string>${2}</string>
+    <key>CFBundleExecutable</key>
+    <string>${executablefile##/}</string>
+  </dict>
+</plist>
+EOF
+fi

src/proxyface/autoproxy.hxx

@@ -17,9 +17,7 @@
 #include <QtNetwork/QHostInfo>
 #include <QtCore/QTimer>
 #include <QtCore/QDebug>
-#ifndef Q_OS_WIN32
 #include <QtCore/QThread>
-#endif
 #include <map>
 #ifndef PROXYFACE_LOG
 #define PROXYFACE_LOG qDebug()<<__PRETTY_FUNCTION__
@@ -193,11 +191,7 @@ namespace proxy {
       @example getproxylist.cxx */
   class Interface
 #if HAVE_QT == 1
-#  ifdef Q_OS_WIN32
-    : public QObject
-#  else
     : public QThread
-#  endif
 #endif
   {
 #if HAVE_QT == 1