Tinkering with configure.ac to allow different versions of GTK+

diff --git a/configure.ac b/configure.ac
index 0299d76..7a433fe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,10 @@ case "$host" in
     linux=no
     SERVER_IPC_MODULE="msrpc-glib2-1.0"
     CLIENT_IPC_MODULE="msrpc-mingw-1.0"
+    PKG_CHECK_MODULES([GTK],
+            [gtk+-2.0 >= 2.18],
+            [GTK_VERSION="gtk+-2.0"]
+    )
     ;;
     
   *darwin*) 
@@ -50,6 +54,14 @@ case "$host" in
             [SERVER_IPC_MODULE="dbus-glib-1"]
     )
 
+# TODO: Move to GTK+-3
+#            [gtk+-3.0 >= 2.0],
+#            [GTK_VERSION="gtk+-3.0"]
+    PKG_CHECK_MODULES([GTK],
+            [gtk+-2.0 >= 2.18],
+            [GTK_VERSION="gtk+-2.0"]
+    )
+
     ;;
   *)
     macos=no
@@ -66,6 +78,13 @@ case "$host" in
             [SERVER_IPC_MODULE="gio-2.0"],
             [SERVER_IPC_MODULE="dbus-glib-1"]
     )
+# TODO: Move to GTK+-3
+#            [gtk+-3.0 >= 2.0],
+#            [GTK_VERSION="gtk+-3.0"]
+    PKG_CHECK_MODULES([GTK],
+            [gtk+-2.0 >= 2.18],
+            [GTK_VERSION="gtk+-2.0"]
+    )
 
     ;;
 esac
@@ -190,7 +209,7 @@ PKG_CHECK_MODULES(moonshot,[
         atk >= 1.20
         glib-2.0 >= 2.22
         gobject-2.0 >= 2.22
-        gtk+-2.0 >= 2.18
+        $GTK_VERSION
         gee-1.0 >= 0.5
         $SERVER_IPC_MODULE
 ])

diff --git a/src/moonshot-utils.vala b/src/moonshot-utils.vala
index da075b4..0ba5a0f 100644 (file)
--- a/src/moonshot-utils.vala
+++ b/src/moonshot-utils.vala
@@ -35,7 +35,6 @@ print("MacOS\n");
         string? base_path = " /Users/pete/moonshot-ui";
          string? filename = Filename.display_name(Path.build_filename (base_path, "share", "icons", "%s.png".printf (name)));
 print("%s\n".printf(filename));
-size_t x, y;
         return new Gdk.Pixbuf.from_file (filename);
 //        return new Gdk.Pixbuf.from_file_at_size (filename, -1, -1);
 */