move from Gtk-- 1.x to gtk+-2.0

dtool/Config.pp

@@ -622,10 +622,10 @@
 #define CHROMIUM_LIBS spuload
 #defer HAVE_CHROMIUM $[libtest $[CHROMIUM_LPATH],$[CHROMIUM_LIBS]]
 
-// Is Gtk-- installed?  How should we run the gtkmm-config program?
-// This matters only to programs in PANDATOOL.
-#define GTKMM_CONFIG gtkmm-config
-#defer HAVE_GTKMM $[bintest $[GTKMM_CONFIG]]
+// Is gtk+-2 installed?  This is only needed to build the pstats
+// program on Unix (or non-Windows) platforms.
+#define PKG_CONFIG pkg-config
+#define HAVE_GTK
 
 // Do we have Freetype 2.0 (or better)?  If available, this package is
 // used to generate dynamic in-the-world text from font files.

dtool/Package.pp

@@ -236,8 +236,8 @@
 #set CHROMIUM_LIBS $[CHROMIUM_LIBS]
 #set HAVE_CHROMIUM $[HAVE_CHROMIUM]
 
-#set GTKMM_CONFIG $[GTKMM_CONFIG]
-#set HAVE_GTKMM $[HAVE_GTKMM]
+#set PKG_CONFIG $[PKG_CONFIG]
+#set HAVE_GTK $[HAVE_GTK]
 
 #set FREETYPE_CONFIG $[FREETYPE_CONFIG]
 #set HAVE_FREETYPE $[HAVE_FREETYPE]
@@ -255,14 +255,14 @@
 
 
 // Now infer a few more variables based on what was defined.
-#if $[and $[HAVE_GTKMM],$[GTKMM_CONFIG]]
-  #define cflags $[shell $[GTKMM_CONFIG] --cflags]
-  #define libs $[shell $[GTKMM_CONFIG] --libs]
-
-  #define GTKMM_CFLAGS $[filter-out -I%,$[cflags]]
-  #define GTKMM_IPATH $[unique $[patsubst -I%,%,$[filter -I%,$[cflags]]]]
-  #define GTKMM_LPATH $[unique $[patsubst -L%,%,$[filter -L%,$[libs]]]]
-  #define GTKMM_LIBS $[patsubst -l%,%,$[filter -l%,$[libs]]]
+#if $[and $[HAVE_GTK],$[PKG_CONFIG]]
+  #define cflags $[shell $[PKG_CONFIG] gtk+-2.0 --cflags]
+  #define libs $[shell $[PKG_CONFIG] gtk+-2.0 --libs]
+
+  #define GTK_CFLAGS $[filter-out -I%,$[cflags]]
+  #define GTK_IPATH $[unique $[patsubst -I%,%,$[filter -I%,$[cflags]]]]
+  #define GTK_LPATH $[unique $[patsubst -L%,%,$[filter -L%,$[libs]]]]
+  #define GTK_LIBS $[patsubst -l%,%,$[filter -l%,$[libs]]]
 #endif
 
 #if $[and $[HAVE_FREETYPE],$[FREETYPE_CONFIG]]

dtool/pptempl/Global.pp

@@ -258,11 +258,11 @@
   #define mikmod_libs $[MIKMOD_LIBS]
 #endif
 
-#if $[HAVE_GTKMM]
-  #define gtkmm_ipath $[wildcard $[GTKMM_IPATH]]
-  #define gtkmm_lpath $[wildcard $[GTKMM_LPATH]]
-  #define gtkmm_cflags $[GTKMM_CFLAGS]
-  #define gtkmm_libs $[GTKMM_LIBS]
+#if $[HAVE_GTK]
+  #define gtk_ipath $[wildcard $[GTK_IPATH]]
+  #define gtk_lpath $[wildcard $[GTK_LPATH]]
+  #define gtk_cflags $[GTK_CFLAGS]
+  #define gtk_libs $[GTK_LIBS]
 #endif
 
 #if $[HAVE_FREETYPE]