--- qsampler/trunk/configure.ac	2008/03/11 16:01:44	1716
+++ qsampler/trunk/configure.ac	2015/01/22 19:01:32	2718
@@ -1,9 +1,9 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(Qsampler, 0.2.1.14, rncbc@rncbc.org, qsampler)
+AC_INIT(Qsampler, 0.2.3.18, rncbc@rncbc.org, qsampler)
 
-AC_CONFIG_SRCDIR(src/qsamplerMainForm.ui)
-AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_FILES(Makefile qsampler.pro qsampler.spec qsampler.desktop)
+AC_CONFIG_SRCDIR(src/qsampler.cpp)
+AC_CONFIG_HEADERS(src/config.h)
+AC_CONFIG_FILES(Makefile qsampler.spec src/src.pri src/qsampler.desktop)
 
 # Set default installation prefix.
 AC_PREFIX_DEFAULT(/usr/local)
@@ -21,34 +21,72 @@
 
 if test "x$ac_debug" = "xyes"; then
    AC_DEFINE(CONFIG_DEBUG, 1, [Define if debugging is enabled.])
+   ac_stacktrace="yes"
    ac_debug="debug"
 else
+   ac_stacktrace="no"
    ac_debug="release"
 fi
 AC_SUBST(ac_debug)
 
+
+# Enable Qt4/5 availability.
+AC_ARG_ENABLE(qt4,
+  AC_HELP_STRING([--enable-qt4], [enable Qt4 build (default=yes)]),
+  [ac_qt4="$enableval"],
+  [ac_qt4="yes"])
+
+AC_ARG_ENABLE(qt5,
+  AC_HELP_STRING([--enable-qt5], [enable Qt5 build (default=no)]),
+  [ac_qt5="$enableval"],
+  [ac_qt5="no"])
+
+
+
 # Enable libgig availability.
 AC_ARG_ENABLE(libgig,
   AC_HELP_STRING([--enable-libgig], [enable libgig interface (default=yes)]),
   [ac_libgig="$enableval"],
   [ac_libgig="yes"])
 
+# Enable debugger stack-trace option (assumes --enable-debug).
+AC_ARG_ENABLE(stacktrace,
+  AC_HELP_STRING([--enable-stacktrace], [enable debugger stack-trace (default=no)]),
+  [ac_stacktrace="$enableval"])
+
+
 # Standard installation base dirs.
-ac_with_paths="/usr /usr/local"
+if test "$cross_compiling" = yes; then
+  ac_with_paths=""
+else
+  ac_with_paths="/usr /usr/local"
+fi
 
-# Some a-la-debian alternatives...
-for X in /usr/lib /usr/share; do
-  for Y in qt qt4; do
-    if test -d $X/$Y/bin; then
-      ac_with_paths="$ac_with_paths $X/$Y"
-    fi
-  done
-done
+# 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"])
 
-# Set for alternate Qt installation dir.
-AC_ARG_WITH(qt,
-  AC_HELP_STRING([--with-qt=PATH], [use alternate Qt install path]),
-  [ac_with_paths="$ac_with_paths $withval"])
+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_qt5="yes"
+fi
+
+if test "x$ac_qt4" = "xno"; then
+   ac_qt5="yes"
+fi
+if test "x$ac_qt5" = "xyes"; then
+   ac_qt4="no"
+fi
 
 # Set for alternate liblscp installation dir.
 AC_ARG_WITH(liblscp,
@@ -60,6 +98,12 @@
   AC_HELP_STRING([--with-libgig=PATH], [use alternate libgig install path]),
   [ac_with_paths="$ac_with_paths $withval"])
 
+
+# Honor user specified flags.
+ac_cflags=$CFLAGS
+ac_ldflags=$LDFLAGS
+
+
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP
@@ -71,17 +115,48 @@
 AC_LANG_C
 AC_LANG_CPLUSPLUS
 
+PKG_PROG_PKG_CONFIG
+
+# Check for proper flags.
+ac_arch=`uname -m`
+
+# Check for some a-la-debian alternatives...
+ac_qtdirs="qt"
+
+if test "x$ac_qt4" = "xyes"; then
+   ac_qtdirs="qt4 $ac_qtdirs"
+fi
+if test "x$ac_qt5" = "xyes"; then
+   ac_qtdirs="qt5 $ac_qtdirs"
+fi
+
+ac_topdirs="/usr/share /usr/lib"
+
+if test "x$ac_arch" = "xx86_64"; then
+   CFLAGS="-fPIC $CFLAGS"
+   CPPFLAGS="-fPIC $CPPFLAGS"
+   ac_topdirs="$ac_topdirs /usr/lib64"
+fi
+
+for X in $ac_topdirs; do
+  for Y in $ac_qtdirs; do
+    if test -d $X/$Y/bin; then
+      ac_with_paths="$X/$Y $ac_with_paths"
+    fi
+  done
+done
+
 # 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"
   fi
-  if test -x $X/qmake; then
-    ac_path="$X:$ac_path"
-  fi
+# if test -x $X/qmake; then
+#   ac_path="$X:$ac_path"
+# fi
   if test -d $X/include; then
-    for Y in qt qt4; do
+    for Y in $ac_qtdirs; do
       if test -d $X/include/$Y; then
         CFLAGS="-I$X/include/$Y $CFLAGS"
         CPPFLAGS="-I$X/include/$Y $CPPFLAGS"
@@ -92,7 +167,7 @@
     CPPFLAGS="-I$X/include $CPPFLAGS"
     ac_incpath="$X/include $ac_incpath"
   fi
-  if test -d $X/lib64; then
+  if test "x$ac_arch" = "xx86_64" -a -d $X/lib64; then
     LIBS="-L$X/lib64 $LIBS"
     ac_libs="-L$X/lib64 $ac_libs"
   fi
@@ -102,19 +177,34 @@
   fi
 done
 
-# Check for proper Qt version.
-AC_CACHE_CHECK([for Qt library version >= 4.1],
-  ac_qtlib_version, [
-  AC_TRY_LINK([#include "Qt/qglobal.h"], [
-#if QT_VERSION < 0x040100
-#error Qt library 4.1 or greater required.
-#endif
-    ],
-    ac_qtlib_version="yes", [
-      echo "no; Qt 4.1 or greater is required"
-      exit
-    ])
-])
+# 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_LINK([#include "QtCore/qglobal.h"], [
+         #if QT_VERSION < 0x040400
+         #error Qt library 4.4 or greater required.
+         #endif
+      ], ac_cv_qtversion="yes", [
+         echo "no; Qt 4.4 or greater is required"
+         exit 1
+      ])
+   ])
+fi
+ 
+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"], [
+         #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
+      ])
+   ])
+fi
 
 # A common error message:
 ac_errmsg="not found in current PATH. Maybe QT development environment isn't available (qt-devel)."
@@ -140,6 +230,20 @@
 fi
 AC_SUBST(ac_uic)
 
+# Check for Qt lupdate utility.
+AC_PATH_PROG(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)
+if test "x$ac_release" = "xno"; then
+   AC_MSG_ERROR([lrelease $ac_errmsg])
+fi
+AC_SUBST(ac_lrelease)
+
 # Checks for libraries.
 AC_CHECK_LIB(m, main)
 AC_CHECK_LIB(X11, main)
@@ -157,26 +261,34 @@
    AC_MSG_ERROR([LSCP library not found.])
 fi
 ac_libs="$ac_libs -llscp"
+case "{$host}" in
+     *mingw*)
+     ac_libs="$ac_libs -lws2_32"
+     LIBS="$LIBS -lws2_32"
+     ;;
+esac
 
 AC_CACHE_CHECK([for instrument_name in lscp_channel_info_t],
-  ac_instrument_name, [
+  ac_cv_instrument_name, [
   AC_TRY_COMPILE([#include "lscp/client.h"], [
 	lscp_channel_info_t info;
 	info.instrument_name = 0;
-    ], ac_instrument_name="yes", ac_instrument_name="no")
+    ], ac_cv_instrument_name="yes", ac_cv_instrument_name="no")
 ])
+ac_instrument_name=$ac_cv_instrument_name
 if test "x$ac_instrument_name" = "xyes"; then
    AC_DEFINE(CONFIG_INSTRUMENT_NAME, 1, [Define if instrument_name is available.])
 fi
 
 AC_CACHE_CHECK([for mute/solo in lscp_channel_info_t],
-  ac_mute_solo, [
+  ac_cv_mute_solo, [
   AC_TRY_COMPILE([#include "lscp/client.h"], [
 	lscp_channel_info_t info;
 	info.mute = 0;
 	info.solo = 0;
-    ], ac_mute_solo="yes", ac_mute_solo="no")
+    ], ac_cv_mute_solo="yes", ac_cv_mute_solo="no")
 ])
+ac_mute_solo=$ac_cv_mute_solo
 if test "x$ac_mute_solo" = "xyes"; then
    AC_CHECK_LIB(lscp, lscp_set_channel_mute, [ac_mute_solo="yes"], [ac_mute_solo="no"])
 fi
@@ -196,12 +308,13 @@
 if test "x$ac_fxsend" = "xyes"; then
   AC_DEFINE(CONFIG_FXSEND, 1, [Define if FX sends is available.])
   AC_CACHE_CHECK([for FX send level in lscp_fxsend_info_t],
-    ac_fxsend_level, [
+    ac_cv_fxsend_level, [
     AC_TRY_COMPILE([#include "lscp/client.h"], [
 	  lscp_fxsend_info_t info;
 	  info.level = 0.0f;
-      ], ac_fxsend_level="yes", ac_fxsend_level="no")
+      ], ac_cv_fxsend_level="yes", ac_cv_fxsend_level="no")
   ])
+  ac_fxsend_level=$ac_cv_fxsend_level
   if test "x$ac_fxsend_level" = "xyes"; then
 	  AC_DEFINE(CONFIG_FXSEND_LEVEL, 1, [Define if FX send level is available.])
   fi
@@ -212,12 +325,13 @@
 fi
 
 AC_CACHE_CHECK([for audio_routing array type],
-  ac_audio_routing, [
+  ac_cv_audio_routing, [
   AC_TRY_COMPILE([#include "lscp/client.h"], [
     lscp_channel_info_t info;
     char ch = info.audio_routing[0][0];
-    ], ac_audio_routing="no", ac_audio_routing="yes")
+    ], ac_cv_audio_routing="no", ac_cv_audio_routing="yes")
 ])
+ac_audio_routing=$ac_cv_audio_routing
 if test "x$ac_audio_routing" = "xyes"; then
    AC_DEFINE(CONFIG_AUDIO_ROUTING, 1, [Define if audio_routing is an integer array.])
 fi
@@ -233,61 +347,51 @@
 fi
 
 AC_CACHE_CHECK([for CHANNEL_MIDI LSCP event support in liblscp],
-  ac_lscp_channel_midi_event, [
+  ac_cv_channel_midi_event, [
   AC_TRY_COMPILE([
 	#include "lscp/client.h"
 	#include "lscp/event.h"
 	], [
 	lscp_event_t ev;
 	ev = LSCP_EVENT_CHANNEL_MIDI;
-    ], ac_lscp_channel_midi_event="yes", ac_lscp_channel_midi_event="no")
+    ], ac_cv_channel_midi_event="yes", ac_cv_channel_midi_event="no")
 ])
-if test "x$ac_lscp_channel_midi_event" = "xyes"; then
+ac_channel_midi_event=$ac_cv_channel_midi_event
+if test "x$ac_channel_midi_event" = "xyes"; then
    AC_DEFINE(CONFIG_EVENT_CHANNEL_MIDI, 1, [Define if LSCP CHANNEL_MIDI event support is available.])
 fi
 
 AC_CACHE_CHECK([for DEVICE_MIDI LSCP event support in liblscp],
-  ac_lscp_device_midi_event, [
+  ac_cv_device_midi_event, [
   AC_TRY_COMPILE([
 	#include "lscp/client.h"
 	#include "lscp/event.h"
 	], [
 	lscp_event_t ev;
 	ev = LSCP_EVENT_DEVICE_MIDI;
-    ], ac_lscp_device_midi_event="yes", ac_lscp_device_midi_event="no")
+    ], ac_cv_device_midi_event="yes", ac_cv_device_midi_event="no")
 ])
-if test "x$ac_lscp_device_midi_event" = "xyes"; then
+ac_device_midi_event=$ac_cv_device_midi_event
+if test "x$ac_device_midi_event" = "xyes"; then
    AC_DEFINE(CONFIG_EVENT_DEVICE_MIDI, 1, [Define if LSCP DEVICE_MIDI event support is available.])
 fi
 
+AC_CHECK_LIB(lscp, lscp_get_voices, [ac_max_voices="yes"], [ac_max_voices="no"])
+if test "x$ac_max_voices" = "xyes"; then
+  AC_DEFINE(CONFIG_MAX_VOICES, 1, [Define if max. voices / streams is available.])
+fi
+
 # Check for optional libraries.
 if test "x$ac_libgig" = "xyes"; then
-   AC_CHECK_LIB(gig, main, [ac_libgig="yes"], [ac_libgig="no"])
+   PKG_CHECK_MODULES(LIBGIG, gig >= 3.3.0, [ac_libgig="yes"], [ac_libgig="no"])
    if test "x$ac_libgig" = "xyes"; then
       AC_DEFINE(CONFIG_LIBGIG, 1, [Define if libgig is available.])
-      ac_libs="$ac_libs -lgig"
-      AC_MSG_CHECKING([for gig::File::SetAutoLoad() method in libgig])
-      AC_LANG_SAVE
-      AC_LANG_CPLUSPLUS
-      CXXFLAGS="$ac_libs"
-      AC_TRY_RUN([
-#include <stdlib.h>
-#include <gig.h>
-int main() {
-    gig::File file;
-    file.SetAutoLoad(false);
-    exit(0);
-}
-      ],
-      have_libgig_setautoload="yes",
-      have_libgig_setautoload="no",
-      have_libgig_setautoload="no"
-      )
-      AC_LANG_RESTORE
-      AC_MSG_RESULT([$have_libgig_setautoload])
-      if test "x$have_libgig_setautoload" = "xyes"; then
-          AC_DEFINE(HAVE_LIBGIG_SETAUTOLOAD, 1, [Define if libgig provides gig::File::SetAutoLoad() method.])
-      fi
+      AC_SUBST(LIBGIG_CFLAGS)
+      AC_SUBST(LIBGIG_LIBS)
+      ac_cflags="$ac_cflags $LIBGIG_CFLAGS"
+      ac_libs="$ac_libs $LIBGIG_LIBS"
+      AC_DEFINE(CONFIG_LIBGIG_SETAUTOLOAD, 1, [Define if libgig provides gig::File::SetAutoLoad() method.])
+      ac_libgig_setautoload="yes"
    fi
 fi
 
@@ -297,19 +401,38 @@
    AC_DEFINE(CONFIG_ROUND, 1, [Define if round is available.])
 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.])
+fi
+
+# Some recent distros (eg. fedora, debian) require this.
+if test "x$ac_cv_lib_X11_main" = "xyes"; then
+   ac_libs="$ac_libs -lX11"
+fi
+
 AC_SUBST(ac_libs)
 AC_SUBST(ac_incpath)
+AC_SUBST(ac_cflags)
+AC_SUBST(ac_ldflags)
 
 # Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h sys/ioctl.h unistd.h signal.h)
+AC_CHECK_HEADERS(fcntl.h sys/ioctl.h unistd.h signal.h sys/socket.h)
 
 AC_CHECK_HEADER(lscp/client.h, [ac_lscp_h="yes"], [ac_lscp_h="no"])
 if test "x$ac_lscp_h" = "xno"; then
    AC_MSG_ERROR([LSCP headers not found.])
 fi
 
+if test "x$ac_libgig" = "xyes"; then
+   AC_CHECK_HEADER(libgig/SF.h, [ac_libgig_sf2="yes"], [ac_libgig_sf2="no"])
+   if test "x$ac_libgig_sf2" = "xyes"; then
+      AC_DEFINE(CONFIG_LIBGIG_SF2, 1, [Define if libgig/SF.h is available.])
+   fi
+fi
+
 # Checks for typedefs, structures, and compiler characteristics.
 # AC_C_CONST
 
@@ -339,10 +462,14 @@
 echo "  LSCP edit instrument support . . . . . . . . . . .: $ac_edit_instrument"
 echo "  GigaSampler instrument file support (libgig) . . .: $ac_libgig"
 if test "x$ac_libgig" = "xyes"; then
-echo "  libgig supports fast information retrieval . . . .: $have_libgig_setautoload"
+echo "  libgig supports fast information retrieval . . . .: $ac_libgig_setautoload"
+echo "  libgig supports SoundFont2 instruments files . . .: $ac_libgig_sf2"
 fi
-echo "  LSCP channel MIDI event support  . . . . . . . . .: $ac_lscp_channel_midi_event"
-echo "  LSCP device MIDI event support . . . . . . . . . .: $ac_lscp_device_midi_event"
+echo "  LSCP channel MIDI event support  . . . . . . . . .: $ac_channel_midi_event"
+echo "  LSCP device MIDI event support . . . . . . . . . .: $ac_device_midi_event"
+echo "  LSCP runtime max. voices / disk streams support  .: $ac_max_voices"
+echo
+echo "  Debugger stack-trace (gdb) . . . . . . . . . . . .: $ac_stacktrace"
 echo
 echo "  Install prefix . . . . . . . . . . . . . . . . . .: $ac_prefix"
 echo