--- gigedit/trunk/configure.ac 2012/09/08 17:21:48 2366 +++ gigedit/trunk/configure.ac 2016/04/22 17:10:51 2887 @@ -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, 0) +m4_define(gigedit_ver_release, 0.svn3) 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=3 LIBGIGEDIT_LT_REVISION=0 LIBGIGEDIT_LT_AGE=0 @@ -61,11 +61,18 @@ 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") + +if test "$mac" = "yes"; then + AC_PROG_OBJC +fi PKG_PROG_PKG_CONFIG have_gtk3=no @@ -78,27 +85,17 @@ AC_SUBST(SIGC_CFLAGS) AC_SUBST(SIGC_LIBS) -PKG_CHECK_MODULES(GIG, gig >= 3.3.0) +PKG_CHECK_MODULES(GIG, gig >= 4.0.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 ]) -CXXFLAGS=$gigedit_save_CXXFLAGS - # check for (optional) presence of liblinuxsampler -liblinuxsampler_version="0.5.0" +liblinuxsampler_version="2.0.0" PKG_CHECK_MODULES( LINUXSAMPLER, linuxsampler >= $liblinuxsampler_version, have_linuxsampler=1, have_linuxsampler=0