by default, disable qt debug output

ax_check_qt.m4

@@ -1,10 +1,10 @@
 # SYNOPSIS
 #
 #   Check if a module exists:
-#     AX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
+#     AX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules] [flags])
 #
 #   Abort if a module does not exist:
-#     AX_REQUIRE_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
+#     AX_REQUIRE_QT([qt_prefix], [list-of-qt-modules], [optional-modules] [flags])
 #
 # DESCRIPTIONS
 #
@@ -35,6 +35,18 @@
 #      Optional list of more, optional modules, e.g. modules that
 #      exist only in Qt5, but not in Qt4, such as QtWidgets or
 #      QtWebKitWidgets
+#
+#    flags
+#
+#      Optional flages, space separated from this list:
+#
+#          manualflags
+#
+#            CXXFLAGS, CPPFLAGS and LIBS variables are not
+#            automatically expanded, but you need to add the
+#            qt_prefix_CXXFLAGS, qt_prefix_CPPFLAGS and qt_prefix_LIBS
+#            variables manually where you need them. This is useful,
+#            if some build targets need a feature and some don't.
 
 
 AC_DEFUN([AX_CXX_QT_TOOL], [
@@ -83,6 +95,7 @@ AC_DEFUN([AX_CXX_QT_TOOLS], [
 AC_DEFUN([AX_CHECK_QT], [
   qt_modules="$2"
   qt_modules_optional="$3"
+  qt_flags="$4"
   AX_CXX_QT_TOOLS
   HAVE_$1=0
   PKG_PROG_PKG_CONFIG
@@ -91,17 +104,37 @@ AC_DEFUN([AX_CHECK_QT], [
     AC_DEFINE([HAVE_$1])
     QTDIR=$(${PKG_CONFIG} --variable=prefix Qt5Core)
     QT_PLUGIN_PATH=${QTDIR}/share/qt5/plugins
-    CPPFLAGS+=" ${[$1]5_CFLAGS}"
     MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}"
-    CXXFLAGS+=" ${[$1]5_CFLAGS}"
+    [$1]_CPPFLAGS="${[$1]5_CFLAGS}"
-    LIBS+=" ${[$1]5_LIBS}"
+    [$1]_CXXFLAGS="${[$1]5_CFLAGS}"
+    [$1]_LIBS="${[$1]5_LIBS}"
+    AC_SUBST([$1]_CPPFLAGS)
+    AC_SUBST([$1]_CXXFLAGS)
+    if test "${qt_flags/manualflags/}" = "${qt_flags}"; then
+      CPPFLAGS+=" ${[$1]_CPPFLAGS}"
+      CXXFLAGS+=" ${[$1]_CXXFLAGS}"
+      LIBS+=" ${[$1]_LIBS}"
+      AC_MSG_NOTICE([Adding flags for $1])
+    else
+      AC_MSG_NOTICE([To enable $1, add $1_CPPFLAGS, $1_CXXFLAGS and $1_LIBS])
+    fi
     PKG_REQUIREMENTS+=" ${qt_modules//Qt/Qt5}"
     if test -n "${qt_modules_optional}"; then
       PKG_CHECK_MODULES([$1]5_OPTIONAL, [${qt_modules_optional//Qt/Qt5}], [
-        CPPFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}"
         MOC_FLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}"
+        [$1]_CPPFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}"
+        [$1]_CXXFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}"
+        [$1]_LIBS+=" ${[$1]5_OPTIONAL_LIBS}"
+        AC_SUBST([$1]_CPPFLAGS)
+        AC_SUBST([$1]_CXXFLAGS)
+        if test "${qt_flags/manualflags/}" = "${qt_flags}"; then
+          CPPFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}"
           CXXFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}"
           LIBS+=" ${[$1]5_OPTIONAL_LIBS}"
+          AC_MSG_NOTICE([Adding flags for $1])
+        else
+          AC_MSG_NOTICE([To enable $1, add $1_CPPFLAGS, $1_CXXFLAGS and $1_LIBS])
+        fi
         PKG_REQUIREMENTS+=" ${qt_modules_optional//Qt/Qt5}"
       ], [
         AC_MSG_NOTICE([Not found: ${qt_modules_optional//Qt/Qt5}])
@@ -113,17 +146,36 @@ AC_DEFUN([AX_CHECK_QT], [
       AC_DEFINE([HAVE_$1])
       QTDIR=$(${PKG_CONFIG} --variable=prefix QtCore)
       QT_PLUGIN_PATH=${QTDIR}/share/qt/plugins
-      CPPFLAGS+=" ${$1_CFLAGS}"
       MOC_FLAGS+=" -DHAVE_$1=1 ${$1_CFLAGS}"
-      CXXFLAGS+=" ${$1_CFLAGS}"
+      [$1]_CPPFLAGS="${[$1]_CFLAGS}"
-      LIBS+=" ${$1_LIBS}"
+      [$1]_CXXFLAGS="${[$1]_CFLAGS}"
+      AC_SUBST([$1]_CPPFLAGS)
+      AC_SUBST([$1]_CXXFLAGS)
+      if test "${qt_flags/manualflags/}" = "${qt_flags}"; then
+        CPPFLAGS+=" ${[$1]_CPPFLAGS}"
+        CXXFLAGS+=" ${[$1]_CXXFLAGS}"
+        LIBS+=" ${[$1]_LIBS}"
+          AC_MSG_NOTICE([Adding flags for $1])
+        else
+          AC_MSG_NOTICE([To enable $1, add $1_CPPFLAGS, $1_CXXFLAGS and $1_LIBS])
+      fi
       PKG_REQUIREMENTS+=" ${qt_modules}"
       if test -n "$3"; then
         PKG_CHECK_MODULES($1_OPTIONAL, [${qt_modules_optional}], [
+          MOC_FLAGS+="${$1_OPTIONAL_CFLAGS}"
+          [$1]_CPPFLAGS+=" ${$1_OPTIONAL_CFLAGS}"
+          [$1]_CXXFLAGS+=" ${$1_OPTIONAL_CFLAGS}"
+          [$1]_LIBS+=" ${$1_OPTIONAL_LIBS}"
+          AC_SUBST([$1]_CPPFLAGS)
+          AC_SUBST([$1]_CXXFLAGS)
+          if test "${qt_flags/manualflags/}" = "${qt_flags}"; then
             CPPFLAGS+=" ${$1_OPTIONAL_CFLAGS}"
-          MOC_FLAGS+=" ${$1_OPTIONAL_CFLAGS}"
             CXXFLAGS+=" ${$1_OPTIONAL_CFLAGS}"
             LIBS+=" ${$1_OPTIONAL_LIBS}"
+            AC_MSG_NOTICE([Adding flags for $1])
+          else
+            AC_MSG_NOTICE([To enable $1, add $1_CPPFLAGS, $1_CXXFLAGS and $1_LIBS])
+          fi
           PKG_REQUIREMENTS+=" ${qt_modules_optional}"
         ], [
           AC_MSG_NOTICE([Not found: ${qt_modules_optional}])
@@ -133,7 +185,7 @@ AC_DEFUN([AX_CHECK_QT], [
   ])
   AM_CONDITIONAL(HAVE_$1, test $HAVE_[$1] -eq 1)
   AX_CHECK_VALID_CXX_FLAG([-fPIC -fPIE], [position independent code flag])
-  if test "${MINGW}" != "no"; then
+  if test -n "${MINGW}"; then
     AX_CHECK_VALID_CXX_FLAG([-Wl,-subsystem,windows], [windows console flag])
   fi
   AC_SUBST(QTDIR)
@@ -162,49 +214,15 @@ qrc_%.cxx: %.qrc
 %.qm: %.ts
 	${LRELEASE} $< -qm [$][@]
 
-#%.ts: ${LANGUAGE_FILES}
+#%.ts: ${LANGUAGE_FILES:%=%}
 #	${LUPDATE} -no-obsolete \
 #	           -target-language ${@:${LANGUAGE_FILE_BASE}_%.ts=%} \
 #	           -ts [$][@] $<
 
 '])
 
-# SYNOPSIS
-#
-#   AX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
-#
-# DESCRIPTIONS
-#
-#    qt_prefix
-#
-#      Each call to AX_CHECK_QT should have a different prefix
-#      value (with a few exceptions discussed later on). This value,
-#      usually provided in uppercase, is used as prefix to the
-#      variables holding the compiler flags and libraries reported by
-#      pkg-config.
-#
-#      For instance, if your prefix was to be FOO you'll be provided
-#      two variables FOO_CFLAGS and FOO_LIBS.
-#
-#      This will also be used as message during the configure checks:
-#      checking for FOO....
-#
-#    list-of-modules
-#
-#      A single call to the macro can check for the presence of one or
-#      more qt modules; you'll see later how to make good use of this
-#      feature. Each entry in the list can have a version comparison
-#      specifier, with the same syntax as the Requires keyword in the
-#      data files themselves.
-#
-#    optional-modules
-#
-#      Optional list of more, optional modules, e.g. modules that
-#      exist only in Qt5, but not in Qt4, such as QtWidgets or
-#      QtWebKitWidgets
-
 AC_DEFUN([AX_REQUIRE_QT], [
-  AX_CHECK_QT([$1], [$2], [$3])
+  AX_CHECK_QT([$1], [$2], [$3], [$4])
   if ! test "$HAVE_$1" -eq 1; then
      AC_MSG_ERROR([Required Qt modules not found: $2])
   fi
@@ -213,7 +231,6 @@ AC_DEFUN([AX_REQUIRE_QT], [
 
 #   Omit Qt Keywords
 #     AX_QT_NO_KEYWORDS
-
 AC_DEFUN([AX_QT_NO_KEYWORDS], [
   CPPFLAGS+=" -DQT_NO_KEYWORDS"
 ])

ax_init_standard_project.m4

@@ -8,7 +8,16 @@ 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
-m4_define(x_least, mrw_esyscmd_s([
+m4_define(x_least, m4_ifdef([x_least_diff], mrw_esyscmd_s([
+  SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
+  for path in . .. ../..; do
+    if svn info $path 2>&1 > /dev/null; then
+      SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
+      break;
+    fi
+  done
+  echo $ECHO_N $(($SVN_REVISION))
+]),  mrw_esyscmd_s([
   SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
   for path in . .. ../..; do
     if svn info $path 2>&1 > /dev/null; then
@@ -18,7 +27,7 @@ m4_define(x_least, mrw_esyscmd_s([
   done
   # Mac does not support LEAST > 255
   echo $ECHO_N $(($SVN_REVISION%256))
-]))
+])))
 # define version number from subversion's revision number:
 # it is taken modulo 256 due to a bug on Apple's MacOSX
 # add to x_minor if revision number is > 256
@@ -34,7 +43,7 @@ m4_define(x_minor_diff, mrw_esyscmd_s([
   echo $ECHO_N $(($SVN_REVISION/256))
 ]))
 # setup version number
-m4_define(x_version, [x_major.m4_eval(x_minor+x_minor_diff).x_least])
+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]))])
 
 ## bugreport mail address is taken from <user@host> in first line of AUTHORS
 m4_define(x_bugreport, mrw_esyscmd_s([
@@ -107,14 +116,27 @@ AC_DEFUN([AX_SUBST], [
 #
 # configures the basic environment
 AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
-  MINGW=no
+  AC_MSG_CHECKING([target platfrom])
-  MAC=no
+  UNIX=1
-  case $host in
+  MINGW=
-    *mingw*) MINGW=yes;;
+  MACOSX=
-    *darwin* | *rhapsody* | *macosx*) MAC=yes;;
+  for h in ${target} ${target_os} ${host} ${host_os} \
+           ${build} ${build_os} $(uname -s 2> /dev/null); do
+    p="$h is generic Unix"
+    case "$h" in
+      (*mingw*)
+        UNIX=; MINGW=1; p="MinGW"; break;;
+      (*Darwin*|*darwin*|*rhapsody*|*macosx*)
+        UNIX=; MACOSX=1; p="MacOSX"; break;;
     esac
-  AM_CONDITIONAL(MINGW, test "$MINGW" = "yes")
+  done
-  AM_CONDITIONAL(MAC, test "$MAC" = "yes")
+  AC_MSG_RESULT($p)
+  AM_CONDITIONAL(UNIX, test "$UNIX" = "1")
+  AM_CONDITIONAL(MINGW, test "$MINGW" = "1")
+  AM_CONDITIONAL(MACOSX, test "$MACOSX" = "1")
+  AX_SUBST(UNIX)
+  AX_SUBST(MINGW)
+  AX_SUBST(MACOSX)
   AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_TARNAME//[^a-zA-Z0-9]/_}'"
   AX_SUBST(NUMBERS)
   AX_SUBST(HOME)
@@ -127,8 +149,17 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   AUTHOR=$(head -1 AUTHORS)
   AX_SUBST(AUTHOR)
   _AM_SUBST_NOTMAKE([AUTHOR])
-  DISTRO=$(lsb_release -sc)
+  DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null)
   AX_SUBST(DISTRO)
+  DISTRIBUTOR=$(lsb_release -si 2>/dev/null || uname -s 2>/dev/null)
+  case "${DISTRIBUTOR// /-}" in
+    (Ubuntu) UBUNTU=1; AX_SUBST(UBUNTU);;
+    (Debian) DEBIAN=1; AX_SUBST(DEBIAN);;
+    (SUSE-LINUX) SUSE=1; AX_SUBST(SUSE);;
+    (Fedora) FEDORA=1; AX_SUBST(FEDORA);;
+    (Centos) CENTOS=1; AX_SUBST(CENTOS);;
+  esac
+  AX_SUBST(DISTRIBUTOR)
   BUILD_NUMBER=${BUILD_NUMBER:-1}
   AX_SUBST(BUILD_NUMBER)
   BUILD_DATE=$(LANG= date +"%a, %d %b %Y %H:%M:%S %z")
@@ -156,11 +187,24 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
      - all warnings result in an error
      - doxygen warnings are treated as error too]); fi
 
+  AC_ARG_ENABLE(debug,
+    [AS_HELP_STRING([--enable-debug],
+                    [compile for debugger])],
+    [have_debug="$enableval"], [have_debug="no"])
+  AM_CONDITIONAL(DEBUG, test "$enableval" = "yes")
+  if test "$have_debug" == "yes"; then
+    AC_MSG_NOTICE([Debug compile mode enabled]);
+    AM_CPPFLAGS="${AM_CPPFLAGS} -DDEBUG"
+    AM_CXXFLAGS="${AM_CXXFLAGS:-} -ggdb3 -O0"
+    AM_LDFLAGS="${AM_LDFLAGS} -ggdb3 -O0"
+  else
+    AM_CPPFLAGS="${AM_CPPFLAGS} -DQT_NO_DEBUG_OUTPUT -DQT_NO_DEBUG"
+  fi
+
   AC_CONFIG_FILES([makefile])
   AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-standard-project-targets], [makefile.in])
   AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-standard-project-targets], [makefile.in])
   AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-standard-project-targets], [makefile.in])
-  test -f makefile.in && sed -i '1iEXTRA_DIST = ' makefile.in
   test -f makefile.in && cat >> makefile.in <<EOF
 #### Begin: Appended by $0
 EXTRA_DIST += bootstrap.sh
@@ -387,6 +431,8 @@ EOF
 #     $2 = module name (optional, if different from id)
 #     $3 = a header file to find (optional)
 #     $4 = alternative module names (space separated, optional)
+#     $5 = optional flags:
+#            manualflags if CXXFLAGS, CPPFLAGS, LIBS should remain unchanged
 #
 # uses PKG_CHECK_MODULES to test for a module
 # then, if given, looks for the header file
@@ -395,6 +441,7 @@ EOF
 # fails if not found
 AC_DEFUN([AX_PKG_REQUIRE], [
   PKG_PROG_PKG_CONFIG
+  optional_flags="$5"
   $1_found=no
   secondpar="m4_default([$2], [$1])"
   PKG_CHECK_MODULES([$1], [m4_default([$2], [$1])], [
@@ -474,26 +521,47 @@ AC_DEFUN([AX_PKG_REQUIRE], [
       AC_MSG_ERROR([Feature $1 not found please install module $secondpar])
     fi
   fi
-  CPPFLAGS+=" ${$1_CFLAGS}"
+  [$1]_CPPFLAGS="${$1_CFLAGS}"
-  CXXFLAGS+=" ${$1_CFLAGS}"
+  [$1]_CXXFLAGS="${$1_CFLAGS}"
+  AC_SUBST([$1]_CPPFLAGS)
+  AC_SUBST([$1]_CXXFLAGS)
+  if test "${optional_flags/manualflags/}" = "${optional_flags}"; then
+    CPPFLAGS+=" ${$1_CPPFLAGS}"
+    CXXFLAGS+=" ${$1_CXXFLAGS}"
     LIBS+=" ${$1_LIBS}"
+    AC_MSG_NOTICE([Adding flags for $1])
+  else
+    AC_MSG_NOTICE([To enable $1, add $1_CPPFLAGS, $1_CXXFLAGS and $1_LIBS])
+  fi
 ])
 
 # check if a specific package exists
 #  - parameter:
 #     $1 = unique id (no special characters)
 #     $2 = module name (optional, if different from id)
+#     $3 = optional flags:
+#          manualflags if CXXFLAGS, CPPFLAGS, LIBS should remain unchanged
 #
 # uses PKG_CHECK_MODULES to test for a module
 # sets automake conditional HAVE_$1 to 0 (not found) or 1 (found)
 # sets all flags, so that the module can be used everywhere
 AC_DEFUN([AX_PKG_CHECK], [
+  optional_flags="$3"
   PKG_PROG_PKG_CONFIG
   PKG_CHECK_MODULES([$1], [m4_default([$2], [$1])], [
     HAVE_$1=1
-    CPPFLAGS+=" ${$1_CFLAGS}"
+    [$1]_CPPFLAGS="${$1_CFLAGS}"
-    CXXFLAGS+=" ${$1_CFLAGS}"
+    [$1]_CXXFLAGS="${$1_CFLAGS}"
+    AC_SUBST([$1]_CPPFLAGS)
+    AC_SUBST([$1]_CXXFLAGS)
+    if test "${optional_flags/manualflags/}" = "${optional_flags}"; then
+      CPPFLAGS+=" ${$1_CPPFLAGS}"
+      CXXFLAGS+=" ${$1_CXXFLAGS}"
       LIBS+=" ${$1_LIBS}"
+      AC_MSG_NOTICE([Adding flags for $1])
+    else
+      AC_MSG_NOTICE([To enable $1, add $1_CPPFLAGS, $1_CXXFLAGS and $1_LIBS])
+    fi
     if test -z "$PKG_REQUIREMENTS"; then
       PKG_REQUIREMENTS="m4_default([$2], [$1])"
     else

bootstrap.sh

@@ -104,6 +104,8 @@ GENERATED FILES
     * ax_cxx_compile_stdcxx_11.m4 - auxiliary macro definition file
     * ax_check_qt.m4 - auxiliary macro definition file
     * resolve-debbuilddeps.sh - script to install debian package dependencies
+    * resolve-rpmbuilddeps.sh - script to install RPM package dependencies
+    * build-resource-file.sh - build resource.qrc file from a resource directory
     * mac-create-app-bundle.sh - script to create apple mac os-x app-bundle
     * AUTHORS - replace your name in AUTHORS before first run
     * NEWS - empty file add your project's news
@@ -169,13 +171,13 @@ FILE DEPENDENCIES
     * html/makefile.am depends on AX_BUILD_HTML
     * doc/doxyfile.in depends on AX_BUILD_EXAMPLES
     * debian/control.in depends on AX_USE_DOXYGEN, AX_USE_CPPUNIT,
-      AX_CXX_QT, AX_CHECK_QT, AX_USE_LIBTOOL
+      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
     * debian/${DEFAULT_PROJECT_NAME}-dev.dirs depends on AX_USE_LIBTOOL
-    * ${DEFAULT_PROJECT_NAME}.spec.in dependson AX_USE_RPM_PACKAGING,
+    * ${DEFAULT_PROJECT_NAME}.spec.in depends on AX_USE_RPM_PACKAGING,
-      AX_USE_LIBTOOL, AX_CHECK_QT, AX_CXX_QT, AX_USE_CPPUNIT
+      AX_USE_LIBTOOL, AX_CHECK_QT, AX_REQUIRE_QT, AX_CXX_QT, AX_USE_CPPUNIT
 
 FILES
 
@@ -280,7 +282,8 @@ run() {
 }
 
 testtag() {
-    egrep -q '^ *'"$1" configure.ac
+    local IFS="|"
+    egrep -q '^ *'"($*)" configure.ac
 }
 
 contains() {
@@ -386,6 +389,8 @@ copy ax_init_standard_project.m4
 copy ax_cxx_compile_stdcxx_11.m4
 copy ax_check_qt.m4
 copy resolve-debbuilddeps.sh
+copy resolve-rpmbuilddeps.sh
+copy build-resource-file.sh
 copy mac-create-app-bundle.sh
 AUTHOR=$(gpg -K  | sed -n 's,uid *,,p' | sort | head -1)
 if test -z "${AUTHOR}"; then
@@ -425,6 +430,7 @@ AX_INIT_STANDARD_PROJECT
 
 # qt features, uncomment, what you need:
 #AX_CHECK_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets])
+#AX_REQUIRE_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets])
 #AX_QT_NO_KEYWORDS
 
 # create output
@@ -696,7 +702,7 @@ EOF
 Source: @PACKAGE_NAME@
 Priority: extra
 Maintainer: @AUTHOR@
-Build-Depends: debhelper, subversion, pkg-config, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT; then echo -n ", qt5-default | qt4-default | 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, subversion, pkg-config, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | qt4-default | 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)
 
 Package: @PACKAGE_NAME@
 Section: $(if testtag AX_USE_LIBTOOL; then echo  "libs"; fi)
@@ -765,9 +771,9 @@ BuildRequires: pkgconfig, redhat-lsb$(
     fi)
 %if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} )
 $(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: mscgen"; fi)
-$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then echo -n "BuildRequires: qt5-qtbase-devel, qt5-qttools, qt5-qtwebkit-devel"; fi)
+$(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; then echo -n "BuildRequires: qt-devel"; fi)
+$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: qt-devel"; fi)
 %endif
 %else%if 0%{?suse_version} || 0%{?sles_version}
 BuildRequires: pkg-config, lsb-release$(
@@ -775,9 +781,9 @@ BuildRequires: pkg-config, lsb-release$(
       echo -n ", libcppunit-devel";
     fi)
 %if 0%{?suse_version} < 1200 ||  0%{?sles_version} < 1200
-$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then echo -n "BuildRequires: libqt4-devel, qt4-x11-tools, libQtWebKit-devel"; fi)
+$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: libqt4-devel, qt4-x11-tools, libQtWebKit-devel"; fi)
 %else
-$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then echo -n "BuildRequires: libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel"; fi)
+$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel"; fi)
 %endif
 %endif%endif
 

build-resource-file.sh

@@ -0,0 +1,31 @@
+#! /bin/bash -ex
+
+## @id $Id$
+
+## build resource.qrc file from a resource directory
+##
+## Argument: $1: resource path (default: resources)
+## Result: file named <resource-path>.qrc (default: resources.qrc)
+##
+## Call:
+##
+##   cd src
+##   ../build-resource-file.sh
+
+##       1         2         3         4         5         6         7         8
+## 45678901234567890123456789012345678901234567890123456789012345678901234567890
+
+RESOURCES=${1:-resources}
+TARGET=${RESOURCES}.qrc
+
+test -d ${RESOURCES}
+
+echo "<RCC>" > ${TARGET}
+for d in $(find resources -mindepth 1 -type d); do
+    echo "  <qresource prefix=\"${d#${RESOURCES}/}\">" >> ${TARGET}
+    for f in $(find $d -mindepth 1 -maxdepth 1 -type f); do
+        echo "    <file alias=\"${f##*/}\">$f</file>" >> ${TARGET}
+    done
+    echo "  </qresource>" >> ${TARGET}
+done
+echo "</RCC>" >> ${TARGET}

configure.ac

@@ -25,7 +25,7 @@ AX_BUILD_EXAMPLES
 
 AX_CHECK_QT([QT], [QtNetwork QtGui], [QtWidgets])
 AC_CONFIG_FILES([src/languages.qrc])
-if test "${MINGW}" = "no"; then
+if test -z "${MINGW}"; then
   AX_PKG_CHECK([PROXY], [libproxy-1.0])
 else
   LDFLAGS+=" -lwinhttp"

resolve-debbuilddeps.sh

@@ -4,8 +4,8 @@
 
 ## Resolve Debian Build Dependencies
 ## Installs all the required packages
-## Call: ./resolve-builddeps 'name of build schroot'
+## Call: ./resolve-debbuilddeps 'name of build schroot'
-## e.g. call: ./resolve-builddeps trusty_amd64
+## e.g. call: ./resolve-debbuilddeps trusty_amd64
 
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890

resolve-rpmbuilddeps.sh

@@ -0,0 +1,34 @@
+#! /bin/bash -ex
+
+## @id $Id$
+
+## Resolve RPM Build Dependencies
+## Installs all the required packages
+## Call: ./resolve-rpmbuilddeps 'name of build schroot'
+## e.g. call: ./resolve-rpmbuilddeps opensuse-13.2_x86_64
+
+##       1         2         3         4         5         6         7         8
+## 45678901234567890123456789012345678901234567890123456789012345678901234567890
+
+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}
+    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} || \
+            zypper install -y ${FILES} || \
+            dnf install -y ${FILES}
+    fi
+fi
+
+echo "**** Success: All Dependencies Resolved"

uninstall-64-and-32-bit-linux.sh

@@ -1,18 +0,0 @@
-./bootstrap.sh && \
-LDFLAGS="-L/usr/lib32 -m32" CXXFLAGS="-m32" ./configure \
-  --libdir=/usr/local/lib32 \
-  --build=x86_64 \
-  --host=i386 && \
-sudo make uninstall && \
-make clean && \
-LDFLAGS="-L/opt/local/i586-mingw32msvc/lib" \
-  CPPFLAGS="-I/opt/local/i586-mingw32msvc/include" \
-  ./configure \
-  --prefix=/opt/local/i586-mingw32msvc \
-  --build=x86_64 \
-  --host=i586-mingw32msvc && \
-sudo make uninstall && \
-make clean && \
-./configure && \
-sudo make uninstall
-