--- gigedit/trunk/configure.ac 2013/01/13 09:14:29 2398 +++ gigedit/trunk/configure.ac 2017/01/15 19:18:39 3089 @@ -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.svn25) 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,23 @@ 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") + +# 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 +AC_PROG_OBJCXX PKG_PROG_PKG_CONFIG have_gtk3=no @@ -78,7 +90,7 @@ 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) @@ -88,7 +100,7 @@ AC_SUBST(SNDFILE_LIBS) # 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