--- qsampler/trunk/configure.ac	2017/04/27 11:09:16	3128
+++ qsampler/trunk/configure.ac	2019/07/25 10:08:43	3523
@@ -1,17 +1,17 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(Qsampler, 0.4.3, rncbc@rncbc.org, qsampler)
+AC_INIT(Qsampler, 0.5.7, rncbc@rncbc.org, qsampler)
 
 AC_CONFIG_SRCDIR(src/qsampler.cpp)
 AC_CONFIG_HEADERS(src/config.h)
-AC_CONFIG_FILES(Makefile qsampler.spec src/src.pri src/qsampler.desktop)
+AC_CONFIG_FILES(Makefile qsampler.spec src/src.pri)
 
 # Build version string.
 AC_CACHE_VAL([ac_cv_build_version], [
    ac_cv_build_version=$(git describe --tags --dirty --abbrev=6 2>/dev/null)
    if test -n "$ac_cv_build_version"; then
-      ac_cv_build_version=$(echo $ac_cv_build_version | sed -r 's/^[^_]*[_v]//i')
-      ac_cv_build_version=$(echo $ac_cv_build_version | sed -r 's/-g/git./')
-      ac_cv_build_version=$(echo $ac_cv_build_version | sed -r 's/[[_|-]]+/./g')
+      ac_cv_build_version=$(echo $ac_cv_build_version | sed 's/^[[^_]]*[[_v]]//i')
+      ac_cv_build_version=$(echo $ac_cv_build_version | sed 's/-g/git./')
+      ac_cv_build_version=$(echo $ac_cv_build_version | sed 's/[[_|-]]\+/./g')
       ac_cv_build_version_extra=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
       if test "x$ac_cv_build_version_extra" != "xmaster"; then
          ac_cv_build_version="$ac_cv_build_version [[$ac_cv_build_version_extra]]"
@@ -25,7 +25,7 @@
 
 # Sanitized version string.
 AC_CACHE_VAL([ac_cv_version], [
-   ac_cv_version=$(echo $ac_cv_build_version | sed -r 's/^([[0-9|\.]]+).*$/\1/')
+   ac_cv_version=$(echo $PACKAGE_VERSION | sed -r 's/^([[0-9|\.]]+).*$/\1/')
 ])
 ac_version="$ac_cv_version"
 AC_DEFINE_UNQUOTED(CONFIG_VERSION, ["$ac_version"], [Version string.])
@@ -64,7 +64,7 @@
 
 # Enable debugging argument option.
 AC_ARG_ENABLE(debug,
-  AC_HELP_STRING([--enable-debug], [enable debugging (default=no)]),
+  AS_HELP_STRING([--enable-debug], [enable debugging (default=no)]),
   [ac_debug="$enableval"])
 
 if test "x$ac_debug" = "xyes"; then
@@ -78,61 +78,45 @@
 AC_SUBST(ac_debug)
 
 
-# Enable Qt4/5 availability.
-AC_ARG_ENABLE(qt4,
-  AC_HELP_STRING([--enable-qt4], [enable Qt4 build (default=no)]),
-  [ac_qt4="$enableval"],
-  [ac_qt4="no"])
-
-
 # Enable libgig availability.
 AC_ARG_ENABLE(libgig,
-  AC_HELP_STRING([--enable-libgig], [enable libgig interface (default=yes)]),
+  AS_HELP_STRING([--enable-libgig], [enable libgig interface (default=yes)]),
   [ac_libgig="$enableval"],
   [ac_libgig="yes"])
 
-# Enable X11 unique/single instance.
+# Enable unique/single instance.
 AC_ARG_ENABLE(xunique,
-  AC_HELP_STRING([--enable-xunique], [enable X11 unique/single instance (default=yes)]),
+  AS_HELP_STRING([--enable-xunique], [enable unique/single instance (default=yes)]),
   [ac_xunique="$enableval"],
   [ac_xunique="yes"])
 
 # Enable debugger stack-trace option (assumes --enable-debug).
 AC_ARG_ENABLE(stacktrace,
-  AC_HELP_STRING([--enable-stacktrace], [enable debugger stack-trace (default=no)]),
+  AS_HELP_STRING([--enable-stacktrace], [enable debugger stack-trace (default=no)]),
   [ac_stacktrace="$enableval"])
 
 
 # Standard installation base dirs.
+ac_path=$PATH
 ac_with_paths=""
 
-# Set for alternate Qt4/5 installation dir.
-AC_ARG_WITH(qt4,
-  AC_HELP_STRING([--with-qt4=PATH], [use alternate Qt4 install path]),
-  [ac_qt4_path="$withval"], [ac_qt4_path="no"])
-
-AC_ARG_WITH(qt5,
-  AC_HELP_STRING([--with-qt5=PATH], [use alternate Qt5 install path]),
-  [ac_qt5_path="$withval"], [ac_qt5_path="no"])
-
-if test "x$ac_qt4_path" != "xno"; then
-   ac_with_paths="$ac_with_paths $ac_qt4_path"
-   ac_qt4="yes"
-fi
-
-if test "x$ac_qt5_path" != "xno"; then
-   ac_with_paths="$ac_with_paths $ac_qt5_path"
-   ac_qt4="no"
+# Set for alternate Qt installation dir.
+AC_ARG_WITH(qt,
+  AS_HELP_STRING([--with-qt=PATH], [use alternate Qt install path]),
+  [ac_qt_path="$withval"], [ac_qt_path="no"])
+
+if test "x$ac_qt_path" != "xno"; then
+   ac_path="$ac_qt_path/bin:$ac_path"
 fi
 
 # Set for alternate liblscp installation dir.
 AC_ARG_WITH(liblscp,
-  AC_HELP_STRING([--with-liblscp=PATH], [use alternate liblscp install path]),
+  AS_HELP_STRING([--with-liblscp=PATH], [use alternate liblscp install path]),
   [ac_with_paths="$ac_with_paths $withval"])
 
 # Set for alternate libgig installation dir.
 AC_ARG_WITH(libgig,
-  AC_HELP_STRING([--with-libgig=PATH], [use alternate libgig install path]),
+  AS_HELP_STRING([--with-libgig=PATH], [use alternate libgig install path]),
   [ac_with_paths="$ac_with_paths $withval"])
 
 
@@ -161,8 +145,9 @@
    ac_gxx_version_major=$(($ac_cv_gxx_version_major + 0))
 ])
 ac_gxx_version_major=$ac_cv_gxx_version_major
-if test $ac_gxx_version_major -gt 4 -a $ac_gxx_version_major -lt 6; then
-   CXXFLAGS="-std=c++11 $CXXFLAGS"
+if test $ac_gxx_version_major -ge 4 -a $ac_gxx_version_major -lt 6; then
+   CPPFLAGS="-std=c++11 $CPPFLAGS"
+   ac_cflags="-std=c++11 $ac_cflags"
 fi
 
 # Check for proper flags.
@@ -179,40 +164,38 @@
 CPPFLAGS="-fPIC $CPPFLAGS"
 
 # Prepend alternate dependencies paths.
-ac_path=$PATH
-
 for X in $ac_with_paths; do
   if test -d $X/bin; then
-    ac_path="$X/bin:$ac_path"
+     ac_path="$X/bin:$ac_path"
   fi
   if test -d $X/include; then
-    CFLAGS="-I$X/include $CFLAGS "
-    CPPFLAGS="-I$X/include $CPPFLAGS"
-    ac_incpath="$X/include $ac_incpath"
+     CFLAGS="-I$X/include $CFLAGS "
+     CPPFLAGS="-I$X/include $CPPFLAGS"
+     ac_incpath="$X/include $ac_incpath"
   fi
   for Y in $ac_libdirs; do
-    if test -d $X/$Y; then
-       LIBS="-L$X/$Y $LIBS"
-       ac_libs="-L$X/$Y $ac_libs"
-    fi
+     if test -d $X/$Y; then
+        LIBS="-L$X/$Y $LIBS"
+        ac_libs="-L$X/$Y $ac_libs"
+     fi
   done
 done
 
 # A common error message:
 ac_errmsg="not found in current PATH. Maybe QT development environment isn't available."
 
-if test "x$ac_qt4" = "xyes"; then
-   AC_PATH_PROG(ac_qmake, qmake-qt4, [no], $ac_path)
-else
-   AC_PATH_PROG(ac_qmake, qmake-qt5, [no], $ac_path)
+# Check for qtchooser availability.
+AC_PATH_TOOL(ac_qtchooser, qtchooser, [no], $ac_path)
+if test -x $ac_qtchooser; then
+   export QT_SELECT=5
 fi
+
+# Check for proper qmake path/version alternatives.
+AC_PATH_TOOL(ac_qmake, qmake, [no], $ac_path)
 if test "x$ac_qmake" = "xno"; then
-   AC_PATH_PROG(ac_cv_qmake, qmake, [no], $ac_path)
+   AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)
    ac_qmake=$ac_cv_qmake
 fi
-if test "x$ac_qmake" = "xno"; then
-   AC_MSG_ERROR([qmake $ac_errmsg])
-fi
 
 # Check for proper Qt major version.
 AC_CACHE_CHECK([for Qt major version], [ac_cv_qt_version_major], [
@@ -220,14 +203,13 @@
    ac_cv_qt_version_major=$(($ac_cv_qt_version_major + 0))
 ])
 ac_qt_version_major=$ac_cv_qt_version_major
-if test "x$ac_qt4" = "xyes"; then
-   if test $ac_qt_version_major -ne 4; then
-      AC_MSG_ERROR([qmake-qt4 $ac_errmsg (qt4-devel)])
-   fi
-else
-   if test $ac_qt_version_major -ne 5; then
-      AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)])
-   fi
+if test $ac_qt_version_major -ne 5; then
+	AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)
+	ac_qmake=$ac_cv_qmake
+fi
+
+if test "x$ac_qmake" = "xno"; then
+   AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)])
 fi
 
 # Check for proper Qt install path.
@@ -240,7 +222,7 @@
 fi
 
 # Check it again, now with updated PATH, just in case...
-AC_PATH_PROG(ac_cv_qmake, qmake, [no], $ac_path)
+AC_PATH_TOOL(ac_cv_qmake, qmake, [no], $ac_path)
 ac_qmake=$ac_cv_qmake
 if test "x$ac_qmake" = "xno"; then
    AC_MSG_ERROR([qmake $ac_errmsg])
@@ -267,56 +249,42 @@
    ac_libs="-L$ac_qt_install_libs $ac_libs"
 fi
 
-# Finally, check for proper Qt4/5 version.
-if test "x$ac_qt4" = "xyes"; then
-   AC_CACHE_CHECK([for Qt library version >= 4.4],
-      ac_cv_qtversion, [
-      AC_TRY_COMPILE([#include "QtCore/qglobal.h"], [
-         #if QT_VERSION < 0x040400 || QT_VERSION >= 0x050000
-         #error Qt library 4.4 or greater required.
-         #endif
-      ], ac_cv_qtversion="yes", [
-         echo "no; Qt 4.4 or greater is required"
-         exit 1
-      ])
+# Finally, check for proper Qt version.
+AC_CACHE_CHECK([for Qt library version >= 5.1],
+   ac_cv_qtversion, [
+   AC_TRY_COMPILE([#include "QtCore/qglobal.h"], [
+      #if QT_VERSION < 0x050100
+      #error Qt library 5.1 or greater required.
+      #endif
+   ], ac_cv_qtversion="yes", [
+      echo "no; Qt 5.1 or greater is required"
+      exit 1
    ])
-else
-   AC_CACHE_CHECK([for Qt library version >= 5.1],
-      ac_cv_qtversion, [
-      AC_TRY_COMPILE([#include "QtCore/qglobal.h"], [
-         #if QT_VERSION < 0x050100 || QT_VERSION >= 0x060000
-         #error Qt library 5.1 or greater required.
-         #endif
-      ], ac_cv_qtversion="yes", [
-         echo "no; Qt 5.1 or greater is required"
-         exit 1
-      ])
-   ])
-fi
+])
 
 # Check for Qt moc utility.
-AC_PATH_PROG(ac_moc, moc, [no], $ac_path)
+AC_PATH_TOOL(ac_moc, moc, [no], $ac_path)
 if test "x$ac_moc" = "xno"; then
    AC_MSG_ERROR([moc $ac_errmsg])
 fi
 AC_SUBST(ac_moc)
 
 # Check for Qt uic utility.
-AC_PATH_PROG(ac_uic, uic, [no], $ac_path)
+AC_PATH_TOOL(ac_uic, uic, [no], $ac_path)
 if test "x$ac_uic" = "xno"; then
    AC_MSG_ERROR([uic $ac_errmsg])
 fi
 AC_SUBST(ac_uic)
 
 # Check for Qt lupdate utility.
-AC_PATH_PROG(ac_lupdate, lupdate, [no], $ac_path)
+AC_PATH_TOOL(ac_lupdate, lupdate, [no], $ac_path)
 if test "x$ac_lupdate" = "xno"; then
    AC_MSG_ERROR([lupdate $ac_errmsg])
 fi
 AC_SUBST(ac_lupdate)
 
 # Check for Qt lrelease utility.
-AC_PATH_PROG(ac_lrelease, lrelease, [no], $ac_path)
+AC_PATH_TOOL(ac_lrelease, lrelease, [no], $ac_path)
 if test "x$ac_release" = "xno"; then
    AC_MSG_ERROR([lrelease $ac_errmsg])
 fi
@@ -503,21 +471,15 @@
    fi
 fi
 
-# Check for X11 unique/single instance.
-if test "x$ac_xunique" = "xyes" -a "x$ac_qt4" = "xno"; then
-   PKG_CHECK_MODULES([QT5X11EXTRAS], [Qt5X11Extras], [ac_xunique="yes"], [ac_xunique="no"])
-fi
+# Check for unique/single instance support.
 if test "x$ac_xunique" = "xyes"; then
-   AC_DEFINE(CONFIG_XUNIQUE, 1, [Define if X11 unique/single instance is enabled.])
-   if test "x$ac_qt4" = "xno"; then
-      ac_qx11extras="x11extras"
-   fi
-   # Some recent distros (eg. fedora, debian) require this.
-   if test "x$ac_cv_lib_X11_main" = "xyes"; then
-      ac_libs="$ac_libs -lX11"
+   PKG_CHECK_MODULES([QT5NETWORK], [Qt5Network], [ac_qt5network="yes"], [ac_qt5network="no"])
+   if test "x$ac_qt5network" = "xyes"; then
+      AC_DEFINE(CONFIG_XUNIQUE, 1, [Define if unique/single instance is enabled.])
+      ac_qnetwork="network"
    fi
 fi
-AC_SUBST(ac_qx11extras)
+AC_SUBST(ac_qnetwork)
 
 # Check for debugging stack-trace.
 if test "x$ac_stacktrace" = "xyes"; then
@@ -566,7 +528,7 @@
 echo "  LSCP device MIDI event support . . . . . . . . . .: $ac_device_midi_event"
 echo "  LSCP runtime max. voices / disk streams support  .: $ac_max_voices"
 echo
-echo "  X11 Unique/Single instance . . . . . . . . . . . .: $ac_xunique"
+echo "  Unique/Single instance support . . . . . . . . . .: $ac_xunique"
 echo "  Debugger stack-trace (gdb) . . . . . . . . . . . .: $ac_stacktrace"
 echo
 echo "  Install prefix . . . . . . . . . . . . . . . . . .: $ac_prefix"