--- gigedit/trunk/configure.ac	2008/11/16 19:23:57	1793
+++ gigedit/trunk/configure.ac	2012/08/05 13:21:12	2359
@@ -6,8 +6,8 @@
 # The following is the current, official release version of gigedit:
 
 GIGEDIT_VER_MAJOR=0
-GIGEDIT_VER_MINOR=1
-GIGEDIT_VER_RELEASE=1
+GIGEDIT_VER_MINOR=2
+GIGEDIT_VER_RELEASE=0
 
 #------------------------------------------------------------------------------------
 # The following is the libtool / shared library version. This doesn't have to
@@ -26,13 +26,14 @@
 #  6. If any interfaces have been removed since the last public release, then set age
 #     to 0.
 
-LIBGIGEDIT_LT_CURRENT=1
+LIBGIGEDIT_LT_CURRENT=2
 LIBGIGEDIT_LT_REVISION=0
 LIBGIGEDIT_LT_AGE=0
 
 SHARED_VERSION_INFO="$LIBGIGEDIT_LT_CURRENT:$LIBGIGEDIT_LT_REVISION:$LIBGIGEDIT_LT_AGE"
 AC_LANG_CPLUSPLUS
 AC_PROG_CXX
+AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 AC_SUBST(SHLIB_VERSION_ARG)
 AC_SUBST(SHARED_VERSION_INFO)
@@ -58,8 +59,26 @@
 IT_PROG_INTLTOOL(0.35.0)
 AM_GLIB_GNU_GETTEXT
 
-PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4.10 gthread-2.0)
-PKG_CHECK_MODULES(GIG, gig >= 3.2.0)
+case $host in
+    *mingw*|*cygwin*) windows=yes ;;
+    *)                windows=no ;;
+esac
+AM_CONDITIONAL(WINDOWS, test "$windows" = "yes")
+
+PKG_PROG_PKG_CONFIG
+have_gtk3=no
+PKG_CHECK_EXISTS(gtkmm-3.0 >= 2.99,
+        [PKG_CHECK_MODULES(GTKMM, gtkmm-3.0, have_gtk3=yes)],
+        [PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.8 gthread-2.0 cairomm-1.0)])
+AM_CONDITIONAL(HAVE_GTK3, [test "$have_gtk3" = "yes"])
+
+PKG_CHECK_MODULES(SIGC, sigc++-2.0)
+AC_SUBST(SIGC_CFLAGS)
+AC_SUBST(SIGC_LIBS)
+
+PKG_CHECK_MODULES(GIG, gig >= 3.3.0)
+AC_SUBST(GIG_CFLAGS)
+AC_SUBST(GIG_LIBS)
 
 # check for presence of libsndfile
 PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0.2)
@@ -91,7 +110,7 @@
 else
     echo "Found linuxsampler $liblinuxsampler_version"
     echo -n "Retrieving LinuxSampler's plugin dir... "
-    LINUXSAMPLER_PLUGIN_DIR=`pkg-config --variable plugindir linuxsampler`
+    LINUXSAMPLER_PLUGIN_DIR=`$PKG_CONFIG --variable plugindir linuxsampler`
     if test "$LINUXSAMPLER_PLUGIN_DIR" = ""; then
         have_linuxsampler=0
         echo "Error"
@@ -187,5 +206,6 @@
 	win32/gigedit.dev
 	win32/gigedit.nsi
 	win32/Makefile
+	gigedit.spec
 ])
 AC_OUTPUT