--- qsampler/trunk/configure.ac	2013/12/31 11:21:47	2488
+++ qsampler/trunk/configure.ac	2015/03/03 17:41:04	2722
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(Qsampler, 0.2.3, rncbc@rncbc.org, qsampler)
+AC_INIT(Qsampler, 0.2.3.19, rncbc@rncbc.org, qsampler)
 
 AC_CONFIG_SRCDIR(src/qsampler.cpp)
 AC_CONFIG_HEADERS(src/config.h)
@@ -41,12 +41,7 @@
   [ac_qt5="$enableval"],
   [ac_qt5="no"])
 
-if test "x$ac_qt4" = "xno"; then
-   ac_qt5="yes"
-fi
-if test "x$ac_qt5" = "xyes"; then
-   ac_qt4="no"
-fi
+
 
 # Enable libgig availability.
 AC_ARG_ENABLE(libgig,
@@ -60,33 +55,38 @@
   [ac_stacktrace="$enableval"])
 
 
-if test "$cross_compiling" != yes; then
 # 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
 
-ac_qtdirs="qt"
+# 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"])
 
-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"
+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
 
-# Some a-la-debian alternatives...
-for X in /usr/lib /usr/lib64 /usr/share; do
-  for Y in $ac_qtdirs; do
-    if test -d $X/$Y/bin; then
-      ac_with_paths="$ac_with_paths $X/$Y"
-    fi
-  done
-done
+if test "x$ac_qt5_path" != "xno"; then
+   ac_with_paths="$ac_with_paths $ac_qt5_path"
+   ac_qt5="yes"
 fi
 
-# 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"])
+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,
@@ -98,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
@@ -109,6 +115,37 @@
 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
@@ -130,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
@@ -140,25 +177,34 @@
   fi
 done
 
-# Check for proper flags.
-ac_arch=`uname -m`
-if test "x$ac_arch" = "xx86_64"; then
-   CFLAGS="-fPIC $CFLAGS"
-   CPPFLAGS="-fPIC $CPPFLAGS"
+# 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
-
-# Check for proper Qt version.
-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
-    ])
-])
 
 # A common error message:
 ac_errmsg="not found in current PATH. Maybe QT development environment isn't available (qt-devel)."
@@ -337,29 +383,15 @@
 
 # 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_COMPILE([
-#include <stdlib.h>
-#include <gig.h>
-      ],[
-    gig::File file;
-    file.SetAutoLoad(false);
-      ],
-      have_libgig_setautoload="yes",
-      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
 
@@ -381,6 +413,8 @@
 
 AC_SUBST(ac_libs)
 AC_SUBST(ac_incpath)
+AC_SUBST(ac_cflags)
+AC_SUBST(ac_ldflags)
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -392,6 +426,13 @@
    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
 
@@ -421,7 +462,8 @@
 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_channel_midi_event"
 echo "  LSCP device MIDI event support . . . . . . . . . .: $ac_device_midi_event"