--- gigedit/trunk/configure.ac	2012/09/08 17:21:48	2366
+++ gigedit/trunk/configure.ac	2020/08/14 12:18:26	3813
@@ -3,9 +3,9 @@
 #------------------------------------------------------------------------------------
 # The following is the current, official release version of gigedit:
 
-m4_define(gigedit_ver_major, 0)
-m4_define(gigedit_ver_minor, 2)
-m4_define(gigedit_ver_release, 0)
+m4_define(gigedit_ver_major, 1)
+m4_define(gigedit_ver_minor, 1)
+m4_define(gigedit_ver_release, 1.svn30)
 
 AC_INIT([gigedit], [gigedit_ver_major.gigedit_ver_minor.gigedit_ver_release])
 AC_CONFIG_SRCDIR([configure.ac])
@@ -28,7 +28,7 @@
 #  6. If any interfaces have been removed since the last public release, then set age
 #     to 0.
 
-LIBGIGEDIT_LT_CURRENT=2
+LIBGIGEDIT_LT_CURRENT=4
 LIBGIGEDIT_LT_REVISION=0
 LIBGIGEDIT_LT_AGE=0
 
@@ -61,11 +61,37 @@
 IT_PROG_INTLTOOL(0.35.0)
 AM_GLIB_GNU_GETTEXT
 
+windows=no
+mac=no
 case $host in
     *mingw*|*cygwin*) windows=yes ;;
-    *)                windows=no ;;
+    *-*-darwin*) mac=yes ;;
 esac
 AM_CONDITIONAL(WINDOWS, test "$windows" = "yes")
+AM_CONDITIONAL(MAC, test "$mac" = "yes")
+
+# make sure C++11 is supported by compiler
+# (add CXXFLAGS if required [e.g. -std=c++11])
+m4_ifdef([m4_include(m4/ax_cxx_compile_stdcxx.m4)],,
+             [sinclude([m4/ax_cxx_compile_stdcxx.m4])])
+AX_CXX_COMPILE_STDCXX(11, [], mandatory)
+
+# Note: even though Objective-C sources are just compiled for Mac, the
+# following AC macros though must not be embedded into a shell check
+# (if test "$mac" = "yes" ...), because those AC macros themselves are
+# expanded before any shell code is executed, the generated configure
+# code though would then not be executed and would lead to interesting
+# libtool errors on non-Mac systems due to this.
+AC_PROG_OBJC
+# The OBJCXX macro didn't exist before autoconf 2.65, so ifdef it to
+# avoid warnings on old systems.
+m4_ifdef([AC_PROG_OBJCXX], [AC_PROG_OBJCXX])
+
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+PKG_CHECK_EXISTS(gtk+-3.0 >= 2.99,
+        [PKG_CHECK_MODULES([GTK], [gtk+-3.0])],
+        [PKG_CHECK_MODULES([GTK], [gtk+-2.0])])
 
 PKG_PROG_PKG_CONFIG
 have_gtk3=no
@@ -74,31 +100,28 @@
         [PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.8 gthread-2.0 cairomm-1.0)])
 AM_CONDITIONAL(HAVE_GTK3, [test "$have_gtk3" = "yes"])
 
+# Check for cairommconfig.h, as it was moved in cairomm 1.8.4. We only
+# need it for newer versions.
+gigedit_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$GTKMM_CFLAGS $CPPFLAGS"
+AC_CHECK_HEADERS([cairommconfig.h])
+CPPFLAGS=$gigedit_save_CPPFLAGS
+
 PKG_CHECK_MODULES(SIGC, sigc++-2.0)
 AC_SUBST(SIGC_CFLAGS)
 AC_SUBST(SIGC_LIBS)
 
-PKG_CHECK_MODULES(GIG, gig >= 3.3.0)
+PKG_CHECK_MODULES(GIG, gig >= 4.2.0)
 AC_SUBST(GIG_CFLAGS)
 AC_SUBST(GIG_LIBS)
 
 # check for presence of libsndfile
-PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0.2)
+PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0.11)
 AC_SUBST(SNDFILE_CFLAGS)
 AC_SUBST(SNDFILE_LIBS)
 
-# check for loop functionality in libsndfile
-gigedit_save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="$SNDFILE_CFLAGS $CXXFLAGS"
-AC_CHECK_MEMBERS([SF_INSTRUMENT.loops],,
-		 [AC_MSG_WARN([Your version of libsndfile does not support
-    reading of loop information. Gigedit will not be able to
-    extract loop information from sample files.])],
-		 [#include <sndfile.h>])
-CXXFLAGS=$gigedit_save_CXXFLAGS
-
 # check for (optional) presence of liblinuxsampler
-liblinuxsampler_version="0.5.0"
+liblinuxsampler_version="2.1.1"
 PKG_CHECK_MODULES(
     LINUXSAMPLER, linuxsampler >= $liblinuxsampler_version,
     have_linuxsampler=1, have_linuxsampler=0
@@ -196,6 +219,7 @@
 	Makefile
 	src/Makefile
 	src/gigedit/Makefile
+    src/gigedit/gfx/Makefile
 	src/plugin/Makefile
 	gfx/Makefile
 	po/Makefile.in