--- qsampler/trunk/configure.ac 2015/08/14 23:40:53 2835 +++ qsampler/trunk/configure.ac 2016/02/24 16:30:27 2861 @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(Qsampler, 0.3.1.3, rncbc@rncbc.org, qsampler) +AC_INIT(Qsampler, 0.3.1.14, rncbc@rncbc.org, qsampler) AC_CONFIG_SRCDIR(src/qsampler.cpp) AC_CONFIG_HEADERS(src/config.h) @@ -9,7 +9,7 @@ AC_PREFIX_DEFAULT(/usr/local) ac_prefix=$prefix if test "x$ac_prefix" = "xNONE"; then - ac_prefix=$ac_default_prefix + ac_prefix=$ac_default_prefix fi AC_SUBST(ac_prefix) AC_DEFINE_UNQUOTED(CONFIG_PREFIX, ["$ac_prefix"], [Default installation prefix.]) @@ -49,6 +49,12 @@ [ac_libgig="$enableval"], [ac_libgig="yes"]) +# Enable X11 unique/single instance. +AC_ARG_ENABLE(xunique, + AC_HELP_STRING([--enable-xunique], [enable X11 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)]), @@ -207,7 +213,7 @@ if test "x$ac_qt4" = "xyes"; then AC_CACHE_CHECK([for Qt library version >= 4.4], ac_cv_qtversion, [ - AC_TRY_LINK([#include "QtCore/qglobal.h"], [ + AC_TRY_COMPILE([#include "QtCore/qglobal.h"], [ #if QT_VERSION < 0x040400 || QT_VERSION >= 0x050000 #error Qt library 4.4 or greater required. #endif @@ -221,7 +227,7 @@ if test "x$ac_qt5" = "xyes"; then AC_CACHE_CHECK([for Qt library version >= 5.1], ac_cv_qtversion, [ - AC_TRY_LINK([#include "QtCore/qglobal.h"], [ + AC_TRY_COMPILE([#include "QtCore/qglobal.h"], [ #if QT_VERSION < 0x050100 || QT_VERSION >= 0x060000 #error Qt library 5.1 or greater required. #endif @@ -418,6 +424,11 @@ AC_DEFINE(CONFIG_ROUND, 1, [Define if round is available.]) fi +# Check for X11 unique/single instance. +if test "x$ac_xunique" = "xyes"; then + AC_DEFINE(CONFIG_XUNIQUE, 1, [Define if X11 unique/single instance is enabled.]) +fi + # Check for debugging stack-trace. if test "x$ac_stacktrace" = "xyes"; then AC_DEFINE(CONFIG_STACKTRACE, 1, [Define if debugger stack-trace is enabled.]) @@ -486,6 +497,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 " Debugger stack-trace (gdb) . . . . . . . . . . . .: $ac_stacktrace" echo echo " Install prefix . . . . . . . . . . . . . . . . . .: $ac_prefix"