updated build system

7 years ago · 77d280b25b
parent 38fa86129b
commit 77d280b25b
19 changed files with 2314 additions and 321 deletions
--- a/62
+++ b/62
@ -1,33 +1,67 @@
 2016-08-10 08:49  
 	* [r10] scripts/mvfotos.conf, scripts/mvfotos.in:
 	  added check for movies for avprobe
 2016-07-26 19:50  
 	* [r9] scripts/mvfotos.in:
 	  square braces in square braces in sed require special treatment
 2016-07-25 21:06  
 	* [r8] scripts/mvfotos.in:
 	  ignore more special characters
 2016-07-15 16:12  
 	* [r7] COPYING, ChangeLog, INSTALL, autogen.sh[ADD],
 	  ax_init_standard_project.m4, bootstrap.sh,
 	  build-in-docker.conf[ADD], build-in-docker.sh,
 	  mac-create-app-bundle.sh, mvfotos.desktop.in[ADD],
 	  resolve-debbuilddeps.sh, resolve-rpmbuilddeps.sh,
 	  sql-to-dot.sed[ADD]:
 	  update buildsystem
 2016-04-03 16:18  
-	* bootstrap.sh: after svn-server restore
+	* [r6] bootstrap.sh:
 	  after svn-server restore
 2015-11-07 10:47  marc
-	* bootstrap.sh, debian/control.in: there is no qt4-default
+	* [r5] bootstrap.sh, debian/control.in:
 	  there is no qt4-default
 2015-11-07 09:23  marc
-	* bootstrap.sh: there is no qt4-default
+	* [r4] bootstrap.sh:
 	  there is no qt4-default
 2015-11-07 00:20  marc
-	* debian/control.in: set Section
+	* [r3] debian/control.in:
 	  set Section
 2015-11-06 23:41  marc
-	* AUTHORS: updated author with new homepage
+	* [r2] AUTHORS:
 	  updated author with new homepage
 2015-11-05 17:37  marc
-	* ., AUTHORS, COPYING, ChangeLog, INSTALL, NEWS, README,
+	* [r1] .[ADD], AUTHORS[ADD], COPYING[ADD], ChangeLog[ADD],
-	  ax_check_qt.m4, ax_cxx_compile_stdcxx_11.m4,
+	  INSTALL[ADD], NEWS[ADD], README[ADD], ax_check_qt.m4[ADD],
-	  ax_init_standard_project.m4, bootstrap.sh, build-in-docker.sh,
+	  ax_cxx_compile_stdcxx_11.m4[ADD],
-	  build-resource-file.sh, configure.ac, debian,
+	  ax_init_standard_project.m4[ADD], bootstrap.sh[ADD],
-	  debian/changelog.in, debian/compat, debian/control.in,
+	  build-in-docker.sh[ADD], build-resource-file.sh[ADD],
-	  debian/docs, debian/rules, doc, doc/doxyfile.in, doc/makefile.am,
+	  configure.ac[ADD], debian[ADD], debian/changelog.in[ADD],
-	  mac-create-app-bundle.sh, makefile.am, mvfotos.spec.in,
+	  debian/compat[ADD], debian/control.in[ADD], debian/docs[ADD],
-	  resolve-debbuilddeps.sh, resolve-rpmbuilddeps.sh, scripts,
+	  debian/rules[ADD], doc[ADD], doc/doxyfile.in[ADD],
-	  scripts/makefile.am, scripts/mvfotos.conf, scripts/mvfotos.in:
+	  doc/makefile.am[ADD], mac-create-app-bundle.sh[ADD],
 	  makefile.am[ADD], mvfotos.spec.in[ADD],
 	  resolve-debbuilddeps.sh[ADD], resolve-rpmbuilddeps.sh[ADD],
 	  scripts[ADD], scripts/makefile.am[ADD],
 	  scripts/mvfotos.conf[ADD], scripts/mvfotos.in[ADD]:
 	  initial copy from old project
--- a/ax_check_qt.m4
+++ b/ax_check_qt.m4
@ -51,18 +51,33 @@
 AC_DEFUN([AX_CXX_QT_TOOL], [
  PKG_PROG_PKG_CONFIG
-  if test -z "$HAVE_$1"; then
+  if test -z "${HAVE_$1}"; then
    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)}
+    for package in Qt5Core QtCore; do
-    $1=${$1:-$(${PKG_CONFIG} --variable=host_bins Qt5Core)/$2-qt5}
+        if test -x "${$1}"; then
-    $1=${$1:-$(${PKG_CONFIG} --variable=host_bins Qt5Core)/$2}
+            break
-    $1=${$1:-$(${PKG_CONFIG} --variable=$2_location QtCore)}
+        fi
-    $1=${$1:-$(${PKG_CONFIG} --variable=host_bins QtCore)/$2}
+        tool=$(${PKG_CONFIG} --variable=$2_location $package 2> /dev/null)
-    $1=${$1:-$(${PKG_CONFIG} --variable=host_bins QtCore)/$2-qt4}
+        if test -x "${tool}"; then
-    if ! which "${$1%% *}" > /dev/null; then
+            $1="${tool}"
-      if which "$2-qt5" > /dev/null; then
+            break
        fi
        tool=$(${PKG_CONFIG} --variable=host_bins $package 2> /dev/null)
        if test -n "$tool"; then
            for name in $2 $2-qt5 $2-qt4; do
                if test -x "${tool}/${name}"; then
                    $1="${tool}/${name}"
                    break
                fi
            done
        fi
    done
    if ! test -x "${$1}"; then
      if which "$2" > /dev/null; then
        $1=$2
      elif which "$2-qt5" > /dev/null; then
        $1=$2-qt5
      elif which "$2" > /dev/null; then
        $1=$2
@ -70,7 +85,7 @@ AC_DEFUN([AX_CXX_QT_TOOL], [
        $1=$2-qt4
      else
        HAVE_$1=0
-        $1=""
+        unset $1
      fi
    fi
    AC_SUBST($1)
@ -215,6 +230,7 @@ AC_DEFUN([AX_CHECK_QT], [
  AC_SUBST(CXXFLAGS)
  AC_SUBST(PKG_REQUIREMENTS)
  AX_ADDITIONAL_QT_RULES_HACK='
 #### Begin: Appended by $0
 LANGUAGE_FILE_BASE ?= translations
@ -226,7 +242,6 @@ moc_%.cxx: %.hxx
 qrc_%.cxx: %.qrc
 	$(RCC) -o [$][@] -name ${<:%.qrc=%} $<
  AC_SUBST(AX_ADDITIONAL_QT_RULES_HACK)
 #%.qrc: %
 #	cwd=$$(pwd) && cd $< && $(RCC) -project -o $${cwd}/[$][@]
@ -234,12 +249,15 @@ qrc_%.cxx: %.qrc
 %.qm: %.ts
 	${LRELEASE} $< -qm [$][@]
-%.ts: ${LANGUAGE_FILES:%=%}
+%.ts: ${LANGUAGE_FILES}
 	${LUPDATE} -no-obsolete \
-	           -target-language ${@:${LANGUAGE_FILE_BASE}_%.ts=%} \
+	           -target-language [$]{@:${LANGUAGE_FILE_BASE}_%.ts=%} \
-	           -ts [$][@] $<
+                   [$][^] \
 	           -ts [$][@]
-'])
+#### End: $0
 '
 ])
 AC_DEFUN([AX_REQUIRE_QT], [
  AX_CHECK_QT([$1], [$2], [$3], [$4])
@ -254,3 +272,13 @@ AC_DEFUN([AX_REQUIRE_QT], [
 AC_DEFUN([AX_QT_NO_KEYWORDS], [
  CPPFLAGS+=" -DQT_NO_KEYWORDS"
 ])
 AC_DEFUN([AX_INIT_QT], [
  if test -n "${AX_ADDITIONAL_QT_RULES_HACK}"; then
    for f in $(find test examples src -name makefile.in); do
      test -f "$f" && cat >> "$f" <<EOF
 ${AX_ADDITIONAL_QT_RULES_HACK}    
 EOF
    done
  fi
 ])
--- a/ax_cxx_compile_stdcxx_11.m4
+++ b/ax_cxx_compile_stdcxx_11.m4
@ -4,12 +4,16 @@
 #
 # SYNOPSIS
 #
 #   AX_REQUIRE_STDCXX_11
 #   AX_REQUIRE_STDCXX_14
 #   AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional])
 #   AX_CXX_COMPILE_STDCXX_14([ext|noext],[mandatory|optional])
 #
 # DESCRIPTION
 #
 #   Check for baseline language coverage in the compiler for the C++11
-#   standard; if necessary, add switches to CXXFLAGS to enable support.
+#   or C++14 standard; if necessary, add switches to CXXFLAGS to
 #   enable support.
 #
 #   The first argument, if specified, indicates whether you insist on an
 #   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
@ -131,3 +135,97 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
    AC_SUBST(HAVE_CXX11)
  fi
 ])
 AC_DEFUN([AX_CXX_COMPILE_STDCXX_14], [dnl
  m4_if([$1], [], [],
        [$1], [ext], [],
        [$1], [noext], [],
        [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_14])])dnl
  m4_if([$2], [], [ax_cxx_compile_cxx14_required=true],
        [$2], [mandatory], [ax_cxx_compile_cxx14_required=true],
        [$2], [optional], [ax_cxx_compile_cxx14_required=false],
        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_14])])dnl
  AC_LANG_PUSH([C++])dnl
  ac_success=no
  AC_CACHE_CHECK(whether $CXX supports C++14 features by default,
  ax_cv_cxx_compile_cxx14,
  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
    [ax_cv_cxx_compile_cxx14=yes],
    [ax_cv_cxx_compile_cxx14=no])])
  if test x$ax_cv_cxx_compile_cxx14 = xyes; then
    ac_success=yes
  fi
  m4_if([$1], [noext], [], [dnl
  if test x$ac_success = xno; then
    for switch in -std=gnu++14 -std=gnu++0y; do
      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx14_$switch])
      AC_CACHE_CHECK(whether $CXX supports C++14 features with $switch,
                     $cachevar,
        [ac_save_CXXFLAGS="$CXXFLAGS"
         CXXFLAGS="$CXXFLAGS $switch"
         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
          [eval $cachevar=yes],
          [eval $cachevar=no])
         CXXFLAGS="$ac_save_CXXFLAGS"])
      if eval test x\$$cachevar = xyes; then
        CXXFLAGS="$CXXFLAGS $switch"
        ac_success=yes
        break
      fi
    done
  fi])
  m4_if([$1], [ext], [], [dnl
  if test x$ac_success = xno; then
    for switch in -std=c++14 -std=c++0y; do
      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx14_$switch])
      AC_CACHE_CHECK(whether $CXX supports C++14 features with $switch,
                     $cachevar,
        [ac_save_CXXFLAGS="$CXXFLAGS"
         CXXFLAGS="$CXXFLAGS $switch"
         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
          [eval $cachevar=yes],
          [eval $cachevar=no])
         CXXFLAGS="$ac_save_CXXFLAGS"])
      if eval test x\$$cachevar = xyes; then
        CXXFLAGS="$CXXFLAGS $switch"
        ac_success=yes
        break
      fi
    done
  fi])
  AC_LANG_POP([C++])
  if test x$ax_cxx_compile_cxx14_required = xtrue; then
    if test x$ac_success = xno; then
      AC_MSG_ERROR([*** A compiler with support for C++14 language features is required.])
    fi
  else
    if test x$ac_success = xno; then
      HAVE_CXX14=0
      AC_MSG_NOTICE([No compiler with C++14 support was found])
      AX_CXX_COMPILE_STDCXX_11([$1], [optional])
    else
      HAVE_CXX11=1
      HAVE_CXX14=1
      AC_DEFINE(HAVE_CXX14,1,
                [define if the compiler supports basic C++14 syntax])
      AC_DEFINE(HAVE_CXX11,1,
                [define if the compiler supports basic C++14 syntax])
    fi
    AC_SUBST(HAVE_CXX11)
    AC_SUBST(HAVE_CXX14)
  fi
 ])
 AC_DEFUN([AX_REQUIRE_STDCXX_11], [
  if test x${HAVE_CXX11} != x1; then
    AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
  fi
 ])
 AC_DEFUN([AX_REQUIRE_STDCXX_14], [
  if test x${HAVE_CXX14} != x1; then
    AC_MSG_ERROR([*** A compiler with support for C++14 language features is required.])
  fi
 ])
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@ -7,18 +7,18 @@
 m4_define([mrw_esyscmd_s], [m4_normalize(m4_esyscmd([$1]))])
 # define least version number from subversion's revision number:
-# it is taken modulo 256 due to a bug on Apple's MacOSX
+# it is taken modulo 256 due to a bug on Apple's MaxOSX
 m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix],
  m4_ifdef([x_least_diff],
    mrw_esyscmd_s([
      VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout"
      for path in . .. ../.. ../../..; do
-        if test -d .svn; then
+        if test -d ${path}/.svn; then
-          svn upgrade 1>&2 > /dev/null || true
+          (cd $path; svn upgrade 1>&2 > /dev/null || true)
          VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
          if test -n "${VCS_REVISION}"; then break; fi
-        elif test -d .git; then
+        elif test -d ${path}/.git; then
-          VCS_REVISION=$(git rev-list --all --count)
+          VCS_REVISION=$(cd ${path} > /dev/null 2/dev/null; git rev-list --all --count)
          if test -n "${VCS_REVISION}"; then break; fi
        fi
      done
@ -26,20 +26,17 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix],
    ]),  mrw_esyscmd_s([
      VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout"
      for path in . .. ../.. ../../..; do
-        if test -d .svn; then
+        if test -d ${path}/.svn; then
-          svn upgrade 1>&2 > /dev/null || true
+          (cd $path; svn upgrade 1>&2 > /dev/null || true)
          VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
          if test -n "${VCS_REVISION}"; then break; fi
-        elif test -d .git; then
+        elif test -d ${path}/.git; then
-          VCS_REVISION=$(git rev-list --all --count)
+          VCS_REVISION=$(cd ${path} > /dev/null 2/dev/null; git rev-list --all --count)
          if test -n "${VCS_REVISION}"; then break; fi
        fi
      done
      # Mac does not support LEAST > 255
-      echo $ECHO_N $(($VCS_REVISION%256))
+      echo $ECHO_N $(($VCS_REVISION%256))]))))
    ])
  )
 ))
 # define version number from subversion's revision number:
 # it is taken modulo 256 due to a bug on Apple's MacOSX
@ -47,18 +44,18 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix],
 m4_define(x_minor_diff, m4_ifdef([x_least_fix], 0, mrw_esyscmd_s([
  VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout"
  for path in . .. ../.. ../../..; do
-    if test -d .svn; then
+    if test -d ${path}/.svn; then
-      svn upgrade 1>&2 > /dev/null || true
+      (cd $path; svn upgrade 1>&2 > /dev/null || true)
      VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
      if test -n "${VCS_REVISION}"; then break; fi
-    elif test -d .git; then
+    elif test -d ${path}/.git; then
-      VCS_REVISION=$(git rev-list --all --count)
+      VCS_REVISION=$(cd ${path} > /dev/null 2/dev/null; git rev-list --all --count)
      if test -n "${VCS_REVISION}"; then break; fi
    fi;
  done
  # Mac does not support LEAST > 255
-  echo $ECHO_N $(($VCS_REVISION/256))
+  echo $ECHO_N $(($VCS_REVISION/256))])))
-])))
+
 # setup version number
 m4_define(x_version, [x_major.m4_ifdef([x_least_diff], x_minor, m4_eval(x_minor+x_minor_diff)).m4_eval(m4_ifdef([x_least_diff], [x_least-x_least_diff], [x_least]))])
@ -93,7 +90,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 -e ':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
@ -129,7 +126,7 @@ AC_DEFUN([AX_SUBST], [
 # m4_define(x_minor, MINOR_NUMBER) # project's minor version
 # m4_include(ax_init_standard_project.m4)
 # AC_INIT(x_package_name, x_version, x_bugreport, x_package_name)
-# AM_INIT_AUTOMAKE([1.9 tar-pax])
+# AM_INIT_AUTOMAKE([1.9 tar-pax parallel-tests color-tests])
 # AX_INIT_STANDARD_PROJECT
 #
 # you change nothing but: YOUR_PACKAGE_NAME, MAJOR_NUMBER, MINOR_NUMBER
@ -140,6 +137,8 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
  AX_SUBST(PREFIX)
  SYSCONFDIR=$(test "$prefix" = NONE && prefix=$ac_default_prefix; eval echo "${sysconfdir}")
  AX_SUBST(SYSCONFDIR)
  PKGSYSCONFDIR=$(test "$prefix" = NONE && prefix=$ac_default_prefix; eval echo "${SYSCONFDIR}/${PACKAGE_NAME}")
  AX_SUBST(PKGSYSCONFDIR)
  DATADIR=$(test "$prefix" = NONE && prefix=$ac_default_prefix; eval echo "${datadir}")
  AX_SUBST(DATADIR)
  PKGDATADIR=$(test "$prefix" = NONE && prefix=$ac_default_prefix; eval echo "${DATADIR}/${PACKAGE_NAME}")
@ -170,16 +169,65 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
  AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_TARNAME//[^a-zA-Z0-9]/_}'"
  AX_SUBST(NUMBERS)
  AX_SUBST(HOME)
  if test -f README.md; then
    README=$(tail -n +3 README.md)
    DESCRIPTION=$(head -1 README.md | sed 's,^#\+ *,,;s, *#\+$,,')
  else
    README=$(tail -n +3 README)
    DESCRIPTION=$(head -1 README)
  fi
  README_ESCAPED=$(echo "$README" | sed ':a;N;$!ba;s/\n/\\n/g;s,",\\",g')
  if which pandoc 2>&1 > /dev/null; then   
    README_HTML=$(echo "$README" | pandoc -f markdown_github -t html | sed ':a;N;$!ba;s,\\\(.\),\\\\<span>\1</span>,g;s/\n/\\n/g;s,",\\",g;s,  ,\&nbsp;\&nbsp;,g')
  else
    README_HTML="${README}"
  fi
  AX_SUBST(README)
  _AM_SUBST_NOTMAKE([README])
-  DESCRIPTION=$(head -1 README)
+  AX_SUBST(README_ESCAPED)
  _AM_SUBST_NOTMAKE([README_ESCAPED])
  AX_SUBST(README_HTML)
  _AM_SUBST_NOTMAKE([README_HTML])
  AX_SUBST(DESCRIPTION)
  _AM_SUBST_NOTMAKE([DESCRIPTION])
  LICENSE=$(echo $(head -1 COPYING))
  AX_SUBST(LICENSE)
  COPYING=$(<COPYING)
  AX_SUBST(COPYING)
  _AM_SUBST_NOTMAKE([COPYING])
  CHANGELOG=$(<ChangeLog)
  AC_SUBST(CHANGELOG)
  _AM_SUBST_NOTMAKE([CHANGELOG])
  DEB_CHANGELOG=$(sed '/^[[^\t]]/{h;N;d};s,\t,  ,g;/^  \* /{s,,,;H;g;s,^,  * ,;s,\n\([[^ ]]*\) *, \1\n    ,}' ChangeLog)
  if test -z "$DEB_CHANGELOG"; then
    DEB_CHANGELOG="  * see file ChangeLog and project management web site"
  fi
  AC_SUBST(DEB_CHANGELOG)
  _AM_SUBST_NOTMAKE([DEB_CHANGELOG])
  AUTHOR=$(head -1 AUTHORS)
  AUTHOR_NAME=$(echo $AUTHOR | sed 's, *[[<(]].*$,,')
  AUTHOR_URL=$(echo $AUTHOR | sed 's,.*(\(http[[^)]]*\)).*,\1,')
  AUTHOR_MAIL=$(echo $AUTHOR | sed 's,.*<\(.*@.*\)>.*,\1,')
  PACKAGER=$(gpg -K --display-charset utf-8 --lock-never 2>/dev/null | sed -n 's,uid *\(\[[ultimate\]] *\)\?,,p' | head -1)
  if test -z "${PACKAGER}"; then
    PACKAGER="$AUTHOR"
  fi
  AX_SUBST(AUTHOR)
  _AM_SUBST_NOTMAKE([AUTHOR])
  AX_SUBST(AUTHOR_NAME)
  AX_SUBST(AUTHOR_URL)
  AX_SUBST(AUTHOR_MAIL)
  AX_SUBST(PACKAGER)
  PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}/projects/${PACKAGE_NAME}}"
  SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${AUTHOR_URL}/downloads/${PACKAGE_NAME}}"
  AX_SUBST(PROJECT_URL)
  AX_SUBST(SOURCE_DOWNLOAD)
  VENDOR=$((lsb_release -is 2>/dev/null || echo unknown) | tr ' ' '_')
  AX_SUBST(VENDOR)
  DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null)
  if test "${DISTRO}" = "n/a"; then
     DISTRO="${VENDOR}_$(lsb_release -sr 2>/dev/null | tr ' ' '_')"
  fi
  AX_SUBST(DISTRO)
  ARCH=$((@<:@@<:@ $(uname -sm) =~ 64 @:>@@:>@ && echo amd64) || (@<:@@<:@ $(uname -sm) =~ 'i?86' @:>@@:>@ && echo i386 || uname -sm))
  AX_SUBST(ARCH)
@ -243,6 +291,25 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
    AM_CPPFLAGS="${AM_CPPFLAGS} -DQT_NO_DEBUG_OUTPUT -DQT_NO_DEBUG"
  fi
  AC_ARG_WITH(gcov,
    [AS_HELP_STRING([--with-gcov=FILE],
                    [enable gcov, set gcov file (defaults to gcov)])],
    [GCOV="$enableval"], [GCOV="no"])
  AM_CONDITIONAL(COVERAGE, test "$GCOV" != "no")
  if test "$GCOV" != "no"; then
    if test "$GCOV" == "yes"; then
      GCOV=gcov
    fi
    AC_CHECK_PROG(has_gcov, [$GCOV], [yes], [no])
    if test "$has_gcov" != "yes"; then
      AC_MSG_ERROR([gcov: program $GCOV not found])
    fi
    AC_MSG_NOTICE([Coverage tests enabled, using ${GCOV}]);
    AM_CXXFLAGS="${AM_CXXFLAGS:-} -O0 --coverage -fprofile-arcs -ftest-coverage"
    AM_LDFLAGS="${AM_LDFLAGS} -O0 --coverage -fprofile-arcs"
    AX_SUBST(GCOV)
  fi
  if test -f ${PACKAGE_NAME}.desktop.in; then
    AC_CONFIG_FILES([${PACKAGE_NAME}.desktop])
  fi
@ -273,7 +340,7 @@ EOF
 AC_DEFUN([AX_USE_CXX], [
  m4_include(ax_cxx_compile_stdcxx_11.m4)
  AC_LANG(C++)
-  AX_CXX_COMPILE_STDCXX_11(noext, optional)
+  AX_CXX_COMPILE_STDCXX_14(noext, optional)
  AC_PROG_CXX
  AC_PROG_CPP
@ -362,7 +429,7 @@ EOF
 # use this in configure.ac to support CppUnit for C++ unit tests
 AC_DEFUN([AX_USE_CPPUNIT], [
-  AM_PATH_CPPUNIT([1.0.0], [have_cppunit="yes"], [have_cppunit="no"])
+  PKG_CHECK_MODULES(CPPUNIT, cppunit, [have_cppunit="yes"], [have_cppunit="no"])
  # infos and warnings
  if test "$have_cppunit" = "no"; then
    AC_MSG_WARN([Missing cppunit development library!
@ -383,9 +450,62 @@ maintainer-clean-example-targets:
 EOF
 ])
 # use this in configure.ac to support NodeJS
 AC_DEFUN([AX_USE_NODEJS], [
  AC_PATH_PROG(ANDROID, [android], [0],
                         [${PATH}${PATH_SEPARATOR}${ANDROID_HOME}/tools])
  AC_CONFIG_FILES([nodejs/package.json])
  AC_CONFIG_FILES([nodejs/makefile])
  if test -z "${DEB_SECTION}"; then
    AX_DEB_SECTION([web])
  fi
  if test -z "${RPM_GROUP}"; then
    AX_RPM_GROUP([Applications/Internet])
  fi
  AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-nodejs-targets], [nodejs/makefile.in])
  test -f nodejs/makefile.in && cat >> nodejs/makefile.in <<EOF
 #### Begin: Appended by $0
 maintainer-clean-nodejs-targets:
 	-rm makefile.in
 #### End: $0
 EOF
 ])
 # use this in configure.ac to support Cordova
 AC_DEFUN([AX_USE_CORDOVA], [
  AC_PATH_PROG(ANDROID, [android], [0],
                         [${PATH}${PATH_SEPARATOR}${ANDROID_HOME}/tools])
  AC_PATH_PROG(CORDOVA, [cordova], [0],
                        [${PATH}${PATH_SEPARATOR}$(pwd)/node_modules/cordova/bin])
  if test ${CORDOVA} = 0; then
     AC_MSG_WARN([cordova is missing, on ubuntu install cordova-cli from repository ppa:cordova-ubuntu/ppa])
  fi
  if test ${ANDROID} = 0; then
     AC_MSG_WARN([android sdk is missing, set variable ANDROID_HOME after installation])
  fi
  AM_CONDITIONAL(HAVE_CORDOVA, [test ${CORDOVA} != 0 -a ${ANDROID} != 0])
  AX_SUBST(CORDOVA)
  AC_CONFIG_FILES([cordova/makefile])
  AC_CONFIG_FILES([cordova/config.xml])
 EOF
  AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-cordova-targets], [cordova/makefile.in])
  test -f cordova/makefile.in && cat >> cordova/makefile.in <<EOF
 #### Begin: Appended by $0
 maintainer-clean-cordova-targets:
 	-rm makefile.in
 #### End: $0
 EOF
 ])
 # use this in configure.ac to support HTML data for webservers
 AC_DEFUN([AX_BUILD_HTML], [
  AC_CONFIG_FILES([html/makefile])
  if test -z "${DEB_SECTION}"; then
    AX_DEB_SECTION([web])
  fi
  if test -z "${RPM_GROUP}"; then
    AX_RPM_GROUP([Applications/Internet])
  fi
  AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-html-targets], [html/makefile.in])
  test -f html/makefile.in && cat >> html/makefile.in <<EOF
 #### Begin: Appended by $0
@ -395,6 +515,12 @@ maintainer-clean-html-targets:
 EOF
 ])
 # use this in configure.ac to support HTML data for webservers
 AC_DEFUN([AX_BUILD_HTML_NPM], [
  AC_CONFIG_FILES([html/package.json])
  AX_BUILD_HTML
 ])
 # use this in configure.ac to support C++ libraries
 AC_DEFUN([AX_USE_LIBTOOL], [
  # libtool versioning
@ -407,6 +533,12 @@ AC_DEFUN([AX_USE_LIBTOOL], [
  AC_SUBST(LIB_VERSION)
  AC_PROG_LIBTOOL
  AC_CONFIG_FILES([src/${PACKAGE_NAME}.pc])
  if test -z "${DEB_SECTION}"; then
    AX_DEB_SECTION([devel])
  fi
  if test -z "${RPM_GROUP}"; then
    AX_RPM_GROUP([Development/Libraries])
  fi
  AX_ADD_MAKEFILE_TARGET_DEP([install-data-am], [install-data-libtool-pkg], [src/makefile.in])
  AX_ADD_MAKEFILE_TARGET_DEP([uninstall-am], [uninstall-data-am], [src/makefile.in])
  AX_ADD_MAKEFILE_TARGET_DEP([uninstall-data-am], [uninstall-data-libtool-pkg], [src/makefile.in])
@ -424,8 +556,16 @@ EOF
 ])
 # use this in configure.ac to support debian packages
 #  - $1: optional debian package section
 AC_DEFUN([AX_USE_DEBIAN_PACKAGING], [
  if test -n "$1"; then
    AX_DEB_SECTION([$1])
  fi
  if test -f README.md; then
    README_DEB=$(tail -n +3 README.md | sed -e 's/^ *$/./g' -e 's/^/ /g')
  else
    README_DEB=$(tail -n +3 README | sed -e 's/^ *$/./g' -e 's/^/ /g')
  fi
  AC_SUBST(README_DEB)
  _AM_SUBST_NOTMAKE([README_DEB])
  AC_CONFIG_FILES([debian/changelog debian/control])
@ -438,6 +578,7 @@ clean-debian-targets:
 	-rm -rf \${PACKAGE_NAME}_\${PACKAGE_VERSION}~\${DISTRO}.\${BUILD_NUMBER}.{dsc,tar.gz} \${PACKAGE_NAME}_\${PACKAGE_VERSION}~\${DISTRO}.\${BUILD_NUMBER}*.changes \$\$(sed -n 's,Package: \(.*\),\1_${PACKAGE_VERSION}~${DISTRO}.${BUILD_NUMBER}*.deb,p;' debian/control)
 deb: distdir
 	cd \${PACKAGE_NAME}-\${PACKAGE_VERSION} && ( export CFLAGS="\${CFLAGS}"; export CPPFLAGS="\${CPPFLAGS}"; export CXXFLAGS="\${CXXFLAGS}"; export LDFLAGS="\${LDFLAGS}"; export DEB_CFLAGS_APPEND="\${CFLAGS}"; export DEB_CPPFLAGS_APPEND="\${CPPFLAGS}"; export  DEB_CXXFLAGS_APPEND="\${CXXFLAGS}"; export DEB_LDFLAGS_APPEND="\${LDFLAGS}"; dpkg-buildpackage )
 	gpg --verify \${PACKAGE_NAME}_\${PACKAGE_VERSION}~\${DISTRO}.\${BUILD_NUMBER}.dsc
 distclean-debian-targets:
 	-rm debian/changelog debian/control
 #### End: $0
@ -445,7 +586,11 @@ EOF
 ])
 # use this in configure.ac to support RPM packages
 #  - $1: optional rpm package group
 AC_DEFUN([AX_USE_RPM_PACKAGING], [
  if test -n "$1"; then
    AX_RPM_GROUP([$1])
  fi
  AC_CONFIG_FILES([${PACKAGE_NAME}.spec])
  #AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-rpm-targets], [makefile.in])
  AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-rpm-targets], [makefile.in])
@ -455,6 +600,7 @@ AC_DEFUN([AX_USE_RPM_PACKAGING], [
 EXTRA_DIST += \${PACKAGE_NAME}.spec.in
 rpm: dist
 	rpmbuild -ba --define "_topdir \$\$(pwd)" --define "_sourcedir \$\$(pwd)" \${PACKAGE_NAME}.spec
 	./rpmsign.exp "\${PACKAGER}" "\{PASSWORD}" RPMS/*/*.rpm SRPMS/*.rpm
 clean-rpm-targets:
 	-rm -rf BUILD BUILDROOT RPMS SPECS SRPMS
 distclean-rpm-targets:
@ -463,6 +609,11 @@ distclean-rpm-targets:
 EOF
 ])
 # use this in configure.ac to support scripts, e.g. bash scripts
 AC_DEFUN([AX_USE_ETC], [
  AC_CONFIG_FILES([etc/makefile])
 ])
 # use this in configure.ac to support scripts, e.g. bash scripts
 AC_DEFUN([AX_USE_SCRIPTS], [
  AC_CONFIG_FILES([scripts/makefile])
@ -473,6 +624,7 @@ AC_DEFUN([AX_USE_DOXYGEN], [
  AC_CHECK_PROG(have_doxygen, doxygen, yes, no)
  AC_CHECK_PROG(have_dot, dot, yes, no)
  AC_CHECK_PROG(have_mscgen, mscgen, yes, no)
  AM_CONDITIONAL(NEED_PLANTUML, test "$have_doxygen" = "yes" -a "1.8.11" != $((echo "1.8.11"; doxygen -v 2>/dev/null) | sort -V | head -1))
  PDF_DOC=${PACKAGE_NAME}-${PACKAGE_VERSION}.pdf
  AC_SUBST(PDF_DOC)
  if test "$have_doxygen" = "no"; then
@ -487,22 +639,38 @@ AC_DEFUN([AX_USE_DOXYGEN], [
    AC_MSG_WARN([Missing program mscgen!
     - when you rebild documentation, there are no message state charts
     - there are precompiled derived files in the distribution]); fi
-  AC_CONFIG_FILES([doc/makefile doc/doxyfile])
+  AC_CONFIG_FILES([doc/makefile doc/doxyfile doc/header.html doc/footer.html])
  AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-documentation], [doc/makefile.in])
  AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-documentation], [doc/makefile.in])
  AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-documentation], [doc/makefile.in])
  AX_ADD_MAKEFILE_TARGET_DEP([install-data-am], [install-data-documentation], [doc/makefile.in])
  AX_ADD_MAKEFILE_TARGET_DEP([uninstall-am], [uninstall-documentation], [doc/makefile.in])
  AX_ADD_MAKEFILE_TARGET_DEP([all], [doc], [doc/makefile.in])
-  AX_ADD_MAKEFILE_TARGET_DEP([.PHONY], [pdf], [doc/makefile.in])
+  AX_ADD_MAKEFILE_TARGET_DEP([.PHONY], [pdf gen-uml-images], [doc/makefile.in])
  test -f doc/makefile.in && cat >> doc/makefile.in <<EOF
 #### Begin: Appended by $0
-doc: doxyfile
+doc: doxyfile @NEED_PLANTUML_TRUE@ gen-uml-images
 	@NEED_PLANTUML_TRUE@ doxyadd() { grep -q "\$\$[1] += \$\$[2]" doxyfile || sed -i '/^'"\$\$[1]"' *=/a'"\$\$[1]"' += '"\$\$[2]" doxyfile; }; \\
 	@NEED_PLANTUML_TRUE@ doxyadd ALIASES '"startuml{1}=@image html \\\\1\\\\n@image latex \\\\1\\\\n\\\\if DontIgnorePlantUMLCode"'; \\
 	@NEED_PLANTUML_TRUE@ doxyadd ALIASES '"enduml=\\\\endif"'; \\
 	@NEED_PLANTUML_TRUE@ doxyadd IMAGE_PATH '"gen-uml-images"';
 	doxygen doxyfile
@PEDANTIC_TRUE@	test \! -s doxygen.errors
@NEED_PLANTUML_TRUE@EXTRA_DIST = ${EXTRA_DIST} plantuml.jar
@NEED_PLANTUML_TRUE@
@NEED_PLANTUML_TRUE@gen-uml-images:
@NEED_PLANTUML_TRUE@	test -d gen-uml-images || mkdir gen-uml-images
@NEED_PLANTUML_TRUE@	eval \$\$(sed -n 's, *INPUT *\\(+\\?\\)= *\\(.*\\),INPUT\\1=" \\2",gp' doxyfile); \\
@NEED_PLANTUML_TRUE@	eval \$\$(sed -n 's, *FILE_PATTERNS *\\(+\\?\\)= *\\(.*\\),FILE_PATTERNS\\1=" \\2",gp' doxyfile); \\
@NEED_PLANTUML_TRUE@	SOURCES="**.("\$\$(echo \$\${FILE_PATTERNS} | sed 's,*.,,g;s, ,|,g')")"; \\
@NEED_PLANTUML_TRUE@	for src in \$\$INPUT; do \\
@NEED_PLANTUML_TRUE@	  java  -Djava.awt.headless=true -jar \${top_srcdir}/doc/plantuml.jar -v -o \$\$(pwd)/gen-uml-images "\$\$src/\$\$SOURCES"; \\
@NEED_PLANTUML_TRUE@	done
 clean-documentation:
 	-rm doxygen.errors @PDF_DOC@
 	@NEED_PLANTUML_TRUE@ -rm -rf gen-uml-images
 distclean-documentation:
 	-rm -r html
 	-rm  @PACKAGE_NAME@.doxytag
@ -519,6 +687,55 @@ uninstall-documentation:
 EOF
 ])
 # use this in configure.ac to support Doxygen documentation generation
 AC_DEFUN([AX_USE_PERLDOC], [
  PERL_SOURCES="m4_default([$1], [perl])"
  AX_SUBST(PERL_SOURCES)
  if test -z "$PERL_SOURCES"; then
    AC_MSG_ERROR([You must specify the path to perl files
     - use [AX]_[USE]_PERLDOC([[pathes to perldoc]])]); fi
  AC_CHECK_PROG(have_perldoc, pods2html, yes, no)
  if test "$have_doxygen" = "no"; then
    AC_MSG_WARN([Missing program pods2html!
     - you cannot rebuild the documentation
     - there are precompiled derived files in the distribution
     - if you need to generate documentation, install libpod-tree-perl]); fi
  AC_CONFIG_FILES([doc/makefile])
  AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-perldoc], [doc/makefile.in])
  AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-perldoc], [doc/makefile.in])
  AX_ADD_MAKEFILE_TARGET_DEP([install-data-am], [install-data-perldoc], [doc/makefile.in])
  AX_ADD_MAKEFILE_TARGET_DEP([uninstall-am], [uninstall-perldoc], [doc/makefile.in])
  AX_ADD_MAKEFILE_TARGET_DEP([all], [doc], [doc/makefile.in])
  AX_ADD_MAKEFILE_TARGET_DEP([.PHONY], [doc], [doc/makefile.in])
  test -f doc/makefile.in && cat >> doc/makefile.in <<EOF
 #### Begin: Appended by $0
 doc: perldoc/index.html
 perldoc/index.html: \${PERL_SOURCES:%=perldoc/%}
 	echo "<html><head><title>Perl Documentation</title></head><body><h1>Perl Documentation</h1><ul>" > perldoc/index.html
 	for p in \${PERL_SOURCES:%=perldoc/%}; do \
 	  echo '<li><a href="'"\$\${p#perldoc/}"'/index.html">'"\$\${p#perldoc/}"'</a></li>' >> perldoc/index.html; \
 	done
 	echo "</ul></body></html>" >> perldoc/index.html
 perldoc/%:
 	pods2html --notoc --empty --index index @top_srcdir@/\${@:perldoc/%=%} \$[@]
 distclean-perldoc:
 	-rm -r perldoc
 maintainer-clean-perldoc:
 	-rm makefile.in
 install-data-perldoc:
 	test -d \$(DESTDIR)\${docdir} || mkdir -p \$(DESTDIR)\${docdir}
 	chmod -R u+w \$(DESTDIR)\${docdir}
 	cp -r perldoc \$(DESTDIR)\${docdir}/
 uninstall-perldoc:
 	-chmod -R u+w \$(DESTDIR)\${docdir}
 	-rm -rf \$(DESTDIR)\${docdir}/perldoc
 #### End: $0
 EOF
 ])
 # require a specific package, with fallback: test for a header
 #  - parameter:
 #     $1 = unique id (no special characters)
@ -527,6 +744,13 @@ EOF
 #     $4 = alternative module names (space separated, optional)
 #     $5 = optional flags:
 #            manualflags if CXXFLAGS, CPPFLAGS, LIBS should remain unchanged
 #     $6 = optional parameters, allowed are (evaluated in this order):
 #           - DEV_RPM_DIST_PKG=<name>
 #             special name for the RPM development package
 #           - DEV_DEB_DIST_PKG=<name>
 #             special name for the debian development package
 #           - DEV_DIST_PKG=<name>
 #             if the name of the development package is different
 #
 # uses PKG_CHECK_MODULES to test for a module
 # then, if given, looks for the header file
@ -627,6 +851,33 @@ AC_DEFUN([AX_PKG_REQUIRE], [
  else
    AC_MSG_NOTICE([To enable $1, add $1_CPPFLAGS, $1_CXXFLAGS and $1_LIBS])
  fi
  DEV_DEB_DIST_PKG=
  DEV_RPM_DIST_PKG=
  DEV_DIST_PKG=
  pkg=m4_default([$2], [$1])
  $6
  dep_pkg=${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev}
  rpm_pkg=${DEV_RPM_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-devel}
  if test -n "$4"; then
    for f in $pkg $4; do
      if test -n "$(apt-cache policy -q ${f}-dev 2> /dev/null)"; then
        deb_pkg=${f}-dev
        break
      fi
    done
    for f in $pkg $4; do
      if (test -x /usr/bin/zypper && zypper search -x "${f}-devel" 1>&2 > /dev/null) || \
            (test -x /usr/bin/dnf && dnf list -q "${f}-devel" 1>&2 > /dev/null) || \
            (test -x /usr/bin/yum && yum list -q "${f}-devel" 1>&2 > /dev/null) || \
            (test -x /usr/sbin/urpmq && urpmq "${f}-devel" 1>&2 > /dev/null); then
        rpm_pkg=${f}-devel
        break
      fi
    done
  fi
  AX_DEB_BUILD_DEPEND([$deb_pkg])
  AX_RPM_BUILD_DEPEND([$rpm_pkg])
 ])
 # check if a specific package exists
@ -635,6 +886,13 @@ AC_DEFUN([AX_PKG_REQUIRE], [
 #     $2 = module name (optional, if different from id)
 #     $3 = optional flags:
 #          manualflags if CXXFLAGS, CPPFLAGS, LIBS should remain unchanged
 #     $4 = optional parameters, allowed are (evaluated in this order):
 #           - DEV_RPM_DIST_PKG=<name>
 #             special name for the RPM development package
 #           - DEV_DEB_DIST_PKG=<name>
 #             special name for the debian development package
 #           - DEV_DIST_PKG=<name>
 #             if the name of the development package is different
 #
 # uses PKG_CHECK_MODULES to test for a module
 # sets automake conditional HAVE_$1 to 0 (not found) or 1 (found)
@ -669,6 +927,23 @@ AC_DEFUN([AX_PKG_CHECK], [
  AC_SUBST(CPPFLAGS)
  AC_SUBST(CXXFLAGS)
  AC_SUBST(PKG_REQUIREMENTS)
  DEV_DEB_DIST_PKG=
  DEV_RPM_DIST_PKG=
  DEV_DIST_PKG=
  pkg=m4_default([$2], [$1])
  $4
  dep_pkg=${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev}
  rpm_pkg=${DEV_RPM_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-devel}
  if test -n "$(apt-cache policy -q ${deb_pkg} 2> /dev/null)"; then
    AX_DEB_BUILD_DEPEND([$deb_pkg])
  fi
  if (test -x /usr/bin/zypper && zypper search -x "$rpm_pkg" 1>&2 > /dev/null) || \
            (test -x /usr/bin/dnf && dnf list -q "$rpm_pkg" 1>&2 > /dev/null) || \
            (test -x /usr/bin/yum && yum list -q "$rpm_pkg" 1>&2 > /dev/null) || \
            (test -x /usr/sbin/urpmq && urpmq "$rpm_pkg" 1>&2 > /dev/null); then
    AX_RPM_BUILD_DEPEND([$rpm_pkg])
  fi
 ])
 # make sure, a specific header exists
@ -794,9 +1069,165 @@ AC_DEFUN([AX_CHECK_VALID_LD_FLAG], [
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_DEB_DEPEND_IFEXISTS], [
-  pkg=$1
+  pkg="$1"
  if test -n "$(apt-cache policy -q ${pkg} 2> /dev/null)"; then
-     DEB_DEPEND_IFEXISTS+=", ${pkg}"
+     DEB_DEPEND_IFEXISTS="${DEB_DEPEND_IFEXISTS}, ${pkg}"
  fi
 ])
 # require package in debian/control.in append @DEB_BUILD_DEPEND@ to Build-Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_DEB_BUILD_DEPEND], [
  pkg="$1"
  DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, ${pkg}"
 ])
 # require package in debian/control.in append @DEB_DEPEND@ to Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_DEB_DEPEND], [
  pkg="$1"
  DEB_DEPEND="${DEB_DEPEND}, ${pkg}"
 ])
 # require package in debian/control.in append @DEB_DEPEND@ to Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_DEB_SECTION], [
  pkg="$1"
  DEB_SECTION="${pkg}"
 ])
 # call after setting debian dependencies
 AC_DEFUN([AX_DEB_RESOLVE], [
  AC_SUBST(DEB_BUILD_DEPEND)
  AC_SUBST(DEB_DEPEND)
  AC_SUBST(DEB_SECTION)
  AC_SUBST(DEB_DEPEND_IFEXISTS)
 ])
 # Check if a package exists in the current distribution, if yes, require it
 # in .spec.in append @RPM_DEPEND_IFEXISTS@ to Build-Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_RPM_DEPEND_IFEXISTS], [
  pkg="$1"
  if (test -x /usr/bin/zypper && zypper search -x "$pkg" 1>&2 > /dev/null) || \
     (test -x /usr/bin/dnf && dnf list -q "$pkg" 1>&2 > /dev/null) || \
     (test -x /usr/bin/yum && yum list -q "$pkg" 1>&2 > /dev/null) || \
     (test -x /usr/sbin/urpmq && urpmq "$pkg" 1>&2 > /dev/null); then
       RPM_DEPEND_IFEXISTS="${RPM_DEPEND_IFEXISTS}, ${pkg}"
  fi
 ])
 # require package in .spec.in append @RPM_BUILD_DEPEND@ to Build-Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_RPM_BUILD_DEPEND], [
  pkg="$1"
  RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg}"
 ])
 # require package in .spec.in append @RPM_DEPEND@ to Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_RPM_DEPEND], [
  pkg="$1"
  if test -z "${RPM_DEPEND}"; then
    RPM_DEPEND="${pkg}"
  else
    RPM_DEPEND="${RPM_DEPEND}, ${pkg}"
  fi
 ])
 # require package in debian/control.in append @DEB_DEPEND@ to Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_RPM_GROUP], [
  pkg="$1"
  RPM_GROUP="${pkg}"
 ])
 # call after setting rpmian dependencies
 AC_DEFUN([AX_RPM_RESOLVE], [
  AC_SUBST(RPM_BUILD_DEPEND)
  AC_SUBST(RPM_DEPEND)
  AC_SUBST(RPM_GROUP)
  AC_SUBST(RPM_DEPEND_IFEXISTS)
 ])
 # Check if a package exists in the current distribution, if yes, require it
 # in .spec.in append @ALL_DEPEND_IFEXISTS@ to Build-Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_ALL_DEPEND_IFEXISTS], [
  pkg="$1"
  if test -n "$(apt-cache policy -q ${pkg} 2> /dev/null)"; then
     DEB_DEPEND_IFEXISTS="${DEB_DEPEND_IFEXISTS}, ${pkg}"
  fi
  if (test -x /usr/bin/zypper && zypper search -x "$pkg" 1>&2 > /dev/null) || \
     (test -x /usr/bin/dnf && dnf list -q "$pkg" 1>&2 > /dev/null) || \
     (test -x /usr/bin/yum && yum list -q "$pkg" 1>&2 > /dev/null) || \
     (test -x /usr/sbin/urpmq && urpmq "$pkg" 1>&2 > /dev/null); then
       RPM_DEPEND_IFEXISTS="${RPM_DEPEND_IFEXISTS}, ${pkg}"
  fi
 ])
 # Check if a package exists in the current distribution, if yes, require it
 # in .spec.in append @ALL_DEPEND_IFEXISTS@ to Build-Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_ALL_DEPEND_IFEXISTS_DEV], [
  pkg="$1"
  if test -n "$(apt-cache policy -q ${pkg}-dev 2> /dev/null)"; then
     DEB_DEPEND_IFEXISTS="${DEB_DEPEND_IFEXISTS}, ${pkg}-dev"
  fi
  if (test -x /usr/bin/zypper && zypper search -x "$pkg"-devel 1>&2 > /dev/null) || \
     (test -x /usr/bin/dnf && dnf list -q "$pkg"-devel 1>&2 > /dev/null) || \
     (test -x /usr/bin/yum && yum list -q "$pkg"-devel 1>&2 > /dev/null) || \
     (test -x /usr/sbin/urpmq && urpmq "$pkg"-devel 1>&2 > /dev/null); then
       RPM_DEPEND_IFEXISTS="${RPM_DEPEND_IFEXISTS}, ${pkg}-devel"
  fi
 ])
 # require package in .spec.in append @ALL_BUILD_DEPEND@ to Build-Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_ALL_BUILD_DEPEND], [
  pkg="$1"
  DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, ${pkg}"
  RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg}"
 ])
 # require package in .spec.in append @ALL_BUILD_DEPEND@ to Build-Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_ALL_BUILD_DEPEND_DEV], [
  pkg="$1"
  DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, ${pkg// /-dev}-dev"
  RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg// /-devel}-devel"
 ])
 # require package in .spec.in append @ALL_DEPEND@ to Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_ALL_DEPEND], [
  pkg="$1"
  DEB_DEPEND="${DEB_DEPEND}, ${pkg}"
  if test -z "${RPM_DEPEND}"; then
    RPM_DEPEND="${pkg}"
  else
    RPM_DEPEND="${RPM_DEPEND}, ${pkg}"
  fi
 ])
 # finish configuration - to be called instead of AC_OUTPUT
 AC_DEFUN([AX_OUTPUT], [
  AX_INIT_QT
  AX_DEB_RESOLVE
  AX_RPM_RESOLVE
  AC_OUTPUT
  AC_MSG_NOTICE([configured for ${PACKAGE_NAME}-${VERSION}])
 ])
--- a/bootstrap.sh
+++ b/bootstrap.sh
@ -31,8 +31,9 @@ while test $# -gt 0; do
        (--configure|-c) configure=1;;
        (--docker|-d) docker=1;;
        (--build|-b) configure=1; build=1; buildtarget+=" distcheck";;
-        (--all|-a) shift; configure=1; build=1; buildtarget+=" all";;
+        (--all|-a) configure=1; build=1; buildtarget+=" all";;
-        (--clean) shift; configure=1; build=1; buildtarget+=" maintainer-clean";;
+        (--install|-i) configure=1; build=1; buildtarget+=" all install";;
        (--clean) configure=1; build=1; buildtarget+=" maintainer-clean";;
        (--target|-t) shift; configure=1; build=1; buildtarget+=" $1";;
        (--overwrite|-o) overwrite=1;;
        (--rebuild|-r) rebuild=1;;
@ -53,6 +54,7 @@ OPTIONS
  --docker, -d               build and run tests in a docker instance
  --build, -b                build, also call ./configure && make distcheck
  --all, -a                  same as -b, but make target all
  --install, -i              same as -a, but add make install
  --clean                    same as -b, but make target maintainer-clean
  --target, -t <target>      same as -b, but specify target instead of distcheck
  --overwrite, -o            overwrite all basic files (bootstrap.sh, m4-macros)
@ -86,7 +88,7 @@ DESCRIPTION
  ${DEFAULT_PROJECT_NAME} as the project name for your project in
  ${PROJECT_PATH}. In the first run, you should call ${MY_NAME} from a
  checked out the bootstrap-build-environment from
-  https://dev.marc.waeckerlin.org/, and the path from where you call
+  https://mrw.sh/, and the path from where you call
  ${MY_NAME} (which is actually ${PROJECT_PATH}) should be the path to
  your newly created project. Please note that your project must be a
  checked out subversion or git repository, since this build
@ -96,7 +98,7 @@ DESCRIPTION
  subversion on https:/path/to/your/new-project:
    cd ~/svn
-    svn co https://dev.marc.waeckerlin.org/svn/bootstrap-build-environment/trunk \\
+    svn co https://svn.mrw.sh/bootstrap-build-environment/trunk \\
           bootstrap-build-environment
    svn co https:/path/to/your/new-project/trunk new-project
    cd new-project
@ -106,7 +108,7 @@ DESCRIPTION
  git on https:/path/to/your/new-project:
    cd ~/svn
-    svn co https://dev.marc.waeckerlin.org/svn/bootstrap-build-environment/trunk \\
+    svn co https://svn.mrw.sh/bootstrap-build-environment/trunk \\
           bootstrap-build-environment
    cd ~/git
    git clone https:/path/to/your/new-project
@ -129,28 +131,55 @@ 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
    * makefile_test.inc.am - makefile to be included in tests
    * resolve-debbuilddeps.sh - script to install debian package dependencies
    * resolve-rpmbuilddeps.sh - script to install RPM package dependencies
    * build-in-docker.sh - script to build the project encapsulated in a docker container
    * build-in-docker.conf - additional configuration for build-in-docker.sh
    * rpmsign.exp - script for signing rpms unattended
    * build-resource-file.sh - build resource.qrc file from a resource directory
    * sql-to-dot.sed - script to convert SQL schema files to graphviz dot in doxygen
    * mac-create-app-bundle.sh - script to create apple mac os-x app-bundle
    * dependency-graph.sh - script to draw project dependencies
    * template.sh - generic template for bash scripts
    * test/runtests.sh - template file to run test scripts, i.e. docker based
    * AUTHORS - replace your name in AUTHORS before first run
    * NEWS - empty file add your project's news
-    * README - add project description (first line is header, followed by an empty line)
+    * README (or README.md) - add project description (first line: header, followed by empty line)
    * configure.ac - global configuration file template
    * makefile.am - global makefile template
    * ${DEFAULT_PROJECT_NAME}.desktop.in - linux desktop file
    * 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
+    * etc/makefile.am - if you enable AX_USE_ETC
    * html/makefile.am - if you enabled AX_BUILD_HTML or AX_BUILD_HTML_NPM
    * html/package.json.in - if you enabled AX_BUILD_HTML_NPM
    * scripts/makefile.am - if you enabled AX_USE_SCRIPTS
-    * doc/makefile.am - if you enabled AX_USE_DOXYGEN
+    * nodejs/makefile.am - if you add AX_USE_NODEJS
    * nodejs/${DEFAULT_PROJECT_NAME}.js - if you add AX_USE_NODEJS
    * nodejs/package.json.in - if you add AX_USE_NODEJS
    * nodejs/etc/${DEFAULT_PROJECT_NAME}.json - if you add AX_USE_NODEJS
    * nodejs/etc/default/${DEFAULT_PROJECT_NAME} - if you add AX_USE_NODEJS
    * nodejs/etc/init/${DEFAULT_PROJECT_NAME}.conf - if you add AX_USE_NODEJS
    * nodejs/etc/systemd/system/${DEFAULT_PROJECT_NAME}.service - if you add AX_USE_NODEJS
    * nodejs/public - if you add AX_USE_NODEJS
    * nodejs/public/images - if you add AX_USE_NODEJS
    * nodejs/public/javascripts/${DEFAULT_PROJECT_NAME}.js - if you add AX_USE_NODEJS
    * nodejs/public/stylesheets/style.styl - if you add AX_USE_NODEJS
    * nodejs/routes/index.js - if you add AX_USE_NODEJS
    * nodejs/sockets/index.js - if you add AX_USE_NODEJS
    * nodejs/views/index.ejs - if you add AX_USE_NODEJS
    * nodejs/views/layout.ejs - if you add AX_USE_NODEJS
    * nodejs/node_modules - if you add AX_USE_NODEJS
    * doc/makefile.am - if you enabled AX_USE_DOXYGEN or AX_USE_PERLDOC
    * doc/doxyfile.in - if you enabled AX_USE_DOXYGEN
-    * test/makefile.am - if you enabled AX_BUILD_TEST or AX_USE_CPPUNIT
+    * doc/header.html.in - if you enabled AX_USE_DOXYGEN
    * doc/footer.html.in - if you enabled AX_USE_DOXYGEN
    * doc/style.css - if you enabled AX_USE_DOXYGEN
    * doc/plantuml.jar - if you enable AX_USE_DOXYGEN
    * test/makefile.am - if you enabled AX_USE_CPPUNIT and AX_USE_CXX
    * test/${DEFAULT_PROJECT_NAME#lib}.cxx - if you enabled AX_BUILD_TEST or AX_USE_CPPUNIT
    * examples/makefile.am - if you enabled AX_BUILD_EXAMPLES
    * debian/changelog.in - if you enabled AX_USE_DEBIAN_PACKAGING
    * debian/control.in - if you enabled AX_USE_DEBIAN_PACKAGING
@ -191,6 +220,7 @@ FILES TO EDIT
    * src/makefile.am
    * html/makefile.am
    * test/makefile.am
    * test/${DEFAULT_PROJECT_NAME}.cxx
    * examples/makefile.am
 FILE DEPENDENCIES
@ -199,10 +229,10 @@ FILE DEPENDENCIES
  configuration a dependent, i.e.:
    * test/makefile.am depends on AX_USE_LIBTOOL
-    * html/makefile.am depends on AX_BUILD_HTML
+    * html/makefile.am depends on AX_BUILD_HTML or AX_BUILD_HTML_NPM
    * doc/doxyfile.in depends on AX_BUILD_EXAMPLES
-    * debian/control.in depends on AX_USE_DOXYGEN, AX_USE_CPPUNIT
+    * debian/control.in depends on AX_USE_DOXYGEN, AX_USE_PERLDOC,
-      AX_CXX_QT, AX_CHECK_QT, AX_REQUIRE_QT, AX_USE_LIBTOOL
+      AX_USE_CPPUNIT AX_CXX_QT, AX_CHECK_QT, AX_REQUIRE_QT, AX_USE_LIBTOOL
    * debian/${DEFAULT_PROJECT_NAME}.install depends on AX_USE_LIBTOOL
    * debian/${DEFAULT_PROJECT_NAME}.dirs depends on AX_USE_LIBTOOL
    * debian/${DEFAULT_PROJECT_NAME}-dev.install depends on AX_USE_LIBTOOL
@ -233,9 +263,12 @@ FILES
                  number. In git, git rev-list --all --count is used.
                  The following macros are supported in configure.ac:
      * Enable C++: AX_USE_CXX
      * Enable system config files in /etc: AX_USE_ETC
      * Enable LibTool library creation: AX_USE_LIBTOOL
      * Enable Scripts: AX_USE_SCRIPTS
      * Enable NodeJS project: AX_USE_NODEJS
      * Enable Doxygen documentation generation: AX_USE_DOXYGEN
      * Enable Perldoc documentation generation: AX_USE_PERLDOC
      * Enable Debian packaging by calling "make deb": AX_USE_DEBIAN_PACKAGING
      * Enable RPM packaging by calling "make rpm": AX_USE_RPM_PACKAGING
      * Enable C++ testing using CppUnit: AX_USE_CPPUNIT
@ -271,19 +304,110 @@ EOF
    shift;
 done
-echo -en "\e[1m-> checking:\e[0m for version control system ..."
+# check if stdout is a terminal...
 if test -t 1; then
    # see if it supports colors...
    ncolors=$(tput colors)
    if test -n "$ncolors" && test $ncolors -ge 8; then
        bold="$(tput bold)"
        underline="$(tput smul)"
        standout="$(tput smso)"
        normal="$(tput sgr0)"
        black="$(tput setaf 0)"
        red="$(tput setaf 1)"
        green="$(tput setaf 2)"
        yellow="$(tput setaf 3)"
        blue="$(tput setaf 4)"
        magenta="$(tput setaf 5)"
        cyan="$(tput setaf 6)"
        white="$(tput setaf 7)"
    fi
 fi
 notice() {
    echo "${yellow}→ notice: ${bold}$*${normal}"
 }
 running() {
    echo -n "${bold}${blue}→ running: ${bold}${white}$*${normal} … "
 }
 checking() {
    echo -n "${bold}${blue}→ checking: ${bold}${white}$*${normal} … "
 }
 generating() {
    echo -n "${bold}${blue}→ generating: ${bold}${white}$*${normal} … "
 }
 configuring() {
    echo -n "${bold}${blue}→ configuring ${bold}${white}$1${normal}:"
    shift
    echo -n "${white}$*${normal} … "
 }
 ignored() {
    echo "${bold}${yellow}ignored $*${normal}"
 }
 success() {
    echo "${bold}${green}success $*${normal}"
 }
 error() {
    echo "${bold}${red}→ error: $1${normal}"
    shift
    if test -n "$*"; then
        echo "${bold}$*${normal}"
    fi
    exit 1
 }
 run() {
    check=1
    while test $# -gt 0; do
        case "$1" in
            (--no-check) check=0;;
            (*) break;;
        esac
        shift;
    done
    running $*
    result=$($* 2>&1)
    res=$?
    if test $res -ne 0; then
        if test $check -eq 1; then
            error "Failed with return code: $res" "$result"
        else
            ignored
        fi
    else
        success
    fi
 }
 checking for version control system
 VCS=""
 VCSDEPENDS=""
-if test -d .svn; then
+for path in . .. ../.. ../../..; do
    if test -d ${path}/.svn; then
        VCS="svn"
-    VCSDEPENDS="subversion,"
+        VCSDEPENDS_DEB="svn2cl, subversion, subversion-tools,"
-    echo -e " \e[32msuccess\e[0m detected ${VCS}"
+        VCSDEPENDS_RPM="subversion, "
-elif test -d .git; then
+        success detected ${VCS}
        break
    elif test -d ${path}/.git; then
        VCS="git"
-    VCSDEPENDS="git,"
+        VCSDEPENDS_DEB="git2cl, git,"
-    echo -e " \e[32msuccess\e[0m detected ${VCS}"
+        VCSDEPENDS_RPM="git, "
-else
+        success detected ${VCS}
-    echo -e " \e[33mignored\e[0m"
+        break
    fi
 done
 if test -z "$VCS"; then
    ignored
 fi
 HEADER='## @id '"\$Id\$"'
@ -311,41 +435,9 @@ CHEADER='/** @id '"\$Id\$"'
 '
 notice() {
    echo -e "\e[1;33m$*\e[0m"
 }
 run() {
    check=1
    while test $# -gt 0; do
        case "$1" in
            (--no-check) check=0;;
            (*) break;;
        esac
        shift;
    done
    echo -en "\e[1m-> running:\e[0m $* ..."
    result=$($* 2>&1)
    res=$?
    if test $res -ne 0; then
        if test $check -eq 1; then
            echo -e " \e[31merror\e[0m"
            echo -e "\e[1m*** Failed with return code: $res\e[0m"
            if test -n "$result"; then
                echo "$result"
            fi
            exit 1
        else
            echo -e " \e[33mignored\e[0m"
        fi
    else
        echo -e " \e[32msuccess\e[0m"
    fi
 }
 testtag() {
    local IFS="|"
-    egrep -q '^ *'"($*)" configure.ac
+    egrep -q '^ *'"($*)"' *(\(.*)? *$' configure.ac
 }
 contains() {
@ -395,18 +487,13 @@ to() {
        return 1
    fi
    checkdir "$(dirname ${1})"
-    echo -en "\e[1m-> generating:\e[0m $1 ..."
+    generating $1
    result=$(cat > "$1" 2>&1)
    res=$?
    if test $res -ne 0; then
-        echo -e " \e[31merror\e[0m"
+        error "Failed with return code: $res" "$result"
        echo -e "\e[1m*** Failed with return code: $res\e[0m"
        if test -n "$result"; then
            echo "$result"
        fi
        exit 1
    else
-        echo -e " \e[32msuccess\e[0m"
+        success
    fi
    run chmod $mode $1
    if test $exists -eq 0; then
@ -433,6 +520,9 @@ copy() {
            source="${0%/*}/$1"
        fi
    fi
    if test "${1%/*}" != "$1"; then
        test -d "${1%/*}" || svn mkdir "${1%/*}"
    fi
    run cp "${source}" "$1"
    if test $exists -eq 0; then
        if test -n "${VCS}" -a $novcs -eq 0 && ! contains "$1" "${excludevcs[@]}"; then
@ -445,24 +535,20 @@ copy() {
 }
 doxyreplace() {
-    echo -en "\e[1m-> doxyfile:\e[0m configure $1 ..."
+    configuring doxyfile $1
    if sed -i 's|\(^'"$1"' *=\) *.*|\1'" $2"'|g' doc/doxyfile.in; then
-        echo -e " \e[32msuccess\e[0m"
+        success
    else
-        echo -e " \e[31merror\e[0m"
+        error $0 $*
        echo -e "\e[1m**** command: $0 $*\e[0m"
        exit 1
    fi
 }
 doxyadd() {
-    echo -en "\e[1m-> doxyfile:\e[0m configure $1 ..."
+    configuring  doxyfile $1
    if sed -i '/^'"$1"' *=/a'"$1"' += '"$2" doc/doxyfile.in; then
-        echo -e " \e[32msuccess\e[0m"
+        success
    else
-        echo -e " \e[31merror\e[0m"
+        error $0 $*
        echo -e "\e[1m**** command: $0 $*\e[0m"
        exit 1
    fi
 }
@ -473,11 +559,18 @@ vcs2cl() {
    else
        touch "ChangeLog"
    fi
    if test -x $(which timeout); then
        local TIMEOUT="timeout 10"
    else
        local TIMEOUT=
    fi
    if test -x $(which ${VCS}2cl); then
        if test "${VCS}" = "git"; then
-            ${VCS}2cl > ChangeLog
+            $TIMEOUT ${VCS}2cl || true > ChangeLog
        elif test "${VCS}" = "svn"; then
            $TIMEOUT ${VCS}2cl --break-before-msg -a -i || true
        elif test -n "${VCS}"; then
-            ${VCS}2cl
+            $TIMEOUT ${VCS}2cl || true
        fi
    fi
    if test $exists -eq 0; then
@ -500,13 +593,17 @@ copy ${MY_NAME}
 copy ax_init_standard_project.m4
 copy ax_cxx_compile_stdcxx_11.m4
 copy ax_check_qt.m4
 copy makefile_test.inc.am
 copy resolve-debbuilddeps.sh
 copy resolve-rpmbuilddeps.sh
 copy build-in-docker.sh
 copy rpmsign.exp
 copy build-resource-file.sh
 copy sql-to-dot.sed
 copy mac-create-app-bundle.sh
-AUTHOR=$(gpg -K  | sed -n 's,uid *,,p' | sort | head -1)
+copy dependency-graph.sh
 copy template.sh
 AUTHOR=$(gpg -K 2>/dev/null | sed -n 's,uid *\(\[ultimate\] *\)\?,,p' | head -1)
 if test -z "${AUTHOR}"; then
    AUTHOR="FIRSTNAME LASTNAME (URL) <EMAIL>"
 fi
@ -516,13 +613,24 @@ EOF
 to NEWS <<EOF && notice "please edit NEWS"
 $(date) created ${DEFAULT_PROJECT_NAME}
 EOF
-to README <<EOF && notice "please edit README"
+if test -e README.md; then
    README=README.md
 else
    README=README
    to README <<EOF && notice "please edit README"
 ${DEFAULT_PROJECT_NAME}
 add description for ${DEFAULT_PROJECT_NAME}
 EOF
 fi
 DESCRIPTION=$(head -1 $README | sed 's,^#\+ *,,;s, *#\+$,,')
 to configure.ac <<EOF && notice "please edit configure.ac, then rerun $0" && exit 0
-${HEADER}m4_define(x_package_name, ${DEFAULT_PROJECT_NAME}) # project's name
+${HEADER}# default is generated from AUTHORS and project name
 PROJECT_URL=
 SOURCE_DOWNLOAD=
 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
 m4_include(ax_init_standard_project.m4)
@ -532,15 +640,19 @@ AX_INIT_STANDARD_PROJECT
 # requirements, uncomment, what you need:
 #AX_USE_CXX
 #AX_USE_ETC
 #AX_USE_LIBTOOL
 #AX_USE_SCRIPTS
 #AX_USE_NODEJS
 #AX_USE_DOXYGEN
 #AX_USE_PERLDOC
 #AX_USE_DEBIAN_PACKAGING
 #AX_USE_RPM_PACKAGING
 #AX_USE_CPPUNIT
 #AX_BUILD_TEST
 #AX_BUILD_EXAMPLES
 #AX_BUILD_HTML
 #AX_BUILD_HTML_NPM
 # qt features, uncomment, what you need:
 #AX_CHECK_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets])
@ -548,7 +660,7 @@ AX_INIT_STANDARD_PROJECT
 #AX_QT_NO_KEYWORDS
 # create output
-AC_OUTPUT
+AX_OUTPUT
 EOF
 PACKAGE_NAME=$(sed -n 's/.*m4_define *( *x_package_name *, *\([^ ]*\) *).*/\1/p' configure.ac)
@ -562,6 +674,20 @@ if ! testtag AX_CHECK_QT && \
   ! testtag AX_REQUIRE_QT; then
    echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | \
        to --condition AX_USE_CXX src/makefile.am
    if ! ls src/*.[ch]xx; then
        to --condition AX_USE_CXX src/${PACKAGE_NAME#lib}.hxx <<EOF
 ${CHEADER}#ifndef ${PackageName^^}_HXX
 #define ${PackageName^^}_HXX
 /** @mainpage @description
    @readme
    */
 #endif
 EOF
    fi
 elif ! test -e src/makefile.am; then
    to --condition AX_USE_CXX src/makefile.am <<EOF
 ${HEADER}bin_PROGRAMS = ${PACKAGE_NAME}
@ -574,7 +700,7 @@ LANGUAGE_FILE_BASE = ${PACKAGE_NAME}
 QT_PLUGINS = iconengines imageformats platforms
 #### enable if you deliver a KDE/Gnome desktop file
-#applicationsdir = ${datarootdir}/applications
+#applicationsdir = \${datarootdir}/applications
 #dist_applications_DATA = ${PACKAGE_NAME}.desktop
 #### enable (ev. instead of bin_PROGRAMS) if you build a library
@ -611,25 +737,26 @@ ${PACKAGE_NAME//-/_}_TR_FILES = main.cxx version.cxx
 ${PACKAGE_NAME//-/_}_SOURCES = \${${PACKAGE_NAME//-/_}_TR_FILES} \${BUILT_SOURCES}
 ## automatic assembly, no need to change
-BUILT_SOURCES = \${${PACKAGE_NAME//-/_}_MOCFILES} \
+BUILT_SOURCES = \${${PACKAGE_NAME//-/_}_MOCFILES} \\
-                \${${PACKAGE_NAME//-/_}_UIFILES} \
+                \${${PACKAGE_NAME//-/_}_UIFILES} \\
-                \${${PACKAGE_NAME//-/_}_TRANSLATIONS} \
+                \${${PACKAGE_NAME//-/_}_TRANSLATIONS} \\
                \${${PACKAGE_NAME//-/_}_RESOURCES}
 ## automatic assembly, no need to change
-EXTRA_DIST_TR = \${${PACKAGE_NAME//-/_}_MOCFILES:moc_%.cxx=%.hxx} \
+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} \
+EXTRA_DIST = \${EXTRA_DIST_TR} \\
-             \${${PACKAGE_NAME//-/_}_RESOURCES:qrc_%.cxx:%.qrc} \
+             \${${PACKAGE_NAME//-/_}_RESOURCES:qrc_%.cxx=%.qrc} \\
-             \${${PACKAGE_NAME//-/_}_TRANSLATIONS:%.qm=%.ts} \
+             \${${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}
 CLEANFILES = \${${PACKAGE_NAME//-/_}_RESOURCES}
 MAINTAINERCLEANFILES = makefile.in
 EOF
    to --condition AX_USE_CXX src/main.cxx <<EOF
@ -637,9 +764,13 @@ ${CHEADER}#include <${PACKAGE_NAME}.hxx>
 #include <QApplication>
 #include <QCommandLineParser>
 #include <iostream>
 #include <version.hxx>
 int main(int argc, char *argv[]) try {
  QApplication a(argc, argv);
  a.setApplicationDisplayName(a.tr("${PACKAGE_NAME}"));
  a.setApplicationName(${PACKAGE_NAME}::package_name().c_str());
  a.setApplicationVersion(${PACKAGE_NAME}::version().c_str());
  QCommandLineParser parser;
  parser.addHelpOption();
  parser.process(a);
@ -652,10 +783,17 @@ int main(int argc, char *argv[]) try {
  return 1;
 }
 EOF
-    to --condition AX_USE_CXX src/${PACKAGE_NAME}.hxx <<EOF
+    if ! ls src/*.[ch]xx; then
        to --condition AX_USE_CXX src/${PACKAGE_NAME#lib}.hxx <<EOF
 ${CHEADER}#ifndef ${PackageName^^}_HXX
 #define ${PackageName^^}_HXX
 /** @mainpage @description
    @readme
    */
 #include <QMainWindow>
 #include <ui_${PACKAGE_NAME}.hxx>
@ -665,6 +803,7 @@ class ${PackageName}: public QMainWindow, protected Ui::${PackageName} {
    Q_OBJECT;
  public:
    explicit ${PackageName}(QWidget *parent = 0): QMainWindow(parent) {
      setTitle(tr("${PACKAGE_NAME}[*]"));
      setupUi(this);
    }
    virtual ~${PackageName}() {}
@ -672,7 +811,8 @@ class ${PackageName}: public QMainWindow, protected Ui::${PackageName} {
 #endif
 EOF
-    to --condition AX_USE_CXX src/${PACKAGE_NAME}.ui <<EOF
+    fi
    to --condition AX_USE_CXX src/${PACKAGE_NAME#lib}.ui <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
 <class>${PackageName}</class>
@ -754,7 +894,7 @@ EOF
 to --condition AX_USE_CXX src/version.cxx <<EOF
 /*! @file
-    @id $Id\$
+    @id \$Id\$
 */
 //       1         2         3         4         5         6         7         8
 // 45678901234567890123456789012345678901234567890123456789012345678901234567890
@ -793,12 +933,365 @@ namespace NAMESPACE {
  const std::string IDENT("\$Id: " PACKAGE_STRING);
 }
 EOF
 to --condition AX_USE_ETC etc/makefile.am <<EOF
 ${HEADER}pkgsysconfdir = \${sysconfdir}/@PACKAGE_NAME@
 dist_pkgsysconf_DATA = 
 MAINTAINERCLEANFILES = makefile.in
 EOF
 to --condition AX_USE_SCRIPTS scripts/makefile.am <<EOF
 ${HEADER}dist_bin_SCRIPTS =
 MAINTAINERCLEANFILES = makefile.in
 EOF
-echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_DOXYGEN doc/makefile.am
+if testtag AX_USE_NODEJS; then
    checkdir nodejs
    checkdir nodejs/public
    checkdir nodejs/public/images
    checkdir nodejs/etc
    checkdir nodejs/etc/systemd
 fi
 to --condition AX_USE_NODEJS nodejs/makefile.am <<EOF
 ${HEADER}EXTRA_DIST = @PACKAGE_NAME@.js package.json.in public routes sockets views
 nodejsdir = \${pkgdatadir}/nodejs
 sysconfdefaultdir = \${sysconfdir}/default
 sysconfinitdir = \${sysconfdir}/init
 dist_sysconf_DATA = \${sysconfdir}/@PACKAGE_NAME@.json
 dist_sysconfdefault_DATA = \${sysconfdir}/default/@PACKAGE_NAME@
 dist_sysconfinit_DATA = \${sysconfdir}/init/@PACKAGE_NAME@.conf
 all: node_modules
 node_modules: package.json.in
 	HOME=. npm install
 clean-local:
 	-rm -r node_modules .npm
 install-data-hook:
 	test -d \$(DESTDIR)\${nodejsdir} || mkdir -p \$(DESTDIR)\${nodejsdir}
 	chmod -R u+w \$(DESTDIR)\${nodejsdir}
 	cp -r . \$(DESTDIR)\${nodejsdir}
 uninstall-local:
 	-chmod -R u+w \$(DESTDIR)\${nodejsdir}
 	-rm -rf \$(DESTDIR)\${nodejsdir}
 MAINTAINERCLEANFILES = makefile.in
 EOF
 to --condition AX_USE_NODEJS nodejs/${PACKAGE_NAME}.js <<EOF
 ${CHEADER}try {
  process.on('uncaughtException', function(e) {
    console.log("**** UNCAUGHT EXCEPTION ****");
    console.log(e);
    console.log(e.stack);
    process.exit(1);
  });
  /**
   * Module dependencies.
   */
  var express = require('express')
    , routes = require(__dirname+'/routes');
  var app = module.exports = express.createServer();
  var io  = require('socket.io').listen(app);
  var package = require(__dirname+'/package.json');
  var config = require(package.path.config);
  var authentication = require(__dirname+'/authentication')(config.restrict);
  var sockets = require(__dirname+'/sockets')(io, authentication);
  // Configuration
  process.argv.forEach(function(val, index) {
    if (index<2) {return}
    if (index!=2 || isNaN(val)) {
      console.log("**** ERROR: Unexpected Argument - allowed is only a port number");
      process.exit(1);
    }
    config.port = parseInt(val);
  });
  if (typeof config.port != 'number') {
    console.log("**** WARNING: no valid port given, defaults to 8888");
    config.port = 8888;
  }
  app.configure(function(){
    app.set('views', __dirname + '/views');
    app.set('view engine', 'ejs');
    app.use(express.bodyParser());
    app.use(express.methodOverride());
    app.use(require('stylus').middleware({ src: __dirname + '/public' }));
    app.use(app.router);
    app.use(express.static(__dirname + '/public'));
  });
  app.configure('development', function(){
    app.use(express.errorHandler({ dumpExceptions: true, showStack: true }));
  });
  app.configure('production', function(){
    app.use(express.errorHandler());
  });
  // Routes
  app.get('/', routes.index);
  app.listen(config.port, function() {
    console.log("Express server listening on port %d in %s mode",
                app.address().port, app.settings.env);
  });
 } catch (e) {
  console.log("**** EXCEPTION ****");
  console.log(e);
  console.log(e.stack);
  process.exit(1);
 }
 EOF
 to --condition AX_USE_NODEJS nodejs/package.json.in <<EOF
 {
  "name": "@PACKAGE_NAME@",
  "version": "@PACKAGE_VERSION@",
  "private": true,
  "dependencies": {
    "express": "~2.5.8",
    "stylus": "~0.53.0",
    "ejs": ">= 0.0.1",
    "socket.io": "~1.4.4",
    "socketio-auth": "0.0.5",
    "ldapauth": "git+https://github.com/DimensionSoftware/node-ldapauth.git"
  },
  "description": "@DESCRIPTION@",
  "main": "@PACKAGE_NAME@.js",
  "devDependencies": {},
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1"
  },
  "author": "@AUTHOR@",
  "license": "@LICENSE@",
  "path": {
      "prefix": "@PREFIX@",
      "sysconf": "@SYSCONFDIR@",
      "pkgdata": "@PKGDATADIR@",
      "localstate": "@LOCALSTATEDIR@",
      "log": "@LOCALSTATEDIR@/log/@PACKAGE_NAME@.log",
      "config":  "@SYSCONFDIR@/@PACKAGE_NAME@.json",
      "nodejs": "@PKGDATADIR@/nodejs"
  }
 }
 EOF
 to --condition AX_USE_NODEJS nodejs/etc/${PACKAGE_NAME}.json <<EOF
 {
  "port": 8888,
  "restrict": {
    "passwords": {
      "foo": ["sha256", "fcde2b2edxx56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9"]
    },
    "ldap": {
      "url": "ldap://your.ldap.host",
      "adminDn": "cn=tmp,ou=system,ou=people,dc=your,dc=ldap,dc=host",
      "adminPassword": "secret",
      "searchBase": "ou=person,ou=people,dc=your,dc=ldap,dc=host",
      "searchFilter": "(uid={{username}})"
    }
  }
 }
 EOF
 PACKAGE_NAME_UPPER=$(echo ${PACKAGE_NAME} | tr '+[:lower:]' 'X[:upper:]' | tr -cd '[[:alnum:]]._-')
 to --condition AX_USE_NODEJS nodejs/etc/default/${PACKAGE_NAME} <<EOF
 #EXEC_${PACKAGE_NAME_UPPER}="/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME}"
 #${PACKAGE_NAME_UPPER}_LOG="/var/log/${PACKAGE_NAME}.log"
 #${PACKAGE_NAME_UPPER}="${PACKAGE_NAME}"
 #${PACKAGE_NAME_UPPER}_PORT="8888"
 EOF
 to --condition AX_USE_NODEJS nodejs/etc/init/${PACKAGE_NAME}.conf <<EOF
 #!upstart
 description "$DESCRIPTION"
 author      "$(head -1 AUTHORS)"
 start on (local-filesystems and net-device-up)
 stop on runlevel [!2345]
 respawn
 script
    echo \$\$ > /var/run/${PACKAGE_NAME}.pid
    # there are some useful defaults
    # do not edit this file, overwrite values in /etc/default/${PACKAGE_NAME}
    EXEC_${PACKAGE_NAME_UPPER}="/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME}"
    ${PACKAGE_NAME_UPPER}_LOG="/var/log/${PACKAGE_NAME}.log"
    ${PACKAGE_NAME_UPPER}_USER="${PACKAGE_NAME}"
    ${PACKAGE_NAME_UPPER}_PORT=""
    [ -r /etc/default/${PACKAGE_NAME} ] && . /etc/default/${PACKAGE_NAME}
    if test -n "\${${PACKAGE_NAME_UPPER}_USER}"; then
        exec sudo -u "\${${PACKAGE_NAME_UPPER}_USER}" \${EXEC_${PACKAGE_NAME_UPPER}} \${${PACKAGE_NAME_UPPER}_PORT} >> \${${PACKAGE_NAME_UPPER}_LOG} 2>&1
    else
        exec \${EXEC_${PACKAGE_NAME_UPPER}} \${${PACKAGE_NAME_UPPER}_PORT} >> \${${PACKAGE_NAME_UPPER}_LOG} 2>&1
    fi
 end script
 pre-start script
    ${PACKAGE_NAME_UPPER}_LOG="/var/log/${PACKAGE_NAME}.log"
    [ -r /etc/default/${PACKAGE_NAME} ] && . /etc/default/${PACKAGE_NAME}
    # Date format same as (new Date()).toISOString() for consistency
    echo "[`date -u +%Y-%m-%dT%T.%3NZ`] (sys) Starting" >> \${${PACKAGE_NAME_UPPER}_LOG}
 end script
 pre-stop script
    ${PACKAGE_NAME_UPPER}_LOG="/var/log/${PACKAGE_NAME}.log"
    [ -r /etc/default/${PACKAGE_NAME} ] && . /etc/default/${PACKAGE_NAME}
    rm /var/run/${PACKAGE_NAME}.pid
    echo "[`date -u +%Y-%m-%dT%T.%3NZ`] (sys) Stopping" >> \${${PACKAGE_NAME_UPPER}_LOG}
 end script
 EOF
 to --condition AX_USE_NODEJS nodejs/etc/systemd/system/${PACKAGE_NAME}.service <<EOF
 [Unit]
 Description=$DESCRIPTION
 [Service]
 ExecStart=/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME}
 StandardOutput=journal
 StandardError=journal
 Restart=on-abort
 [Install]
 WantedBy=multi-user.target
 EOF
 to --condition AX_USE_NODEJS nodejs/public/javascripts/${PACKAGE_NAME}.js <<EOF
 ${CHEADER}var socket = null;
 function init() {
  socket = io.connect();
  /*
  socket
    .io
    .on("connect", connect)
    .on("reconnect", connect)
    .on("disconnect", disconnected)
    .on("error", disconnected);
  socket
    .on("authenticated", authenticated)
    .on("unauthorized", unauthorized)
    .on("fail", error);
  */
 }
 /// On Load, Call @ref start
 /*
   \$(window.onbeforeunload = function() {
   return "Are you sure you want to navigate away?";
   });
 */
 \$(init);
 EOF
 to --condition AX_USE_NODEJS nodejs/public/stylesheets/style.styl <<EOF
 body
  padding: 50px
  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif
 a
  color: #00B7FF
 EOF
 to --condition AX_USE_NODEJS nodejs/routes/index.js <<EOF
 ${CHEADER}var package = require(__dirname+"/../package.json");
 exports.index = function(req, res) {
  res.render('index', {
    packagename: package.name,
    packageversion: package.version
  });
 };
 EOF
 to --condition AX_USE_NODEJS nodejs/sockets/index.js <<EOF
 module.exports = function(io, authentication) {
  var module={};
  function broadcast(signal, data) {
    console.log("<= signal: "+signal);
    io.sockets.emit(signal, data);
  }
  function fail(txt, data) {
    console.log("** "+txt, data);
  }
  function connection(socket, userdata) {
    console.log("=> new connection from "+userdata.username);
    function emit(signal, data, info) {
      if (typeof data == 'string' && !data.match("\n")) {
        console.log("<- signal: "+signal+"("+data+")");
      } else {
        console.log("<- signal: "+signal);
      }
      if (info) console.log(info);
      socket.emit(signal, data);
    }
    function fail(txt, data) {
      console.log("** "+txt, data);
      emit("fail", txt);
    }
    /*
    socket
      .on("xxx", xxx)
      .on("yyy", yyy;
    */
  }
  // Handle Connection
  require('socketio-auth')(io, {
    authenticate: function (socket, data, callback) {
      console.log("=> authenticate: ", data.username);
      //get credentials sent by the client
      var username = data.username;
      var password = data.password;
      authentication(data.username, data.password,
                     function() {
                       console.log("####LOGIN-SUCESS####");
                       callback(null, true)
                     },
                     function() {
                       console.log("####LOGIN-FAIL####");
                       callback(new Error("wrong credentials"))
                     });
    },
    postAuthenticate: connection,
    timeout: "none"
  });
  return module;
 }
 EOF
 to --condition AX_USE_NODEJS nodejs/views/index.ejs <<EOF
 <!DOCTYPE html>
 <html>
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    <meta name="viewport" content="width=device-width initial-scale=1" />
    <link href="stylesheets/style.css" rel="stylesheet" type="text/css" />
    <script type="text/javascript" src="/socket.io/socket.io.js"></script>
    <script type="text/javascript" src="javascripts/${PACKAGE_NAME}.js"></script>
    <title>$DESCRIPTION</title>
  </head>
  <body>
    <h1>$DESCRIPTION</h1>
    <p>generated by bootstrap, please edit</p>
  </body>
 </html>
 EOF
 to --condition AX_USE_NODEJS nodejs/views/layout.ejs <<EOF
 <%- body %>
 EOF
 echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition 'AX_USE_DOXYGEN|AX_USE_PERLDOC' doc/makefile.am
 if testtag AX_BUILD_TEST; then
    to test/runtests.sh < ${0%/*}/test/runtests.sh
 fi
@ -809,31 +1302,205 @@ AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src
 AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs
 $(if testtag AX_USE_LIBTOOL; then
 cat <<EOF3
-LDADD = -l${PACKAGE_NAME#lib}
+LDADD = -lcppunit -l${PACKAGE_NAME#lib}
 EOF3
 fi)
 EOF2
 fi)
-TESTS =
+check_PROGRAMS = ${PACKAGE_NAME#lib}
 TESTS = \${check_PROGRAMS}
 ${PACKAGE_NAME#lib}_SOURCES = ${PACKAGE_NAME#lib}.cxx
 MAINTAINERCLEANFILES = makefile.in
 EOF
 to --condition AX_USE_CPPUNIT --condition AX_USE_CXX test/${PACKAGE_NAME#lib}.cxx <<EOF
 ${CHEADER}
 #include <cppunit/TestFixture.h>
 #include <cppunit/ui/text/TestRunner.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <cppunit/XmlOutputter.h>
 #include <fstream>
 /// @todo Rename DummyTest and DummyTest::dummy()
 /// @todo Write test cases
 class DummyTest: public CppUnit::TestFixture { 
  public:
    void dummy() {
    }
    CPPUNIT_TEST_SUITE(DummyTest);
    CPPUNIT_TEST(dummy);
    CPPUNIT_TEST_SUITE_END();
 };
 CPPUNIT_TEST_SUITE_REGISTRATION(DummyTest);
 int main(int argc, char** argv) try {
  std::ofstream ofs((*argv+std::string(".xml")).c_str());
  CppUnit::TextUi::TestRunner runner;
  runner.setOutputter(new CppUnit::XmlOutputter(&runner.result(), ofs));
  runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
  return runner.run() ? 0 : 1;
 } catch (std::exception& e) {
  std::cerr<<"***Exception: "<<e.what()<<std::endl;
  return 1;
 }
 EOF
 to --condition AX_BUILD_EXAMPLES examples/makefile.am <<EOF
 ${HEADER}AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src
 AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs
 LDADD = -l${PACKAGE_NAME#lib}
 exampledir = ${docdir}/examples
 example_DATA = 
 MAINTAINERCLEANFILES = makefile.in
 EOF
-to --condition AX_BUILD_HTML html/makefile.am <<EOF
+to --condition AX_BUILD_HTML_NPM html/package.json.in <<EOF
-${HEADER}EXTRA_DIST = \${www_DATA}
+{
  "name": "@PACKAGE_NAME@",
  "version": "@PACKAGE_VERSION@",
  "private": true,
  "dependencies": {
  },
  "description": "@DESCRIPTION@",
  "devDependencies": {},
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1"
  },
  "author": "@AUTHOR@",
  "license": "@LICENSE@",
  "path": {
      "prefix": "@PREFIX@",
      "sysconf": "@SYSCONFDIR@",
      "pkgdata": "@PKGDATADIR@",
      "localstate": "@LOCALSTATEDIR@",
      "log": "@LOCALSTATEDIR@/log/@PACKAGE_NAME@.log",
      "config":  "@SYSCONFDIR@/@PACKAGE_NAME@.json",
      "nodejs": "@PKGDATADIR@/nodejs"
  }
 }
 EOF
 to --condition 'AX_BUILD_HTML|AX_BUILD_HTML_NPM' html/makefile.am <<EOF
 ${HEADER}EXTRA_DIST = $(testtag AX_BUILD_HTML_NPM && echo "package.json.in")
 wwwdir = \${pkgdatadir}/html
-www_DATA = 
+www_DATA = $(testtag AX_BUILD_HTML_NPM && echo "package.json")
 dist_www_DATA = 
 $(if testtag AX_BUILD_HTML_NPM; then
 cat<<EOF2
 all: node_modules
 node_modules: package.json.in
 	HOME=. npm install
 clean-local:
 	-rm -r node_modules .npm
 install-data-hook:
 	test -d \$(DESTDIR)\${wwwdir} || mkdir -p \$(DESTDIR)\${wwwdir}
 	chmod -R u+w \$(DESTDIR)\${wwwdir}
 	cp -r . \$(DESTDIR)\${wwwdir}
 uninstall-local:
 	-chmod -R u+w \$(DESTDIR)\${wwwdir}
 	-rm -rf \$(DESTDIR)\${wwwdir}
 EOF2
 fi)
 MAINTAINERCLEANFILES = makefile.in
 EOF
 to --condition AX_USE_DOXYGEN doc/header.html.in <<EOF
 <!-- HTML header for doxygen 1.8.6-->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen \$doxygenversion"/>
 <!--BEGIN PROJECT_NAME--><title>\$projectname: \$title</title><!--END PROJECT_NAME-->
 <!--BEGIN !PROJECT_NAME--><title>\$title</title><!--END !PROJECT_NAME-->
 <link href="\$relpath^tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="\$relpath^jquery.js"></script>
 <script type="text/javascript" src="\$relpath^dynsections.js"></script>
 \$treeview
 \$search
 \$mathjax
 <link href="\$relpath^\$stylesheet" rel="stylesheet" type="text/css" />
 \$extrastylesheet
 </head>
 <body>
 <div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
  <div id="projecthead">
    <div id="projectlogo"><img alt="" src="\$relpath^\$projectlogo"/></div>
    <div id="projectname">\$projectname</span>&#160;<span id="projectnumber">\$projectnumber</div>
    <div id="projectbrief">\$projectbrief</div>
  </div>
  <nav>
    <a href="@PROJECT_URL@" target="_blank">Project Management</a>
    <a href="@SOURCE_DOWNLOAD@" target="_blank">Download</a>
    <div>\$searchbox</div>
  </nav>
 </div>
 EOF
 to --condition AX_USE_DOXYGEN doc/footer.html.in <<EOF
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
  <ul>
    \$navpath
    <li class="footer"><a href="@AUTHOR_URL@" target="_blank">@AUTHOR_NAME@</a></li>
  </ul>
 </div>
 </body>
 </html>
 EOF
 to --condition AX_USE_DOXYGEN doc/style.css <<EOF
 #titlearea {
  display: flex;
  justify-content: space-between;
  align-items: flex-begin;
 }
 #titlearea nav {
  padding: 0;
  margin: 0;
 }
 #titlearea nav a {
  background-color: lightgray;
  border: 1px solid gray;
  color: black;
  padding: 1ex;
  margin: 0;
 }
 img, object {
  max-width: 100% !important;
 }
@media (max-width: 50em) {
  #navrow1, #navrow2 {
    display: block
  }
  #side-nav, #splitbar, .ui-resizable-handle ui-resizable-e, .ui-resizable-handle ui-resizable-s {
    display: none;
  }
  #doc-content {
    margin-left: 0 !important;
  }
 }
@media (min-width: 50em) {
  #navrow1, #navrow2 {
    display: none;
  }
  #side-nav, #splitbar, .ui-resizable-handle ui-resizable-e, .ui-resizable-handle ui-resizable-s {
    display: block
  }
 }
 EOF
 if testtag AX_USE_DOXYGEN; then
    copy doc/plantuml.jar
 fi
 if testtag AX_USE_DOXYGEN; then
    if ! checkfile doc/doxyfile.in || \
        contains doc/doxyfile.in "${rebuildfiles[@]}"; then
@ -854,12 +1521,16 @@ if testtag AX_USE_DOXYGEN; then
        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 '"copy=\\par Copyright by <a href="@AUTHOR_URL@" target="_blank">@AUTHOR_NAME@</a>\\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 "'
        doxyadd ALIASES '"api=\\xrefitem api \\"API Call\\" \\"\\""'
        doxyadd ALIASES '"description=@DESCRIPTION@"'
        doxyadd ALIASES '"readme=@README_HTML@"'
        doxyadd ALIASES '"author=<a href="@AUTHOR_URL@" target="_blank">@AUTHOR_NAME@</a>"'
        doxyreplace PLANTUML_JAR_PATH '"@top_srcdir@/doc/plantuml.jar"'
        doxyreplace ENABLE_PREPROCESSING YES
        doxyreplace MACRO_EXPANSION YES
        doxyadd PREDEFINED '"NAMESPACE=@PACKAGE_NAME@"'
@ -886,9 +1557,20 @@ if testtag AX_USE_DOXYGEN; then
        if testtag AX_BUILD_TEST AX_USE_CPPUNIT; then
            doxyadd INPUT "@top_srcdir@/test"
        fi
        if testtag AX_USE_NODEJS; then
            doxyadd INPUT "@top_srcdir@/nodejs"
            doxyadd EXCLUDE "@top_srcdir@/nodejs/node_modules"
 	    doxyadd EXCLUDE "@top_srcdir@/nodejs/public/javascripts/ext"
        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 *.sql'
        doxyreplace RECURSIVE YES
-        doxyreplace EXCLUDE_PATTERNS "moc_* uic_* qrc_*"
+        doxyreplace EXCLUDE_PATTERNS "moc_* uic_* qrc_* version.[ch]xx"
        doxyreplace HTML_HEADER header.html
        doxyreplace HTML_FOOTER footer.html
        doxyreplace HTML_EXTRA_STYLESHEET style.css
        doxyreplace HTML_DYNAMIC_SECTIONS YES
        doxyreplace DISABLE_INDEX NO
        doxyreplace GENERATE_TREEVIEW YES 
        if testtag AX_BUILD_EXAMPLES; then
            doxyreplace EXAMPLE_PATH @top_srcdir@/examples
        fi
@ -897,7 +1579,6 @@ if testtag AX_USE_DOXYGEN; then
        doxyreplace SOURCE_BROWSER YES
        doxyreplace INLINE_SOURCES YES
        doxyreplace GENERATE_TESTLIST YES
        doxyreplace GENERATE_TREEVIEW NO
        doxyreplace SEARCHENGINE NO
        doxyreplace GENERATE_HTML YES
        doxyreplace GENERATE_LATEX NO
@ -920,21 +1601,22 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
    to debian/changelog.in <<EOF
@PACKAGE@ (@PACKAGE_VERSION@~@DISTRO@.@BUILD_NUMBER@) @DISTRO@; urgency=low
-  * Please see ChangeLog of @PACKAGE@
+@DEB_CHANGELOG@
- -- @AUTHOR@  @BUILD_DATE@
+ -- @PACKAGER@  @BUILD_DATE@
 EOF
-    BUILD_DEPENDS="debhelper, ${VCSDEPENDS} pkg-config, automake, libtool, 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_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)"
+    RUN_DEPENDS="$(if testtag AX_USE_NODEJS; then echo -n ", nodejs, npm"; fi)"
    BUILD_DEPENDS="debhelper, fakeroot, ${VCSDEPENDS_DEB} pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release$(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen, default-jre-headless|default-jre"; fi; if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)"
    to debian/control.in <<EOF
 Source: @PACKAGE_NAME@
 Priority: extra
-Maintainer: @AUTHOR@
+Maintainer: @PACKAGER@
-Build-Depends: ${BUILD_DEPENDS}
+Build-Depends: ${BUILD_DEPENDS}${RUN_DEPENDS} @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@
 Package: @PACKAGE_NAME@
-Section: $(if testtag AX_USE_LIBTOOL; then echo  "libs"; fi)
+Section: $(if testtag AX_USE_LIBTOOL; then echo  "libs"; else echo "@DEB_SECTION@"; fi)
 Architecture: any
-Depends: \${shlibs:Depends}, \${misc:Depends}
+Depends: \${shlibs:Depends}, \${misc:Depends}${RUN_DEPENDS} @DEB_DEPEND@
 Description: @DESCRIPTION@
@README_DEB@
 $(      if testtag AX_USE_LIBTOOL; then
@ -943,7 +1625,7 @@ $(      if testtag AX_USE_LIBTOOL; then
 Package: @PACKAGE_NAME@-dev
 Section: libdevel
 Architecture: any
-Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD_DEPENDS}
+Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD_DEPENDS}${RUN_DEPENDS} @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@
 Description: @DESCRIPTION@ - Development Package
@README_DEB@
 EOF2
@ -951,10 +1633,11 @@ EOF2
 EOF
    to debian/docs <<EOF
 NEWS
-README
+$README
 EOF
    to --condition AX_USE_LIBTOOL debian/${PACKAGE_NAME}.install <<EOF
 usr/lib/lib*.so.*
 usr/share/${PACKAGE_NAME}
 EOF
    to --condition AX_USE_LIBTOOL debian/${PACKAGE_NAME}-dev.install <<EOF
 usr/include/*
@ -962,7 +1645,6 @@ usr/lib/lib*.a
 usr/lib/lib*.so
 usr/lib/pkgconfig/*
 usr/lib/*.la
 usr/share/${PACKAGE_NAME}
 usr/share/doc/${PACKAGE_NAME}/html
 EOF
    to --mode "u=rwx,g=rwx,o=rx" debian/rules <<EOF
@ -986,44 +1668,64 @@ to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME}.spec.in <<EOF
 Summary: @DESCRIPTION@
 Name: @PACKAGE_NAME@
 Version: @VERSION@
-Release: @BUILD_NUMBER@%{?dist}
+Release: @BUILD_NUMBER@.@DISTRO@
 License: LGPL
 Group: $(if testtag AX_USE_LIBTOOL; then
  echo Development/Libraries/C++;
 else
-  echo Applications/...;
+  echo @RPM_GROUP@;
 fi)
 $(if testtag AX_RPM_DEPEND; then echo "Requires: @RPM_DEPEND@"; fi)
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gnupg, ${VCSDEPENDS} make, automake, autoconf, rpm-build$(
+BuildRequires: which, pkgconfig, pandoc, gnupg, expect, ${VCSDEPENDS_RPM}make, automake, autoconf, rpm-build$(
    if testtag AX_USE_CXX; then
      echo -n ", binutils-devel, gcc-c++"
    fi
    if testtag AX_USE_CPPUNIT; then
      echo -n ", cppunit-devel"
    fi
    if testtag AX_USE_DOXYGEN; then
-      echo -n ", doxygen";
+      echo -n ", doxygen, graphviz, java-openjdk";
    fi
    if testtag AX_USE_PERLDOC; then
      echo -n ", libpod-tree-perl";
    fi
 )  @RPM_BUILD_DEPEND@ @RPM_DEPEND_IFEXISTS@
 #### os dependent definitions ####
 %if 0%{?suse_version} || 0%{?sles_version}
 BuildRequires: lsb-release$(
    if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then
      echo -n ", libqt5-qtbase-devel, libqt5-qttools, libqt5-linguist-devel, libQt5WebKit5-devel libqt5-qtwebengine-devel libQt5WebKitWidgets-devel";
    fi)
-%if 0%{?fedora} != 20
+%else
-$(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: graphviz"; fi)
+$(
-%endif
+    if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then
-%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
+      echo -n "BuildRequires: qt5-qtbase-devel, qt5-qttools-devel, qt5-qtwebkit-devel";
 BuildRequires: pkgconfig, redhat-lsb$(
    if testtag AX_USE_CPPUNIT; then
      echo -n ", cppunit-devel";
    fi)
-%if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} )
+%if  0%{?mageia}
-$(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: mscgen"; fi)
+BuildRequires: rpm-sign, lsb-release
 $(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: qt5-qtbase-devel, qt5-qttools, qt5-qtwebkit-devel"; fi)
 %else
-$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: qt-devel"; fi)
+BuildRequires: rpm-sign, redhat-lsb
 %global debug_package %{nil}
 %endif
-%else%if 0%{?suse_version} || 0%{?sles_version}
+%endif
-BuildRequires: pkg-config, lsb-release$(
+$(
-    if testtag AX_USE_CPPUNIT; then
+    if testtag AX_USE_DOXYGEN; then cat <<EOS
-      echo -n ", libcppunit-devel";
+%if ! 0%{?centos}
-    fi)
+BuildRequires: mscgen
-%if 0%{?suse_version} < 1200 ||  0%{?sles_version} < 1200
+%endif
-$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: libqt4-devel, qt4-x11-tools, libQtWebKit-devel"; fi)
+EOS
    fi
    if testtag AX_USE_LIBTOOL; then cat <<EOS
 %if 0%{?mageia}
 BuildRequires: libtool, libltdl-devel
 %else
-$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel"; fi)
+BuildRequires: libtool, libtool-ltdl-devel
 %endif
-%endif%endif
+EOS
    fi)
 %description
@README@
@ -1032,7 +1734,9 @@ echo
 echo This package contains only the shared libraries required at runtime.
 fi)
-
+$(if ! testtag 'AX_USE_LIBTOOL|AX_USE_CXX'; then
  echo '%global debug_package %{nil}'
 fi)
 %prep
 %setup -q
 ./configure --prefix=/usr \\
@ -1052,31 +1756,29 @@ rm -rf \$RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 $(if testtag AX_USE_LIBTOOL; then
-echo '/usr/%_lib/@PACKAGE_NAME@.so.*'
+echo '/usr/%_lib/*.so.*'
 else
-echo '/usr/bin/*'
+echo '/usr/bin'
-echo '/usr/share/applications/*'
+echo '/usr/share/applications'
 fi)
-%doc
+/usr/share/@PACKAGE_NAME@
-$(if testtag AX_USE_LIBTOOL; then
+$(if testtag AX_USE_ETC; then
-  cat <<EOF2
+
-/usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS
+cat <<EOF2
-/usr/share/doc/packages/@PACKAGE_NAME@/COPYING
+%config
-/usr/share/doc/packages/@PACKAGE_NAME@/ChangeLog
+/etc/*
-/usr/share/doc/packages/@PACKAGE_NAME@/INSTALL
+
 /usr/share/doc/packages/@PACKAGE_NAME@/NEWS
 /usr/share/doc/packages/@PACKAGE_NAME@/README
 EOF2
 else
  echo '/usr/share/*'
 fi)
 %doc
 /usr/share/doc
 $(if testtag AX_USE_LIBTOOL; then
 cat <<EOF2
 %package devel
 Summary: @DESCRIPTION@
 Group: Development/Libraries/C++
-Requires: @PACKAGE_NAME@ = @VERSION@
+Requires: @PACKAGE_NAME@ = @VERSION@ @RPM_BUILD_DEPEND@
 %description devel
@README@
@ -1085,14 +1787,18 @@ This Package contains all files required for developement.
 %files devel
 %defattr(-,root,root,-)
-/usr/%_lib/@PACKAGE_NAME@.so
+/usr/%_lib/*.so
-/usr/%_lib/@PACKAGE_NAME@.a
+/usr/%_lib/*.a
-/usr/%_lib/@PACKAGE_NAME@.la
+/usr/%_lib/*.la
 /usr/%_lib/pkgconfig
 /usr/include/*
 %doc
-/usr/share/@PACKAGE_NAME@
+$(if testtag AX_USE_DOXYGEN AX_USE_PERLDOC; then
-/usr/share/doc/packages/@PACKAGE_NAME@/html
+  echo '/usr/share/doc/packages/@PACKAGE_NAME@/html'
 fi)
 $(if testtag AX_BUILD_EXAMPLES; then
  echo '/usr/share/doc/packages/@PACKAGE_NAME@/examples'
 fi)
 EOF2
 fi)
@ -1103,13 +1809,16 @@ SUBDIRS=""
 if testtag AX_USE_CXX; then
    SUBDIRS="${SUBDIRS} src"
 fi
 if testtag AX_USE_ETC; then
    SUBDIRS="${SUBDIRS} etc"
 fi
 if testtag AX_BUILD_TEST AX_USE_CPPUNIT; then
    SUBDIRS="${SUBDIRS} test"
 fi
 if testtag AX_USE_SCRIPTS; then
    SUBDIRS="${SUBDIRS} scripts"
 fi
-if testtag AX_USE_DOXYGEN; then
+if testtag 'AX_USE_DOXYGEN|AX_USE_PERLDOC'; then
    SUBDIRS="${SUBDIRS} doc"
 fi
 if testtag AX_BUILD_EXAMPLES; then
@ -1125,14 +1834,25 @@ for d in src test scripts doc examples html; do
 done
 to --mode "u=rwx,g=rwx,o=rx" autogen.sh <<EOF
 #!/bin/bash -e
-if test -n "$VCS" -a -d .$VCS -a -e -x $(which ${VCS}2cl); then
+if test -n "$VCS" -a -d ".$VCS" -a -e -x "\$(which ${VCS}2cl)"; then
 $(case "$VCS" in
  (svn) echo "    ${VCS}2cl";;
  (git) echo "    ${VCS}2cl > ChangeLog";;
 esac)
 fi
 aclocal
-$(if testtag AX_USE_LIBTOOL; then echo libtoolize --force; fi)
+$(if testtag AX_USE_LIBTOOL; then
 cat <<EOF1
 if which libtoolize > /dev/null; then
  run libtoolize --force;
 elif which glibtoolize > /dev/null; then
  run glibtoolize --force;
 else
  echo "error: libtoolize not found" 1>&2
  exit 1
 fi
 EOF1
 fi)
 automake -a
 autoconf
 EOF
@ -1141,15 +1861,24 @@ ${HEADER}SUBDIRS =${SUBDIRS}
 desktopdir = \${datadir}/applications
 desktop_DATA = @PACKAGE_DESKTOP@
-dist_pkgdata_DATA = @PACKAGE_ICON@ ax_check_qt.m4 bootstrap.sh		\\
+dist_pkgdata_DATA = @PACKAGE_ICON@
 dist_noinst_DATA = ax_check_qt.m4 bootstrap.sh				\\
                   resolve-rpmbuilddeps.sh autogen.sh			\\
                    ax_cxx_compile_stdcxx_11.m4 build-in-docker.sh	\\
                    build-resource-file.sh				\\
                    ax_init_standard_project.m4				\\
                    mac-create-app-bundle.sh resolve-debbuilddeps.sh    \\
                    dependency-graph.sh template.sh                     \\
                    sql-to-dot.sed
-dist_doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
+dist_doc_DATA = AUTHORS NEWS $README COPYING INSTALL ChangeLog
 $(if test -e README.md -a ! -e README; then
 cat <<EOF2
 README: README.md
 CLEANFILES = README
 EOF2
 fi)
 MAINTAINERCLEANFILES = makefile.in
 EOF
 to --condition AX_USE_LIBTOOL src/${PACKAGE_NAME}.pc.in <<EOF
@ -1167,35 +1896,50 @@ Cflags: -I\${includedir} @CPPFLAGS@
 Requires: @PKG_REQUIREMENTS@
 EOF
 to build-in-docker.conf <<EOF
-repos+=("Debian|Ubuntu-precise::::::universe")
+${HEADER}# Use Ubuntu Universe Repository
-repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com/ubuntu precise universe'")
+repos+=("ubuntu:::universe")
-envs+=("-e 'HOME=\${HOME}'")
+
-dirs+=("-v \${HOME}/.gnupg:\${HOME}/.gnupg:ro")
+# Use Marc Wäckerlin's Repository, see https://repository.mrw.sh
 repos+=("debian|ubuntu:::https://repository.mrw.sh:::https://repository.mrw.sh/@DISTRIBUTOR@/marc-waeckerlin.repo")
 keys+=("https://repository.mrw.sh/PublicKey")
 # centos requires epel-release for some packages, such as Qt WebKit
 packages+=("centos:::epel-release")
 EOF
 #### Cleanup If Makefile Exists ####
 if test -f makefile; then
-    run --no-check make distclean
+    run --no-check make maintainer-clean
 fi
-#### Bootstrap Before Configure ####
+#### Build In Docker If User Requires ####
-run --no-check vcs2cl
+if test "$docker" -eq 1; then
-run aclocal
+    ./build-in-docker.sh $buildtarget $* || exit 1
-if testtag AX_USE_LIBTOOL; then run libtoolize --force; fi
+else
 run automake -a
 run autoconf
-#### Run Configure If User Requires ####
+    #### Bootstrap Before Configure ####
-if test "$configure" -eq 1; then
+    run --no-check vcs2cl
    run aclocal
    if testtag AX_USE_LIBTOOL; then
        if which libtoolize > /dev/null; then
            run libtoolize --force;
        elif which glibtoolize > /dev/null; then
            run glibtoolize --force;
        else
            error libtoolize not found
        fi
    fi
    run automake -a
    run autoconf
    #### Run Configure If User Requires ####
    if test "$configure" -eq 1; then
        ./configure $* || exit 1
-fi
+    fi
-#### Run Make If User Requires ####
+    #### Run Make If User Requires ####
-if test "$build" -eq 1; then
+    if test "$build" -eq 1; then
        make $buildtarget || exit 1
-fi
+    fi
 #### Build In Docker If User Requires ####
 if test "$docker" -eq 1; then
    ./build-in-docker.sh || exit 1
 fi
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@ -2,21 +2,30 @@
 set -o errtrace
 # build and test everything in a fresh docker installation
-mode="apt"
+myarch=$(dpkg --print-architecture)
-img="ubuntu:latest"
+if test "${arch}" = "amd64"; then
    myarch="amd64|i386"
 fi
 mode="deb"
 img="mwaeckerlin/ubuntu:latest"
 repos=()
 keys=()
-envs=()
+dns=()
-dirs=("-v $(pwd):/workdir")
+envs=("-e LANG=${LANG}" "-e HOME=${HOME}" "-e TERM=xterm" "-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
 dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:${HOME}/.gnupg")
 packages=()
 targets="all check distcheck"
 commands=()
 arch=$((which dpkg > /dev/null 2> /dev/null && dpkg --print-architecture) || echo amd64)
 host=
 flags=()
 wait=0
 if test -e ./build-in-docker.conf; then
    # you can preconfigure the variables in file build-in-docker.conf
    # if you do so, add the file to EXTRA_DIST in makefile.am
    source ./build-in-docker.conf
 fi
 while test $# -gt 0; do
    case "$1" in
        (-h|--help)
@ -25,11 +34,15 @@ while test $# -gt 0; do
            echo "OPTIONS:"
            echo
            echo "  -h, --help            show this help"
-            echo "  -m, --mode <type>     mode: apt or yum, default: ${mode}"
+            echo "  -m, --mode <type>     mode: deb, rpm, win, default: ${mode}"
            echo "  -i, --image <image>   use given docker image instead of ${img}"
            echo "  -a, --arch <arch>     build for given hardware architecture"
            echo "  -t, --targets targets specify build targets, default: ${targets}"
            echo "  --host <target-arch>  host for cross compiling, e.g. i686-w64-mingw32"
            echo "  -f, --flag <flag>     add flag to ./bootstrap.sh or ./configure"
            echo "  -r, --repo <url>      add given apt repository"
            echo "  -k, --key <url>       add public key from url"
            echo "  -n, --dns <ip>        add ip as dns server"
            echo "  -e, --env <var>=<val> set environment variable in docker"
            echo "  -d, --dir <dir>       access given directory read only"
            echo "  -p, --package <pkg>   install extra debian packages"
@ -37,6 +50,10 @@ while test $# -gt 0; do
            echo "  -w, --wait            on error keep docker container and wait for enter"
            echo
            echo "  The option -i must be after -m, because mode sets a new default image"
            echo "  The option -m must be after -t, because mode may be auto detected from targets"
            echo "  The option -m must be after -h, because mode may set a host"
            echo "  If target is either deb or rpm, mode is set to the same value"
            echo "  If target is win, host is set to i686-w64-mingw32"
            echo
            echo "  The options -r -k -e -d -p -c can be repeated several times."
            echo
@ -58,8 +75,8 @@ while test $# -gt 0; do
            echo "                     -e ANDROID_HOME=/opt/local/android \\"
            echo "                     -d /opt/local/android \\"
            echo "                     -r universe \\"
-            echo "                     -r https://dev.marc.waeckerlin.org/repository \\"
+            echo "                     -r https://repository.mrw.sh \\"
-            echo "                     -k https://dev.marc.waeckerlin.org/repository/PublicKey \\"
+            echo "                     -k https://repository.mrw.sh/PublicKey \\"
            echo "                     -p mrw-c++"
            echo
            exit 0
@ -67,8 +84,16 @@ while test $# -gt 0; do
        (-m|--mode) shift;
            mode="$1"
            case "$mode" in
-                (apt) img="ubuntu:latest";;
+                (deb|apt) img="mwaeckerlin/ubuntu:latest";;
                (rpm|zypper) img="opensuse:latest";;
                (yum) img="centos:latest";;
                (dnf) img="fedora:latest";;
                (win)
                    img="mwaeckerlin/ubuntu:latest"; host="${host:---host=i686-w64-mingw32}"
                    targets="all install"
                    flags+=("--prefix=/workdir/usr")
                    packages+=("mingw-w64")
                    ;;
                (*)
                    echo "**** ERROR: unknown mode '$1', try --help" 1>&2
                    exit 1
@ -78,10 +103,25 @@ while test $# -gt 0; do
        (-i|--image) shift;
            img="$1"
            ;;
        (-a|--arch) shift;
            arch="$1"
            ;;
        (-t|--targets) shift;
            targets="$1"
            if test "$1" = "deb" -o "$1" = "rpm"; then
                # set mode to same value
                set -- "-m" "$@"
                continue
            fi
            ;;
        (--host) shift;
            host="--host=$1"
            ;;
        (-f|--flag) shift;
            flags+=("$1")
            ;;
        (-r|--repo) shift;
            echo "OPTION: $1"
            repos+=("$1")
            ;;
        (-k|--key) shift;
@ -90,6 +130,9 @@ while test $# -gt 0; do
        (-e|--env) shift;
            envs+=("-e $1")
            ;;
        (-n|--dns) shift;
            dns+=("--dns $1")
            ;;
        (-d|--dirs) shift;
            dirs+=("-v $1:$1:ro")
            ;;
@ -134,25 +177,21 @@ function traperror() {
                echo
            fi
            if [ "$wait" -eq 1 ]; then
-                echo "  ... now you can access the docker container:"
+                echo "  ... now you can access the docker container as root or user:"
                echo "      docker exec -it ${DOCKER_ID} bash"
                echo "      docker exec -u $(id -u) -it ${DOCKER_ID} bash"
                echo -n "  ... press enter to cleanup: "
                read
            fi
            echo -n "   ... cleanup docker: "
-            docker rm -f "${DOCKER_ID}"
+            docker stop "${DOCKER_ID}" || true
            docker rm "${DOCKER_ID}"
            echo "returning status: $e"
            echo "--->"
            exit $e
        fi
    done
-    if [ "$wait" -eq 1 ]; then
+    echo -n "SUCCESS ... cleanup docker: "
        echo "  ... now you can access the docker container:"
        echo "      docker exec -u $(id -u) -it ${DOCKER_ID} bash"
        echo -n "  ... press enter to cleanup: "
        read
    fi
    echo -n "   SUCCESS ... cleanup docker: "
    docker rm -f "${DOCKER_ID}"
    exit 0
 }
@ -161,20 +200,26 @@ function ifthenelse() {
    arg="$1"
    shift
    cmd="$*"
    DISTRIBUTOR=$(docker exec ${DOCKER_ID} lsb_release -si | sed 's, .*,,' | tr [:upper:] [:lower:])
    CODENAME=$(docker exec ${DOCKER_ID} lsb_release -cs)
    ARCH=$((docker exec ${DOCKER_ID} which dpkg > /dev/null 2> /dev/null && docker exec ${DOCKER_ID} dpkg --print-architecture) || echo amd64)
    if test "${arg/:::/}" = "${arg}"; then
-        docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${arg}}"
+        docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${arg//@DISTRIBUTOR@/${DISTRIBUTOR}}}"
    else
        os="${arg%%:::*}"
        thenpart="${arg#*:::}"
-        if test "${thenpart/:::/}" = "${thenpart}"; then
+        elsepart=
-            docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; fi'
+        if test "${thenpart/:::/}" != "${thenpart}"; then
        else
            elsepart="${thenpart##*:::}"
-            thenpart="${thenpart%:::*}"
+            thenpart="${thenpart%%:::*}"
        fi
        if [[ "${DISTRIBUTOR}-${CODENAME}-${ARCH}" =~ ${os} ]]; then
            if test -n "${thenpart}"; then
-                docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; else '"${cmd//ARG/${elsepart}}"'; fi'
+                docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${thenpart//@DISTRIBUTOR@/${DISTRIBUTOR}}}"
            fi
        else
-                docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then true; else '"${cmd//ARG/${elsepart}}"'; fi'
+            if test -n "${elsepart}"; then
                docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${elsepart//@DISTRIBUTOR@/${DISTRIBUTOR}}}"
            fi
        fi
    fi
@ -183,10 +228,25 @@ function ifthenelse() {
 set -x
 docker pull $img
-DOCKER_ID=$(docker run -d ${dirs[@]} ${envs[@]} -e HOME="${HOME}" -w /workdir $img sleep infinity)
+DOCKER_ID=$(docker create ${dns[@]} ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity)
 trap 'traperror '"${DOCKER_ID}"' "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' SIGINT INT TERM EXIT
 if ! [[ $arch =~ $myarch ]]; then
    docker cp "/usr/bin/qemu-${arch}-static" "${DOCKER_ID}:/usr/bin/qemu-${arch}-static"
 fi
 docker start "${DOCKER_ID}"
 if ! docker exec ${DOCKER_ID} getent group $(id -g) > /dev/null 2>&1; then
    docker exec ${DOCKER_ID} groupadd -g $(id -g) $(id -gn)
 fi
 if ! docker exec ${DOCKER_ID} getent passwd $(id -u) > /dev/null 2>&1; then
    docker exec ${DOCKER_ID} useradd -m -u $(id -u) -g $(id -g) -d"${HOME}" $(id -un)
 fi
 docker exec ${DOCKER_ID} chown $(id -u):$(id -g) "${HOME}"
 case $mode in
-    (apt)
+    (deb|apt|win)
        if [[ "${img}" =~ "ubuntu" ]]; then
            docker exec ${DOCKER_ID} locale-gen ${LANG}
            docker exec ${DOCKER_ID} update-locale LANG=${LANG}
        fi
        OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends'
        for f in 'libpam-systemd:amd64' 'policykit*' 'colord'; do
            docker exec ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences"
@ -195,16 +255,16 @@ case $mode in
        done
        docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
        docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS}
-        docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release || \
+        docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
-            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} software-properties-common apt-transport-https dpkg-dev lsb-release || \
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
-            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties apt-transport-https dpkg-dev lsb-release;
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties apt-transport-https dpkg-dev lsb-release wget;
        for repo in "${repos[@]}"; do
            ifthenelse "${repo}" "apt-add-repository ARG"
        done
        for key in "${keys[@]}"; do
            wget -O- "$key" \
                | docker exec -i ${DOCKER_ID} apt-key add -
        done
        for repo in "${repos[@]}"; do
            ifthenelse "${repo}" "apt-add-repository 'ARG'"
        done
        docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
        for package in "${packages[@]}"; do
            ifthenelse "${package}" "apt-get install ${OPTIONS} ARG"
@ -214,8 +274,7 @@ case $mode in
        done
        docker exec ${DOCKER_ID} ./resolve-debbuilddeps.sh
        ;;
-    (yum)
+    (rpm|yum|dnf|zypper|urpmi)
        ./bootstrap.sh -t dist
        if [[ "$img" =~ "centos" ]]; then
            docker exec ${DOCKER_ID} yum install -y redhat-lsb
            docker exec -i ${DOCKER_ID} bash -c 'cat > /etc/yum.repos.d/wandisco-svn.repo' <<EOF
@ -228,10 +287,36 @@ enabled=1
 gpgcheck=0
 EOF
        fi
-        docker exec ${DOCKER_ID} yum install -y rpm-build 
+        INSTALL_TOOL=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper install -y) ||  (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo yum install -y) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo urpmi --auto))
-        docker exec ${DOCKER_ID} groupadd -g $(id -g) build
+        if test "$INSTALL_TOOL" = "urpmi --auto"; then
-        docker exec ${DOCKER_ID} useradd -g $(id -g) -u $(id -u) build
+            LSB_RELEASE=lsb-release
-        docker exec ${DOCKER_ID} ./resolve-rpmbuilddeps.sh || true
+        else
            LSB_RELEASE=/usr/bin/lsb_release
        fi
        docker exec ${DOCKER_ID} ${INSTALL_TOOL} rpm-build automake libtool subversion gcc-c++ pkgconfig wget $LSB_RELEASE
        i=0
        for key in "${keys[@]}"; do
            wget -Orpm-key "$key"
            docker exec -i ${DOCKER_ID} rpm --import rpm-key
            rm rpm-key
        done
        for repo in "${repos[@]}"; do
            INSTALL_REPO=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper ar) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo wget -O/etc/yum.repos.d/additional$i.repo) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo false))
            ifthenelse "${repo}" "${INSTALL_REPO} 'ARG'"
            ((++i))
        done
        for package in "${packages[@]}"; do
            ifthenelse "${package}" "${INSTALL_TOOL} ARG"
        done
        for command in "${commands[@]}"; do
            ifthenelse "${command}" "ARG"
        done
        docker exec ${DOCKER_ID} ./resolve-rpmbuilddeps.sh
        ;;
 esac
-docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -t "${targets}"
+FLAGS=()
 for f in "${flags[@]}"; do
    FLAGS+=($(ifthenelse "$f" "echo 'ARG'"))
 done
 docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -t "${targets}" ${host} "${FLAGS[@]}"
--- a/dependency-graph.sh
+++ b/dependency-graph.sh
@ -0,0 +1,171 @@
 #!/bin/bash -e
 # template for bash scripts
 # internal use only
 append_msg() {
    if test $# -ne 0; then
        echo -en ":\e[0m \e[1m$*"
    fi
    echo -e "\e[0m"
 }
 # write a notice
 notice() {
    if test $# -eq 0; then
        return
    fi
    echo -e "\e[1m$*\e[0m" 1>&3
 }
 # write error message
 error() {
    echo -en "\e[1;31merror" 1>&2
    append_msg $* 1>&2
 }
 # write a warning message
 warning() {
    echo -en "\e[1;33mwarning" 1>&2
    append_msg $* 1>&2
 }
 # write a success message
 success() {
    echo -en "\e[1;32msuccess" 1>&2
    append_msg $* 1>&2
 }
 # commandline parameter evaluation
 files=${0%/*}/configure.ac
 short=0
 while test $# -gt 0; do
    case "$1" in
        (--short|-s) short=1;;
        (--help|-h) less <<EOF
 SYNOPSIS
  $0 [OPTIONS] <files>
 OPTIONS
  --help, -h                 show this help
  --short, -s                short graph with no external dependencies
  <files>                    list of zero or more configure.ac files
                             (default: ${files})
 DESCRIPTION
  Evaluates dependencies of all the given configure.ac file. By
  default takes the local configure.ac. Outputs a graphwiz dot file
  with the dependencies. Solid lines are required dependencies, dotted
  lines are optional dependencies.
 EXAMPLE
  Evaluate all dependencies between all local subversion and git
  projects, if they are in the path ~/svn and ~/git:
    $0 ~/svn/*/configure.ac ~/git/*/configure.ac 
 EOF
            exit;;
        (*) files=$*; break;;
    esac
    if test $# -eq 0; then
        error "missing parameter, try $0 --help"; exit 1
    fi
    shift;
 done
 # run a command, print the result and abort in case of error
 # option: --no-check: ignore the result, continue in case of error
 run() {
    check=1
    while test $# -gt 0; do
        case "$1" in
            (--no-check) check=0;;
            (*) break;;
        esac
        shift;
    done
    echo -en "\e[1m-> running:\e[0m $* ..."
    result=$($* 2>&1)
    res=$?
    if test $res -ne 0; then
        if test $check -eq 1; then
            error "failed with return code: $res"
            if test -n "$result"; then
                echo "$result"
            fi
            exit 1
        else
            warning "ignored return code: $res"
        fi
    else
        success
    fi
 }
 # error handler
 function traperror() {
    set +x
    local err=($1) # error status
    local line="$2" # LINENO
    local linecallfunc="$3"
    local command="$4"
    local funcstack="$5"
    for e in ${err[@]}; do
        if test -n "$e" -a "$e" != "0"; then
            error "line $line - command '$command' exited with status: $e (${err[@]})"
            if [ "${funcstack}" != "main" -o "$linecallfunc" != "0" ]; then
                echo -n "   ... error at ${funcstack} "
                if [ "$linecallfunc" != "" ]; then
                    echo -n "called at line $linecallfunc"
                fi
                echo
            fi
            exit $e
        fi
    done
    success
    exit 0
 }
 # catch errors
 trap 'traperror "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' ERR SIGINT INT TERM EXIT
 ##########################################################################################
 filter() {
    if test $short -eq 1; then
        all=$(cat)
        allowed=$(sed -n '/"\(.*\)" \[style=solid\];/{s//\1/;H};${x;s/\n//;s/\n/\\|/gp}' <<<"${all}")
        sed -n '/"\('"${allowed}"'\)" -> "\('"${allowed}"'\)"/p' <<<"${all}"
    else
        cat
    fi
 }
 echo "digraph G {"
 if test $short -eq 0; then
    echo "node [style=dashed];"
 fi
 (
    for file in $files; do
        if ! test -e $file; then
            error "file $file not found"; exit 1
        fi
        sed -n '
      /^ *m4_define(x_package_name, */ {s//"/;s/ *).*/"/;h;s/.*/& [style=solid];/p}
      /^ *AX_REQUIRE_QT/ {s/.*/"qt" -> /;G;s/\n//;s/.*/&;/p}
      /^ *AX_PKG_REQUIRE(\[\?\([^],)]\+\)\]\?, \[\?\([^],)]\+\)\]\?.*/ {s//"\2" -> /;G;s/\n//;s/.*/&;/p}
      /^ *AX_PKG_REQUIRE(\[\?\([^],)]\+\)\]\?.*/ {s//"\1" -> /;G;s/\n//;s/.*/&;/p}
      /^ *AX_CHECK_QT/ {s/.*/"qt" -> /;G;s/\n//;s/.*/& [style=dashed];/p}
      /^ *AX_PKG_CHECK(\[\?\([^],)]\+\)\]\?, \[\?\([^],)]\+\)\]\?.*/ {s//"\2" -> /;G;s/\n//;s/.*/& [style=dotted];/p}
      /^ *AX_PKG_CHECK(\[\?\([^],)]\+\)\]\?.*/ {s//"\1" -> /;G;s/\n//;s/.*/& [style=dotted];/p}
    ' $file
    done
 ) | filter
 echo "}"
--- a/doc/footer.html.in
+++ b/doc/footer.html.in
@ -0,0 +1,8 @@
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
  <ul>
    $navpath
    <li class="footer"><a href="@AUTHOR_URL@" target="_blank">@AUTHOR_NAME@</a></li>
  </ul>
 </div>
 </body>
 </html>
--- a/doc/header.html.in
+++ b/doc/header.html.in
@ -0,0 +1,33 @@
 <!-- HTML header for doxygen 1.8.6-->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen $doxygenversion"/>
 <!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
 <!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
 <link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="$relpath^jquery.js"></script>
 <script type="text/javascript" src="$relpath^dynsections.js"></script>
 $treeview
 $search
 $mathjax
 <link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
 $extrastylesheet
 </head>
 <body>
 <div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
  <div id="projecthead">
    <div id="projectlogo"><img alt="" src="$relpath^$projectlogo"/></div>
    <div id="projectname">$projectname</span>&#160;<span id="projectnumber">$projectnumber</div>
    <div id="projectbrief">$projectbrief</div>
  </div>
  <nav>
    <a href="@PROJECT_URL@" target="_blank">Project Management</a>
    <a href="@SOURCE_DOWNLOAD@" target="_blank">Download</a>
    <div>$searchbox</div>
  </nav>
 </div>
--- a/doc/plantuml.jar
+++ b/doc/plantuml.jar
--- a/doc/style.css
+++ b/doc/style.css
@ -0,0 +1,38 @@
 #titlearea {
  display: flex;
  justify-content: space-between;
  align-items: flex-begin;
 }
 #titlearea nav {
  padding: 0;
  margin: 0;
 }
 #titlearea nav a {
  background-color: lightgray;
  border: 1px solid gray;
  color: black;
  padding: 1ex;
  margin: 0;
 }
 img, object {
  max-width: 100% !important;
 }
@media (max-width: 50em) {
  #navrow1, #navrow2 {
    display: block
  }
  #side-nav, #splitbar, .ui-resizable-handle ui-resizable-e, .ui-resizable-handle ui-resizable-s {
    display: none;
  }
  #doc-content {
    margin-left: 0 !important;
  }
 }
@media (min-width: 50em) {
  #navrow1, #navrow2 {
    display: none;
  }
  #side-nav, #splitbar, .ui-resizable-handle ui-resizable-e, .ui-resizable-handle ui-resizable-s {
    display: block
  }
 }
--- a/mac-create-app-bundle.sh
+++ b/mac-create-app-bundle.sh
@ -38,6 +38,7 @@ executablefile=$(ls -1 ${1}/Contents/MacOS/ | head -1)
 ! test -d ${3}/share || rmdir ${3}/share
 ! test -d ${3} || \
    find ${3} -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/Resources/ \;
 ! test -d ${3}/include || rm -r ${3}/include
 ! test -d ${3} || rmdir ${3}
 ! test -d ${1}/tmp || rm -r ${1}/tmp
--- a/makefile_test.inc.am
+++ b/makefile_test.inc.am
@ -0,0 +1,9 @@
 ## @id $Id$
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 %.gcda: %
 	gcov $<
 CLEANFILES += ${CLEANFILES} ${TEST:%=%.gcno} ${TEST:%=%.gcda} *.gcov
--- a/resolve-debbuilddeps.sh
+++ b/resolve-debbuilddeps.sh
@ -16,7 +16,7 @@ if test -n "${SCHROOTNAME}"; then
  SUDO="schroot -c "${SCHROOTNAME}" -u root -d / --"
 else
  DO=""
-  if grep -q '/docker/' /proc/1/cgroup; then
+  if grep -q '/docker' /proc/1/cgroup; then
      SUDO=""
  else
      SUDO="sudo"
@ -32,24 +32,76 @@ function install() {
 }
 TO_INSTALL=
 DEPS=
 if test -e debian/control.in -a ! -e debian/control; then
-    for f in $(sed -n 's, *AX_DEB_DEPEND_IFEXISTS(\([^)]*\)).*,\1,p' configure.ac); do
+    function pkg_exists() {
-        if test -n "$(${DO} apt-cache policy -q ${f})" && ! "$(${DO} apt-cache policy ${f} 2>&1 | grep -q 'N: Unable to locate package')" && ! ${DO} dpkg -l "${f}"; then
+        test -n "$(${DO} apt-cache policy -q ${1})"
-            TO_INSTALL+=" ${f}"
+    }
    function AX_PKG_CHECK() {
        local DEV_DEB_DIST_PKG=
        local DEV_DIST_PKG=
        local pkg=
        eval $4
        if test -z "$2"; then
            pkg=$1
        else
            pkg=$2
        fi
        pkg=${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev}
        if pkg_exists "${pkg}"; then
            echo $pkg
        fi
    }
    function AX_PKG_REQUIRE() {
        local DEV_DEB_DIST_PKG=
        local DEV_DIST_PKG=
        local pkg=
        eval $6
        if test -z "$2"; then
            pkg=$1
        else
            pkg=$2
        fi
        if test -n "$4"; then
            for f in $pkg $4; do
                if pkg_exists "${f}-dev"; then
                    pkg=$f
                    break
                fi
            done
        fi
        echo ${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev}
    }
    DEPS+=" $(eval $(sed -n '/^ *AX_PKG_REQUIRE/{s,^ *\(AX_PKG_REQUIRE\) *(\(.*\)).*,\1 \2,;s.\[\([^]]*\)\],\?."\1".g;s,$,;,g;p}' configure.ac))"
    DEPS+=" $(eval $(sed -n '/^ *AX_PKG_CHECK/{s,^ *\(AX_PKG_CHECK\) *(\(.*\)).*,\1 \2,;s.\[\([^]]*\)\],\?."\1".g;s,$,;,g;p}' configure.ac))"
    for f in $(sed -n 's, *AX_\(DEB\|ALL\)_DEPEND_IFEXISTS(\([^)]*\)).*,\2,p' configure.ac); do
        if pkg_exists "${f}"; then
            DEPS+=" ${f}"
        fi
    done
    for f in $(sed -n 's, *AX_\(DEB\|ALL\)_DEPEND_IFEXISTS_DEV(\([^)]*\)).*,\2,p' configure.ac); do
        if pkg_exists "${f}-dev"; then
            DEPS+=" ${f}-dev"
        fi
    done
    for f in $(sed -n 's, *AX_\(DEB\|ALL\)\(_BUILD\)\?_DEPEND(\([^)]*\)).*,\3,p' configure.ac); do
        DEPS+=" ${f}"
    done
    for f in $(sed -n 's, *AX_\(DEB\|ALL\)\(_BUILD\)\?_DEPEND_DEV(\([^)]*\)).*,\3,p' configure.ac); do
        DEPS+=" ${f}-dev"
    done
    trap "rm debian/control" INT TERM EXIT
-    sed 's,@DEB_DEPEND_IFEXISTS@,,g' debian/control.in | \
+    sed 's,@\(\(ALL\|DEB\)_DEPEND_IFEXISTS\|\(ALL\|DEB\)_BUILD_DEPEND\|\(ALL\|DEB\)_DEPEND\)@,,g' debian/control.in | \
        sed 's,@[^@]*@, dummytext,g' > debian/control
 fi
 install dpkg-dev
-DEPS=$(LANG= ${DO} dpkg-checkbuilddeps 2>&1 || true)
+
-DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}')
+DEPS+=" $(LANG= ${DO} dpkg-checkbuilddeps 2>&1 | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}')"
 for pa in ${DEPS}; do
-    if test ${pa//|/} = ${pa}; then
+    if test "${pa//|/}" = "${pa}"; then
        TO_INSTALL+=" ${pa}"
        continue;
    fi
@ -72,4 +124,10 @@ if test -n "${TO_INSTALL}" && ! install ${TO_INSTALL}; then
    exit 1
 fi
 FILES="$(LANG= ${DO} dpkg-checkbuilddeps 2>&1 | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}')"
 if test -n "${FILES}"; then
    echo "**** ERROR: Cannot install: " $FILES
    exit 1
 fi
 echo "**** Success: All Dependencies Resolved"
--- a/resolve-rpmbuilddeps.sh
+++ b/resolve-rpmbuilddeps.sh
@ -10,36 +10,111 @@
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 INSTALL_TOOL=${INSTALL_TOOL:-$((test -x /usr/bin/zypper && echo zypper install -y) ||  (test -x /usr/bin/dnf && echo dnf install -y) || (test -x /usr/bin/yum && echo yum install -y) || (test -x /usr/sbin/urpmi && echo urpmi --auto))}
 SCHROOTNAME="$1"
 PACKAGE_NAME=$(sed -n 's/^ *m4_define(x_package_name, \(.*\)).*/\1/p' configure.ac)
-PKGCONFIGS="${2:-epel-release}" # packages to configure yum
+
 TRAP_CMD="sleep ${SLEEP:-0};"
 DEPS=
 for f in BUILD BUILDROOT RPMS SPECS SRPMS; do
  if ! test -d $f; then
      TRAP_CMD+="rm -rf $f;"
      mkdir $f
  fi
 done
 if test -e ${PACKAGE_NAME}.spec.in -a ! -e ${PACKAGE_NAME}.spec; then
    function pkg_exists() {
        (test -x /usr/bin/zypper && zypper search -x "$1" 1>&2 > /dev/null) || \
            (test -x /usr/bin/dnf && dnf list -q "$1" 1>&2 > /dev/null) || \
            (test -x /usr/bin/yum && yum list -q "$1" 1>&2 > /dev/null) || \
            (test -x /usr/sbin/urpmq && urpmq "$1" 1>&2 > /dev/null)
    }
    function AX_PKG_CHECK() {
        local DEV_RPM_DIST_PKG=
        local DEV_DIST_PKG=
        local pkg=
        eval $4
        if test -z "$2"; then
            pkg=$1
        else
            pkg=$2
        fi
        pkg=${DEV_RPM_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-devel}
        if pkg_exists "${pkg}"; then
            echo ${pkg}
        fi
    }
    function AX_PKG_REQUIRE() {
        local DEV_RPM_DIST_PKG=
        local DEV_DIST_PKG=
        local pkg=
        eval $6
        if test -z "$2"; then
            pkg=$1
        else
            pkg=$2
        fi
        if test -n "$4"; then
            for f in $pkg $4; do
                if pkg_exists "${f}-devel"; then
                    pkg=$f
                    break
                fi
            done
        fi
        echo ${DEV_RPM_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-devel}
    }
    DEPS+=" $(eval $(sed -n '/^ *AX_PKG_REQUIRE/{s,^ *\(AX_PKG_REQUIRE\) *(\(.*\)).*,\1 \2,;s.\[\([^]]*\)\],\?."\1".g;s,$,;,g;p}' configure.ac))"
    DEPS+=" $(eval $(sed -n '/^ *AX_PKG_CHECK/{s,^ *\(AX_PKG_CHECK\) *(\(.*\)).*,\1 \2,;s.\[\([^]]*\)\],\?."\1".g;s,$,;,g;p}' configure.ac))"
    for f in $(sed -n 's, *AX_\(RPM\|ALL\)_DEPEND_IFEXISTS(\([^)]*\)).*,\2,p' configure.ac); do
        if pkg_exists "${f}"; then
            DEPS+=" ${f}"
        fi
    done
    for f in $(sed -n 's, *AX_\(RPM\|ALL\)_DEPEND_IFEXISTS_DEV(\([^)]*\)).*,\2,p' configure.ac); do
        if pkg_exists "${f}-devel"; then
            DEPS+=" ${f}-devel"
        fi
    done
    for f in $(sed -n 's, *AX_\(RPM\|ALL\)\(_BUILD\)\?_DEPEND(\([^)]*\)).*,\3,p' configure.ac); do
        DEPS+=" ${f}"
    done
    for f in $(sed -n 's, *AX_\(RPM\|ALL\)\(_BUILD\)\?_DEPEND_DEV(\([^)]*\)).*,\3,p' configure.ac); do
        DEPS+=" ${f}-devel"
    done
    TRAP_CMD+="rm ${PACKAGE_NAME}.spec;"
    trap "${TRAP_CMD}" INT TERM EXIT
    sed 's,@\(\(ALL\|RPM\)_DEPEND_IFEXISTS\|\(ALL\|RPM\)_BUILD_DEPEND\|\(ALL\|RPM\)_DEPEND\)@,,g' ${PACKAGE_NAME}.spec.in | \
        sed 's,@[^@]*@,dummytext,g' > ${PACKAGE_NAME}.spec
 fi
 TGZFILE=$(sed -n '/^Name: */{s///;h};/^Version: */{s///;H;x;s/\n/-/;s/$/.tar.gz/;p}' ${PACKAGE_NAME}.spec)
 if ! test -e $TGZFILE; then
    TRAP_CMD+="rm ${TGZFILE};"
    trap "${TRAP_CMD}" INT TERM EXIT
    touch $TGZFILE
 fi
 if test -n "${SCHROOTNAME}"; then
    FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec  2>&1 | sed -n 's, is needed by.*,,p')
    if test -n "${FILES}"; then
-        FIRST=$(echo "${FILES}" | egrep -o "${PKGCONFIGS// /|}")
+        schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL}  ${FILES} ${DEPS}
        if test -n "${FIRST}"; then
            schroot -c ${SCHROOTNAME} -u root -- yum install -y ${FIRST} || \
                schroot -c ${SCHROOTNAME} -u root -- zypper install -y ${FIRST} || \
                schroot -c ${SCHROOTNAME} -u root -- dnf install -y ${FIRST}
        fi
        schroot -c ${SCHROOTNAME} -u root -- yum install -y ${FILES} || \
            schroot -c ${SCHROOTNAME} -u root -- zypper install -y ${FILES} || \
            schroot -c ${SCHROOTNAME} -u root -- dnf install -y ${FILES}
    fi
 else
    FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
    if test -n "${FILES}"; then
-        FIRST=$(echo "${FILES}" | egrep -o "${PKGCONFIGS// /|}")
+        ${INSTALL_TOOL} ${FILES} ${DEPS}
        if test -n "${FIRST}"; then
            yum install -y ${FIRST} || \
                zypper install -y ${FIRST} || \
                dnf install -y ${FIRST}
        fi
        yum install -y ${FILES} || \
            zypper install -y ${FILES} || \
            dnf install -y ${FILES}
    fi
 fi
 if test -n "${SCHROOTNAME}"; then
    FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec  2>&1 | sed -n 's, is needed by.*,,p')
 else
    FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
 fi
 if test -n "${FILES}"; then
    echo "**** ERROR: Cannot install: " $FILES
    exit 1
 fi
 echo "**** Success: All Dependencies Resolved"
--- a/rpmsign.exp
+++ b/rpmsign.exp
@ -0,0 +1,14 @@
 #!/usr/bin/expect -f
 set key [lindex $argv 0]
 set password [lindex $argv 1]
 set files [lrange $argv 2 end]
 ### rpm-sign.exp -- Sign RPMs by sending the passphrase.
 spawn rpmsign --define "_gpg_name $key" --addsign {*}$files
 expect {
    "Enter pass phrase: " {
        send -- "$password\r"
        exp_continue
    } eof
 }
--- a/scripts/mvfotos.conf
+++ b/scripts/mvfotos.conf
@ -27,11 +27,11 @@ prefix[9]=foto
 # file name extensions to detect the file types
 ext[1]="jpg png tif xcf jpeg"
 ext[2]="jps"
-ext[3]="mxf mts avi mov mpg mp4 mpg 3gp"
+ext[3]="mxf mts avi mov mpg mp4 mpg 3gp webm"
 ext[4]="cpi"
 ext[5]="wav"
 ext[6]="mp3"
-ext[7]="rw2"
+ext[7]="rw2 dng"
 ext[8]="3ga"
 ext[9]="mpo"
--- a/sql-to-dot.sed
+++ b/sql-to-dot.sed
@ -11,6 +11,11 @@ H;$!d;$x
 # remove all single-line comment lines
 s/\n--[^\n]*//g
 # encode html entities
 s/&/\&amp##SEMICOLON##/g
 s/</\&lt##SEMICOLON##/g
 s/>/\&gt##SEMICOLON##/g
 # reduce spaces
 s,\t\| \+, ,g
@ -21,7 +26,7 @@ s,\t\| \+, ,g
 s,\n\+,\n,g
 # remove unknown commands
-s,\(;\|\n\) *\(DELIMITER\|USE\|DROP\|CREATE[ \n]\+DATABASE\)[ \n]\+[^;]*;\+,,ig
+s,\(;\|\n\) *\(INSERT\|DELIMITER\|USE\|DROP\|CREATE[ \n]\+DATABASE\)[ \n]\+[^;]*;\+,,ig
 # convert special characters within quotes
 :a;s/^\(\([^"]*"[^",]*"\)*[^"]*"[^"]*\),\([^"]*".*\)/\1\##COMMA##\3/g;ta
@ -34,17 +39,18 @@ h
 s,.*\(create[ \n]\+table[^;]*;\).*,\1,ig
 # start html table node
-s|CREATE[ \n]\+TABLE[ \n]\+\(if[ \n]\+not[ \n]\+exists[ \n]\+\)\?`\?\(\w\+\)`\?|    \2\n        [shape=none, margin=0, label=<\n            <table bgcolor="#dddddd">\n                <tr><td bgcolor="#ddddff" colspan="4"><b>\2</b></td></tr>|ig
+s|CREATE[ \n]\+TABLE[ \n]\+\(IF[ \n]\+NOT[ \n]\+EXISTS[ \n]\+\)\?`\?\(\w\+\)`\?|    \2\n        [shape=none, margin=0, label=<\n            <table bgcolor="#dddddd">\n                <tr><td bgcolor="#ddddff" colspan="4"><b>\2</b></td></tr>|ig
 # remove key definitions
-s/[),][\n ]*\(PRIMARY[ \n]\+\)\?KEY[ \n]\+[^(]*([^)]*)//gi
+s/[),][\n ]*\(\(UNIQUE\|PRIMARY\)[ \n]\+\)\?KEY[ \n]\+[^(]*([^)]*)//gi
 # move foreign keys as relation to the end
 :b;s/\(\w\+\)\([^;]*\)FOREIGN[\n ]\+KEY[ \n]*([ \n]*`\?\([a-z]\+\)`\?[ \n]*)[ \n]*REFERENCES[ \n]*`\?\([a-z]\+\)`\?[ \n]*([ \n]*`\?\([a-z]\+\)`\?[ \n]*)[ \n]*\([^,)]*\)\([,)].*\)/\1\2\7\n \1:\3 -> \4:\5 [label="\6"]##SEMICOLON##/ig;tb
 # create table rows
-s|[(,][ \n]*`\?\(\w\+\)`\?[ \n]\+\(\w\+\(([^)]\+)\)\?\)[ \n]*\([^,)]*\)[ \n]\+COMMENT[ \n]*["']\([^"']*\)["'][ \n]*|\n                <tr><td align="left" port="\1"><b>\1</b></td><td align="left">\2</td><td align="left">\4</td><td align="left">\5</td></tr>|gi
+s|[(,][ \n]*`\?\(\w\+\)`\?[ \n]\+\(\w\+\(([^)]\+)\)\?\)[ \n]*\([^,)]*\)|\n                <tr><td align="left" port="\1"><b>\1</b></td><td align="left">\2</td><td align="left">\4</td><td></td></tr>|g
-s|[(,][ \n]*`\?\(\w\+\)`\?[ \n]\+\(\w\+\(([^)]\+)\)\?\)[ \n]*\([^,)]*\)|\n                <tr><td align="left" port="\1"><b>\1</b></td><td align="left">\2</td><td align="left">\4</td></tr>|g
+# extract comment
 s|\(<td\( *\w*="\w*"\)* *>[^<]*\)COMMENT[ \n]\+["']\([^"']*\)["']\([^<]*</td>\)<td></td>|\1\4<td align="left">\3</td>|g
 # add line breaks for long lines
 s|\(<td[^>]*>[^<]\{30,40\}\)[ \n]\+\([^<]\{20,\}</td>\)|\1<br/>\2|g
--- a/template.sh
+++ b/template.sh
@ -0,0 +1,160 @@
 #!/bin/bash -e
 ##########################################################################################
 #### template for bash scripts #### START BELOW ##########################################
 ##########################################################################################
 ############################################################################ begin logging
 # check if stdout is a terminal...
 if test -t 1; then
    # see if it supports colors...
    ncolors=$(tput colors)
    if test -n "$ncolors" && test $ncolors -ge 8; then
        bold="$(tput bold)"
        underline="$(tput smul)"
        standout="$(tput smso)"
        normal="$(tput sgr0)"
        black="$(tput setaf 0)"
        red="$(tput setaf 1)"
        green="$(tput setaf 2)"
        yellow="$(tput setaf 3)"
        blue="$(tput setaf 4)"
        magenta="$(tput setaf 5)"
        cyan="$(tput setaf 6)"
        white="$(tput setaf 7)"
    fi
 fi
 append_msg() {
    if test $# -ne 0; then
        echo -n ": ${bold}$*"
    fi
    echo "${normal}"
 }
 # write a message
 message() {
    if test $# -eq 0; then
        return
    fi
    echo "${bold}${white}$*${normal}" 1>&2
 }
 # write a success message
 success() {
    echo -n "${bold}${green}success" 1>&2
    append_msg $* 1>&2
 }
 # write a notice
 notice() {
    echo -n "${bold}${yellow}notice" 1>&2
    append_msg $* 1>&2
 }
 # write a warning message
 warning() {
    echo -en "${bold}${red}warning" 1>&2
    append_msg $* 1>&2
 }
 # write error message
 error() {
    echo -en "${bold}${red}error" 1>&2
    append_msg $* 1>&2
 }
 # run a command, print the result and abort in case of error
 # option: --ignore: ignore the result, continue in case of error
 run() {
    ignore=1
    while test $# -gt 0; do
        case "$1" in
            (--ignore) ignore=0;;
            (*) break;;
        esac
        shift;
    done
    echo -n "${bold}${yellow}running:${white} $*${normal} … "
    set +e
    result=$($* 2>&1)
    res=$?
    set -e
    if test $res -ne 0; then
        if test $ignore -eq 1; then
            error "failed with return code: $res"
            if test -n "$result"; then
                echo "$result"
            fi
            exit 1
        else
            warning "ignored return code: $res"
        fi
    else
        success
    fi
 }
 ############################################################################ error handler
 function traperror() {
    set +x
    local err=($1) # error status
    local line="$2" # LINENO
    local linecallfunc="$3"
    local command="$4"
    local funcstack="$5"
    IFS=" "
    for e in ${err[@]}; do
        if test -n "$e" -a "$e" != "0"; then
            error "line $line - command '$command' exited with status: $e (${err[@]})"
            if [ "${funcstack}" != "main" -o "$linecallfunc" != "0" ]; then
                echo -n "   ... error at ${funcstack} " 1>&2
                if [ "$linecallfunc" != "" ]; then
                    echo -n "called at line $linecallfunc" 1>&2
                fi
                echo
            fi
            exit $e
        fi
    done
    success
    exit 0
 }
 # catch errors
 trap 'traperror "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' ERR SIGINT INT TERM EXIT
 ##########################################################################################
 #### START HERE ##########################################################################
 ##########################################################################################
 ######################################################### commandline parameter evaluation
 while test $# -gt 0; do
    case "$1" in
        (--help|-h) less <<EOF
 SYNOPSIS
  $0 [OPTIONS]
 OPTIONS
  --help, -h                 show this help
 DESCRIPTION
 EOF
            exit;;
        (*) error "unknow option $1, try $0 --help"; exit 1;;
    esac
    if test $# -eq 0; then
        error "missing parameter, try $0 --help"; exit 1
    fi
    shift;
 done
 ##################################################################################### Main