Support gee-1.0 and gee-0.8

[moonshot-ui.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0330bc1..96fbc9b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,13 @@
-AC_PREREQ([2.65])
+AC_PREREQ([2.63])
 AC_INIT([Moonshot-ui],
-        [0.1],
+        [0.7.2],
         [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])
@@ -22,6 +27,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AM_PROG_VALAC([0.9])
 
+gee_0_8=no
 # Platform checks
 AC_CANONICAL_HOST
 
@@ -48,11 +54,7 @@ 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]
@@ -89,10 +91,12 @@ case "$host" in
             [gtk+-2.0 >= 2.18],
             [GTK_VERSION="gtk+-2.0"]
     )
+    PKG_CHECK_MODULES(GEE, [gee-0.8 >= 0.5],gee_0_8=yes,
+       [PKG_CHECK_MODULES(GEE,[gee-1.0])])
 
     ;;
 esac
-
+AM_CONDITIONAL(GEE_0_8,[test "$gee_0_8" = "yes"])
 AM_CONDITIONAL([OS_LINUX], [test "$linux" = "yes"])
 AM_CONDITIONAL([OS_WIN32], [test "$win32" = "yes"])
 AM_CONDITIONAL([OS_MACOS], [test "$macos" = "yes"])
@@ -102,9 +106,14 @@ AM_CONDITIONAL([IPC_DBUS], [test "$SERVER_IPC_MODULE" != "msrpc-glib2-1.0"])
 AM_CONDITIONAL([IPC_DBUS_GLIB], [test "$SERVER_IPC_MODULE" = "dbus-glib-1"])
 AM_CONDITIONAL([IPC_GDBUS], [test "$SERVER_IPC_MODULE" = "gio-2.0"])
 
+vala_version=`$VALAC --version | sed 's/Vala  *//'`
+AS_VERSION_COMPARE(["$vala_version"], [0.11.1],
+  [gio_vapi_uses_arrays="no"],
+  [gio_vapi_uses_arrays="yes"],
+  [gio_vapi_uses_arrays="yes"])
+AM_CONDITIONAL([GIO_VAPI_USES_ARRAYS], [test "$gio_vapi_uses_arrays" = "yes"])
 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.2], ["$vala_version"],
     [vala_supports_dbus_glib="no"],
     [vala_supports_dbus_glib="no"],
@@ -214,7 +223,6 @@ PKG_CHECK_MODULES(moonshot,[
         glib-2.0 >= 2.22
         gobject-2.0 >= 2.22
         $GTK_VERSION
-        gee-1.0 >= 0.5
         $SERVER_IPC_MODULE
                $MAC
 ])
@@ -225,7 +233,7 @@ PKG_CHECK_MODULES(libmoonshot,[
 
 # i18n stuff
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT_VERSION([0.18.1])
 
 AC_SUBST([GETTEXT_PACKAGE],[PACKAGE_TARNAME])
 AC_DEFINE([GETTEXT_PACKAGE],[PACKAGE_TARNAME],[Define to the gettext package name.])