after migration to new svn server

scripts/ax_init_standard_project.m4

@@ -12,29 +12,25 @@ 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
+      for path in . .. ../.. ../../..; do
         if test -d .svn; then
           VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
-          if test -z "${VCS_REVISION}"; then VCS_REVISION=0; fi
+          if test -n "${VCS_REVISION}"; then break; fi
-          break;
         elif test -d .git; then
           VCS_REVISION=$(git rev-list --all --count)
-          if test -z "${VCS_REVISION}"; then VCS_REVISION=0; fi
+          if test -n "${VCS_REVISION}"; then break; fi
-          break;
         fi
       done
       echo $ECHO_N $(($VCS_REVISION))
     ]),  mrw_esyscmd_s([
       VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout"
-      for path in . .. ../..; do
+      for path in . .. ../.. ../../..; do
         if test -d .svn; then
           VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
-          if test -z "${VCS_REVISION}"; then VCS_REVISION=0; fi
+          if test -n "${VCS_REVISION}"; then break; fi
-          break;
         elif test -d .git; then
           VCS_REVISION=$(git rev-list --all --count)
-          if test -z "${VCS_REVISION}"; then VCS_REVISION=0; fi
+          if test -n "${VCS_REVISION}"; then break; fi
-          break;
         fi
       done
       # Mac does not support LEAST > 255
@@ -48,15 +44,13 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix],
 # add to x_minor if revision number is > 256
 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
+  for path in . .. ../.. ../../..; do
     if test -d .svn; then
       VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
-      if test -z "${VCS_REVISION}"; then VCS_REVISION=0; fi
+      if test -n "${VCS_REVISION}"; then break; fi
-      break;
     elif test -d .git; then
       VCS_REVISION=$(git rev-list --all --count)
-      if test -z "${VCS_REVISION}"; then VCS_REVISION=0; fi
+      if test -n "${VCS_REVISION}"; then break; fi
-      break;
     fi;
   done
   # Mac does not support LEAST > 255
@@ -312,6 +306,43 @@ maintainer-clean-cxx-targets:
 EOF
 ])
 
+# use this in configure.ac to support old school C
+AC_DEFUN([AX_USE_C], [
+  AC_LANG(C)
+  AC_PROG_CC
+  AC_PROG_CPP
+
+  AC_CONFIG_FILES([src/makefile])
+  
+  AM_CPPFLAGS+=' -I ${top_srcdir}/src -I ${top_builddir}/src -I ${srcdir} -I ${builddir}'
+  AM_LDFLAGS+=' -L ${top_srcdir}/src -L ${top_builddir}/src'
+
+  # Get rid of those stupid -g -O2 options!
+  CXXFLAGS="${CXXFLAGS//-g -O2/}"
+  CFLAGS="${CFLAGS//-g -O2/}"
+
+  # pass compile flags to make distcheck
+  AM_DISTCHECK_CONFIGURE_FLAGS="CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
+  AC_SUBST(AM_DISTCHECK_CONFIGURE_FLAGS)
+
+  AC_SUBST(AM_CFLAGS)
+  AC_SUBST(AM_CPPFLAGS)
+  AC_SUBST(AM_LDFLAGS)
+  AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-c-targets], [src/makefile.in])
+  test -f src/makefile.in && cat >> src/makefile.in <<EOF
+#### Begin: Appended by $0
+%.app: %
+	-rm -r [\$][@]
+	\$(MAKE) DESTDIR=[\$][\$](pwd)/[\$][@]/tmp install
+	  \${top_builddir}/mac-create-app-bundle.sh \
+	    [\$][@] [\$][<] [\$][\$](pwd)/[\$][@]/tmp\${prefix}
+
+maintainer-clean-c-targets:
+	-rm makefile.in
+#### End: $0
+EOF
+])
+
 # use this in configure.ac to support tests without CppUnit
 AC_DEFUN([AX_BUILD_TEST], [
   AC_CONFIG_FILES([test/makefile])
@@ -401,7 +432,7 @@ EXTRA_DIST += debian
 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 )
+	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 )
 distclean-debian-targets:
 	-rm debian/changelog debian/control
 #### End: $0
@@ -412,12 +443,15 @@ EOF
 AC_DEFUN([AX_USE_RPM_PACKAGING], [
   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])
   AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-rpm-targets], [makefile.in])
   test -f makefile.in && cat >> makefile.in <<EOF
 #### Begin: Appended by $0
 EXTRA_DIST += \${PACKAGE_NAME}.spec.in
 rpm: dist
 	rpmbuild -ba --define "_topdir \$\$(pwd)" --define "_sourcedir \$\$(pwd)" \${PACKAGE_NAME}.spec
+clean-rpm-targets:
+	-rm -rf BUILD BUILDROOT RPMS SPECS SRPMS
 distclean-rpm-targets:
 	-rm \${PACKAGE_NAME}.spec
 #### End: $0
@@ -635,6 +669,7 @@ AC_DEFUN([AX_PKG_CHECK], [
 # make sure, a specific header exists
 # - parameter:
 #    $1 = header name
+#    $2 = pathes to search for
 AC_DEFUN([AX_REQUIRE_HEADER], [
   AC_CHECK_HEADER($1, [], [
     if test -n "$2"; then

scripts/bootstrap.sh

@@ -23,6 +23,8 @@ docker=0
 buildtarget=""
 overwrite=0
 rebuild=0
+novcs=0
+excludevcs=()
 rebuildfiles=()
 while test $# -gt 0; do
     case "$1" in
@@ -34,6 +36,8 @@ while test $# -gt 0; do
         (--overwrite|-o) overwrite=1;;
         (--rebuild|-r) rebuild=1;;
         (--rebuild-file|-f) shift; rebuildfiles+=("$1");;
+        (--no-vcs|-n) novcs=1;;
+        (--exclude-vcs|-x) shift; excludevcs+=("$1");;
         (--version|-v)
             echo "$Id: bootstrap.sh 52 2015-11-03 15:38:21Z marc $";
             exit;;
@@ -51,6 +55,8 @@ OPTIONS
   --overwrite, -o            overwrite all basic files (bootstrap.sh, m4-macros)
   --rebuild, -r              force rebuild of generated files, even if modified
   --rebuild-file, -f <file>  rebild specific file (can be added multiple times)
+  --no-vcs, -n               do not automatically add files to version control
+  --exclude-vcs, -x <file>   exclude specific file from version control
   --help, -h                 show this help
   --version, -v              show version and date of this file
 
@@ -109,12 +115,14 @@ RUNNING
   If you run ${MY_NAME}, it first generates the necessary files (see
   below), then first runs make distclean if a makefile exists. After
   this it calles aclocal, libtoolize, automake, autoconf and
-  optionally ./configure.
+  optionally ./configure. If necessary, files are added to version
+  control.
 
 GENERATED FILES
 
   This script copies the following files into your project environment:
     * ${MY_NAME}
+    * autogen.sh - just the basics to initialize auto tools and create configure
     * 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
@@ -260,20 +268,20 @@ EOF
 done
 
 echo -en "\e[1m-> checking:\e[0m for version control system ..."
+VCS=""
+VCSDEPENDS=""
 if test -d .svn; then
-  VCS="svn"
+    VCS="svn"
-  VCSDEPENDS="subversion"
+    VCSDEPENDS="subversion,"
+    echo -e " \e[32msuccess\e[0m detected ${VCS}"
 elif test -d .git; then
-  VCS="git"
+    VCS="git"
-  VCSDEPENDS="git"
+    VCSDEPENDS="git,"
+    echo -e " \e[32msuccess\e[0m detected ${VCS}"
 else
-    echo -e " \e[31merror\e[0m"
+    echo -e " \e[33mignored\e[0m"
-    echo -e "\e[1m*** must be started in root path of a subversion or git repositry\e[0m"
-    exit 1
 fi
 
-echo -e " \e[32msuccess\e[0m detected ${VCS}"
-
 HEADER='## @id '"\$Id\$"'
 ##
 ## This file has been added:
@@ -345,7 +353,9 @@ contains() {
 checkdir() {
     if ! test -d "$1"; then # create path
         run mkdir -p "$1"
-        run ${VCS} add "$1"
+        if test -n "${VCS}" -a $novcs -eq 0 && ! contains "$1" "${excludevcs[@]}"; then
+            run ${VCS} add "$1"
+        fi
     fi
 }
 
@@ -358,13 +368,17 @@ checkfile() {
 }
 
 to() {
+    mode="u=rw,g=rw,o=r"
     while test $# -gt 0; do
-        mode="u=rw,g=rw,o=r"
         case "$1" in
             (--condition) shift # test for a tag, abort if not set
                 if ! testtag "$1"; then
                     return 0
                 fi;;
+            (--unless) shift # test for a tag, abort if set
+                if testtag "$1"; then
+                    return 0
+                fi;;
             (--mode) shift # test for a tag, abort if not set
                 mode="$1";;
             (*) break;;
@@ -390,11 +404,13 @@ to() {
     else
         echo -e " \e[32msuccess\e[0m"
     fi
-    chmod $mode $1
+    run chmod $mode $1
     if test $exists -eq 0; then
-        run ${VCS} add "$1"
+        if test -n "${VCS}" -a $novcs -eq 0 && ! contains "$1" "${excludevcs[@]}"; then
-        if test "${VCS}" = "svn"; then
+            run ${VCS} add "$1"
-            run svn propset svn:keywords "Id" "$1"
+            if test "${VCS}" = "svn"; then
+                run svn propset svn:keywords "Id" "$1"
+            fi
         fi
     fi
     return 0
@@ -415,9 +431,11 @@ copy() {
     fi
     run cp "${source}" "$1"
     if test $exists -eq 0; then
-        run ${VCS} add "$1"
+        if test -n "${VCS}" -a $novcs -eq 0 && ! contains "$1" "${excludevcs[@]}"; then
-        if test "${VCS}" = "svn"; then
+            run ${VCS} add "$1"
-            run svn propset svn:keywords "Id" "$1"
+            if test "${VCS}" = "svn"; then
+                run svn propset svn:keywords "Id" "$1"
+            fi
         fi
     fi
 }
@@ -446,21 +464,27 @@ doxyadd() {
 
 vcs2cl() {
     exists=0
-    if test -f "Changelog"; then
+    if test -f "ChangeLog"; then
         exists=1
-    fi
-    if test "${VCS}" = "git"; then
-        ${VCS}2cl > ChangeLog
     else
-        ${VCS}2cl
+        touch "ChangeLog"
+    fi
+    if test -x $(which ${VCS}2cl); then
+        if test "${VCS}" = "git"; then
+            ${VCS}2cl > ChangeLog
+        elif test -n "${VCS}"; then
+            ${VCS}2cl
+        fi
     fi
     if test $exists -eq 0; then
-        run ${VCS} add ChangeLog
+        if test -n "${VCS}" -a $novcs -eq 0 && ! contains "ChangeLog" "${excludevcs[@]}"; then
+            run ${VCS} add ChangeLog
+        fi
     fi
 }
 
 # Check if we are in subversion root, if so, create trunk, branches, tags:
-if test "${VCS}" = "svn"; then
+if test "${VCS}" = "svn" -a $novcs -eq 0; then
     if test "$(LANG= svn info | sed -n 's,Relative URL: *,,p')" = "^/"; then
         svn mkdir trunk branches tags
         cd trunk
@@ -771,7 +795,9 @@ ${HEADER}dist_bin_SCRIPTS =
 MAINTAINERCLEANFILES = makefile.in
 EOF
 echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_DOXYGEN doc/makefile.am
-to --condition AX_BUILD_TEST test/runtests.sh < ${0%/*}/test/runtests.sh
+if testtag AX_BUILD_TEST; then
+    to test/runtests.sh < ${0%/*}/test/runtests.sh
+fi
 to --condition 'AX_BUILD_TEST|AX_USE_CPPUNIT' test/makefile.am <<EOF
 ${HEADER}$(if testtag AX_USE_CXX; then
 cat <<EOF2
@@ -809,9 +835,11 @@ if testtag AX_USE_DOXYGEN; then
         contains doc/doxyfile.in "${rebuildfiles[@]}"; then
         run doxygen -g doc/doxyfile.in
         if test $exists -eq 0; then
-            run ${VCS} add doc/doxyfile.in
+            if test -n "${VCS}" -a $novcs -eq 0 && ! contains "doc/doxyfile" "${excludevcs[@]}"; then
-            if test "${VCS}" = "svn"; then
+                run ${VCS} add doc/doxyfile.in
-                run svn propset svn:keywords "Id" doc/doxyfile.in
+                if test "${VCS}" = "svn"; then
+                    run svn propset svn:keywords "Id" doc/doxyfile.in
+                fi
             fi
         fi
         doxyreplace PROJECT_NAME "@PACKAGE_NAME@"
@@ -892,7 +920,7 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
 
  -- @AUTHOR@  @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)"
+    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)"
     to debian/control.in <<EOF
 Source: @PACKAGE_NAME@
 Priority: extra
@@ -963,7 +991,7 @@ else
 fi)
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gnupg, ${VCSDEPENDS}, automake, autoconf$(
+BuildRequires: gnupg, ${VCSDEPENDS} make, automake, autoconf, rpm-build$(
     if testtag AX_USE_DOXYGEN; then
       echo -n ", doxygen";
     fi)
@@ -1091,12 +1119,31 @@ for d in src test scripts doc examples html; do
         SUBDIRS="${SUBDIRS} $d"
     fi
 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
+$(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)
+automake -a
+autoconf
+EOF
 to makefile.am<<EOF
 ${HEADER}SUBDIRS =${SUBDIRS}
 
 desktopdir = \${datadir}/applications
 desktop_DATA = @PACKAGE_DESKTOP@
-dist_pkgdata_DATA = @PACKAGE_ICON@
+dist_pkgdata_DATA = @PACKAGE_ICON@ 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    \\
+                    sql-to-dot.sed
 dist_doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
 
 MAINTAINERCLEANFILES = makefile.in

scripts/makefile.am

@@ -1,18 +0,0 @@
-## @id $Id$
-##
-## This file has been added:
-##  - by bootstrap.sh
-##  -  on Tue, 03 November 2015 16:20:19 +0100
-## Feel free to change it or even remove and rebuild it, up to your needs
-##
-##       1         2         3         4         5         6         7         8
-## 45678901234567890123456789012345678901234567890123456789012345678901234567890
-
-dist_pkgdata_DATA = ax_check_qt.m4 bootstrap.sh				\
-                    resolve-rpmbuilddeps.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
-
-MAINTAINERCLEANFILES = makefile.in

scripts/resolve-rpmbuilddeps.sh

@@ -14,15 +14,13 @@ SCHROOTNAME="$1"
 PACKAGE_NAME=$(sed -n 's/^ *m4_define(x_package_name, \(.*\)).*/\1/p' configure.ac)
 
 if test -n "${SCHROOTNAME}"; then
-    schroot -c ${SCHROOTNAME} -- ./bootstrap.sh -t dist
     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
         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}
+            schroot -c ${SCHROOTNAME} -u root -- dnf install -y ${FILES}
     fi
 else
-    ./bootstrap.sh -t dist
     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
         yum install -y ${FILES} || \