updated build system

ChangeLog

@@ -1,3 +1,19 @@
+2016-04-25 10:50  
+
+	* build-in-docker.conf: fixed build in docker
+
+2016-04-25 08:48  
+
+	* build-in-docker.sh: fixed build in docker
+
+2016-04-25 08:19  
+
+	* ChangeLog, autogen.sh, ax_init_standard_project.m4,
+	  backup-generic.desktop.in, bootstrap.sh, build-in-docker.conf,
+	  build-in-docker.sh, mac-create-app-bundle.sh,
+	  resolve-debbuilddeps.sh, resolve-rpmbuilddeps.sh, sql-to-dot.sed:
+	  fixed build in docker
+
 2015-11-09 22:37  marc
 
 	* COPYING, ChangeLog, INSTALL, ax_init_standard_project.m4,

ax_init_standard_project.m4

@@ -14,6 +14,7 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix],
       VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout"
       for path in . .. ../.. ../../..; do
         if test -d .svn; then
+          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
@@ -26,6 +27,7 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix],
       VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout"
       for path in . .. ../.. ../../..; do
         if test -d .svn; then
+          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
@@ -46,6 +48,7 @@ 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
+      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
@@ -178,8 +181,6 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   _AM_SUBST_NOTMAKE([AUTHOR])
   DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null)
   AX_SUBST(DISTRO)
-  ARCH=$((@<:@@<:@ $(uname -sm) =~ 64 @:>@@:>@ && echo amd64) || (@<:@@<:@ $(uname -sm) =~ 'i?86' @:>@@:>@ && echo i386 || uname -sm))
-  AX_SUBST(ARCH)
   DISTRIBUTOR=$(lsb_release -si 2>/dev/null || uname -s 2>/dev/null)
   case "${DISTRIBUTOR// /-}" in
     (Ubuntu) UBUNTU=1; AX_SUBST(UBUNTU);;

bootstrap.sh

@@ -129,7 +129,6 @@ GENERATED FILES
     * 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
     * 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
@@ -1163,12 +1162,6 @@ Libs: -L\${libdir} -l${PACKAGE_NAME#lib} @LDFLAGS@
 Cflags: -I\${includedir} @CPPFLAGS@
 Requires: @PKG_REQUIREMENTS@
 EOF
-to build-in-docker.conf <<EOF
-repos+=("Debian|Ubuntu-precise::::::universe")
-repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com/ubuntu precise universe'")
-envs+=("-e 'HOME=${HOME}'")
-dirs+=("-v ${HOME}/.gnupg:${HOME}/.gnupg:ro")
-EOF
 
 #### Cleanup If Makefile Exists ####
 if test -f makefile; then