--- gigedit/trunk/configure.ac	2016/07/28 06:47:25	2976
+++ gigedit/trunk/configure.ac	2017/05/30 20:17:12	3258
@@ -5,7 +5,7 @@
 
 m4_define(gigedit_ver_major, 1)
 m4_define(gigedit_ver_minor, 0)
-m4_define(gigedit_ver_release, 0.svn21)
+m4_define(gigedit_ver_release, 0.svn52)
 
 AC_INIT([gigedit], [gigedit_ver_major.gigedit_ver_minor.gigedit_ver_release])
 AC_CONFIG_SRCDIR([configure.ac])
@@ -70,9 +70,18 @@
 AM_CONDITIONAL(WINDOWS, test "$windows" = "yes")
 AM_CONDITIONAL(MAC, test "$mac" = "yes")
 
-if test "$mac" = "yes"; then
-    AC_PROG_OBJC
-fi
+# 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_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
@@ -193,6 +202,7 @@
 	Makefile
 	src/Makefile
 	src/gigedit/Makefile
+    src/gigedit/gfx/Makefile
 	src/plugin/Makefile
 	gfx/Makefile
 	po/Makefile.in