X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=92f76c3d2c4308675d996044dae97fbb6f1e4983;hb=fb652d391f5c5bd9addd56c485d2a931a4c87cd7;hp=7b392fb159289df30442fab4cdeca36426ecddd9;hpb=72879de8b8bd03506c52ed0dfb247a07a276e1cf;p=moonshot-ui.git

diff --git a/configure.ac b/configure.ac
index 7b392fb..92f76c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,13 @@
-AC_PREREQ([2.66])
+AC_PREREQ([2.63])
 AC_INIT([Moonshot-ui],
-        [0.1],
+        [0.6],
         [moonshot-community@jiscmail.ac.uk],
-        [moonshot-ui])
+        [moonshot-ui],
+        [http://www.project-moonshot.org/])
 
+# Remove this when we can depend on autoconf >= 2.64
+AC_SUBST(PACKAGE_URL, [http://www.project-moonshot.org/])
+AC_DEFINE(PACKAGE_URL,["http://www.project-moonshot.org"],[package URL])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
@@ -15,6 +19,7 @@ AM_MAINTAINER_MODE([enable])
 
 LT_PREREQ([2.2])
 LT_INIT([win32-dll])
+AC_CHECK_FUNCS_ONCE(geteuid getpwuid)
 
 # Checks for programs.
 PKG_PROG_PKG_CONFIG([0.23])
@@ -32,6 +37,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*) 
@@ -44,10 +53,18 @@ case "$host" in
     # because Vala drops support for it, but as it ships with DBus there is very
     # little danger of it being dropped by distros any time soon.
     CLIENT_IPC_MODULE="dbus-glib-1"
-    PKG_CHECK_MODULES([GDBUS],
-            [gio-2.0 >= 2.26],
-            [SERVER_IPC_MODULE="gio-2.0"],
-            [SERVER_IPC_MODULE="dbus-glib-1"]
+	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 +83,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 +106,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 +214,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,[