Modify the launcher script to export the DBUS_SESSION_BUS_ADDRESS environment variable

[moonshot-ui.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7b392fb..1d27ecf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.66])
+AC_PREREQ([2.63])
 AC_INIT([Moonshot-ui],
         [0.1],
         [moonshot-community@jiscmail.ac.uk],
@@ -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*) 
@@ -49,6 +53,18 @@ case "$host" in
             [SERVER_IPC_MODULE="gio-2.0"],
             [SERVER_IPC_MODULE="dbus-glib-1"]
     )
+       
+       PKG_CHECK_MODULES([MAC], 
+                       [gtk-mac-integration >= 1.0.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"]
+    )
 
     ;;
   *)
@@ -66,6 +82,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
@@ -82,7 +105,7 @@ AM_CONDITIONAL([IPC_GDBUS], [test "$SERVER_IPC_MODULE" = "gio-2.0"])
 if test "$SERVER_IPC_MODULE" = "dbus-glib-1"; then
   AC_MSG_CHECKING([$VALAC is no greater than 0.12.1])
   vala_version=`$VALAC --version | sed 's/Vala  *//'`
-  AS_VERSION_COMPARE([0.12.1], ["$vala_version"],
+  AS_VERSION_COMPARE([0.12.2], ["$vala_version"],
     [vala_supports_dbus_glib="no"],
     [vala_supports_dbus_glib="no"],
     [vala_supports_dbus_glib="yes"])
@@ -190,9 +213,10 @@ PKG_CHECK_MODULES(moonshot,[
         atk >= 1.20
         glib-2.0 >= 2.22
         gobject-2.0 >= 2.22
-        gtk+-2.0 >= 2.18
-        gee-1.0 > 0.6
+        $GTK_VERSION
+        gee-1.0 >= 0.5
         $SERVER_IPC_MODULE
+               $MAC
 ])
 
 PKG_CHECK_MODULES(libmoonshot,[