* autofoo: detect the toolkit used to build wxWidgets and use either gtk2 or gtk3 to avoid crashes because of mixing gtk2 and gtk3 libs.

Author: jenslody

configure.ac

@@ -145,8 +145,8 @@ AC_SUBST(CXXFLAGS)
 AC_SUBST(CFLAGS)
 AC_SUBST(LIBS)
 
-WX_GTK2_CFLAGS=
-WX_GTK2_LIBS=
+WX_GTK_CFLAGS=
+WX_GTK_LIBS=
 WX_X11_CFLAGS=
 WX_X11_LIBS=
 
@@ -188,7 +188,16 @@ case $WX_BASENAME in
 			if test "x$BUILD_MOUSESAP_TRUE" = "x"  -o \
 					"x$GTK_NOTEBOOK_TRUE" = "x" ; then
 				if test "x$HAVE_PKG_CONFIG" = "xyes"; then
-					PKG_CHECK_MODULES([GTK2], [gtk+-2.0 >= 2.0.0])
+					case $WX_BASENAME in
+						*wx_gtk3*)
+							AC_MSG_NOTICE([gtk3 used])
+							PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.0.0])
+						;;
+						*wx_gtk2*)
+							AC_MSG_NOTICE([gtk2 used])
+							PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.0.0])
+						;;
+					esac
 				fi
 			fi
 
@@ -226,8 +235,8 @@ case $WX_BASENAME in
 		CB_HUNSPELL_LIBS="$HUNSPELL_LIBS"
 		CB_FONTCONFIG_CFLAGS="$FONTCONFIG_CFLAGS"
 		CB_FONTCONFIG_LIBS="$FONTCONFIG_LIBS"
-		WX_GTK2_CFLAGS="$GTK2_CFLAGS"
-		WX_GTK2_LIBS="$GTK2_LIBS"
+		WX_GTK_CFLAGS="$GTK_CFLAGS"
+		WX_GTK_LIBS="$GTK_LIBS"
 		AC_PATH_XTRA
 		WX_X11_CFLAGS="`echo $X_CFLAGS | sed 's/ -INONE//'`"
 		WX_X11_LIBS="`echo $X_LIBS | sed 's/ -LNONE//' | sed 's/ -RNONE//'`"
@@ -318,8 +327,8 @@ AC_SUBST(CB_SQUIRREL_CFLAGS)
 AC_SUBST(CB_SQUIRREL_LIBS)
 AC_SUBST(CB_TINYXML_CFLAGS)
 AC_SUBST(CB_TINYXML_LIBS)
-AC_SUBST(WX_GTK2_CFLAGS)
-AC_SUBST(WX_GTK2_LIBS)
+AC_SUBST(WX_GTK_CFLAGS)
+AC_SUBST(WX_GTK_LIBS)
 AC_SUBST(CB_GLIB2_CFLAGS)
 AC_SUBST(CB_GLIB2_LIBS)
 AC_SUBST(CB_GAMIN_CFLAGS)

src/plugins/contrib/MouseSap/Makefile.am

@@ -1,5 +1,5 @@
 AM_CPPFLAGS = $(WX_CXXFLAGS) \
-		$(WX_GTK2_CFLAGS) \
+		$(WX_GTK_CFLAGS) \
 		-I$(top_srcdir)/src/include \
 		-I$(top_srcdir)/src/sdk/wxscintilla/include
 
@@ -9,7 +9,7 @@ pluginlib_LTLIBRARIES = libMouseSap.la
 
 libMouseSap_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
 
-libMouseSap_la_LIBADD = ../../../sdk/libcodeblocks.la $(WX_LIBS) $(WX_GTK2_LIBS)
+libMouseSap_la_LIBADD = ../../../sdk/libcodeblocks.la $(WX_LIBS) $(WX_GTK_LIBS)
 
 libMouseSap_la_SOURCES = MouseSap.cpp
 

src/plugins/contrib/codesnippets/Makefile.am

@@ -1,7 +1,7 @@
 SUBDIRS = resources
 
 AM_CPPFLAGS = $(WX_CXXFLAGS) \
-		$(WX_GTK2_CFLAGS) \
+		$(WX_GTK_CFLAGS) \
 		$(WX_X11_CFLAGS) \
 		-I$(top_srcdir)/src/include \
 		-I$(top_srcdir)/src/sdk/wxscintilla/include \
@@ -19,7 +19,7 @@ pluginlib_LTLIBRARIES = libcodesnippets.la
 
 libcodesnippets_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
 
-libcodesnippets_la_LIBADD = ../../../sdk/libcodeblocks.la $(WX_LIBS) $(WX_GTK2_LIBS) $(WX_X11_LIBS)
+libcodesnippets_la_LIBADD = ../../../sdk/libcodeblocks.la $(WX_LIBS) $(WX_GTK_LIBS) $(WX_X11_LIBS)
 
 libcodesnippets_la_SOURCES = codesnippets.cpp \
 		codesnippetstreectrl.cpp \

src/plugins/contrib/codesnippets/resources/Makefile.am

@@ -1,5 +1,5 @@
 AM_CPPFLAGS = $(WX_CXXFLAGS) \
-		$(WX_GTK2_CFLAGS) \
+		$(WX_GTK_CFLAGS) \
 		$(WX_X11_CFLAGS)
 
 pluginlibdir = $(pkglibdir)/plugins
@@ -11,7 +11,7 @@ pluginlibdir = $(pkglibdir)/plugins
 ##codesnippets_LDADD = $(WX_LIBS) ../../../../sdk/libcodeblocks.la
 ##codesnippets_LDADD =  -L../../../../sdk ../../../../sdk/libcodeblocks.la \
 ##            ../../../../base/tinyxml/libtinyxml.la \
-##			$(WX_LIBS) $(WX_GTK2_LIBS) $(WX_X11_LIBS)
+##			$(WX_LIBS) $(WX_GTK_LIBS) $(WX_X11_LIBS)
 
 pkgdata_DATA = codesnippets.zip
 CLEANFILES = $(pkgdata_DATA)

src/plugins/debuggergdb/Makefile.am

@@ -12,7 +12,7 @@ pluginlib_LTLIBRARIES = libdebugger.la
 
 libdebugger_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
 
-libdebugger_la_LIBADD = ../../sdk/libcodeblocks.la $(WX_LIBS) $(WX_GTK2_LIBS)
+libdebugger_la_LIBADD = ../../sdk/libcodeblocks.la $(WX_LIBS) $(WX_GTK_LIBS)
 
 libdebugger_la_SOURCES = cdb_driver.cpp \
 			databreakpointdlg.cpp \

src/src/Makefile.am

@@ -18,7 +18,7 @@ GTK_NOTEBOOK_FLAGS = -DUSE_GTK_NOTEBOOK
 endif
 
 if CODEBLOCKS_LINUX
-AM_CPPFLAGS += -DENABLE_BINRELOC -DAPP_PREFIX="\"@prefix@\"" $(WX_GTK2_CFLAGS) $(GTK_NOTEBOOK_FLAGS)
+AM_CPPFLAGS += -DENABLE_BINRELOC -DAPP_PREFIX="\"@prefix@\"" $(WX_GTK_CFLAGS) $(GTK_NOTEBOOK_FLAGS)
 endif
 
 bin_PROGRAMS = codeblocks
@@ -30,11 +30,11 @@ install-exec-hook:
 	$(MACSETFILE) -a C $(DESTDIR)$(bindir)/codeblocks$(EXEEXT)
 
 # wxAUI uses GTK+ libraries on wxGTK
-# codeblocks_LDFLAGS = $(WX_GTK2_LIBS)
+# codeblocks_LDFLAGS = $(WX_GTK_LIBS)
 
 codeblocks_LDADD =  ../sdk/libcodeblocks.la \
 			$(WX_LIBS) \
-			$(WX_GTK2_LIBS)
+			$(WX_GTK_LIBS)
 
 codeblocks_SOURCES = app.cpp \
 			appglobals.cpp \