(Update ImageMagick version in README.windows)

[moonshot-ui.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4300ded..3c268fb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 AC_PREREQ([2.66])
-AC_INIT([Moonshot],
-        [0.0.1],
-        [BUG-REPORT-ADDRESS],
-        [moonshot])
+AC_INIT([Moonshot-ui],
+        [0.1],
+        [moonshot-community@jiscmail.ac.uk],
+        [moonshot-ui])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
@@ -16,7 +16,7 @@ AM_MAINTAINER_MODE([enable])
 LT_PREREQ([2.2])
 LT_INIT([win32-dll])
 
-PKG_PROG_PKG_CONFIG([0.24])
+PKG_PROG_PKG_CONFIG([0.23])
 
 # Platform checks
 AC_CANONICAL_HOST
@@ -34,6 +34,7 @@ case "$host" in
     ;;
 esac
 
+AM_CONDITIONAL([OS_LINUX], [test "$win32" != "yes"])
 AM_CONDITIONAL([OS_WIN32], [test "$win32" = "yes"])
 AM_CONDITIONAL([IPC_MSRPC], [test "$SERVER_IPC_MODULE" = "msrpc-glib2-1.0"])
 AM_CONDITIONAL([IPC_DBUS], [test "$SERVER_IPC_MODULE" = "dbus-glib-1"])
@@ -65,7 +66,8 @@ if test "$win32" = "yes"; then
   # Other Windows-specific tools
 
   # LIB.EXE from MSVC to build an MSVC-compatible import library.
-  AC_PATH_PROG([MSVC_LIB], [lib], no)
+  AC_PATH_PROG([MSVC_LIB], [lib], no,
+               [/c/Program\ Files/Microsoft\ Visual\ Studio\ 9.0/VC/bin$PATH_SEPARATOR$PATH])
 
   if test "$MSVC_LIB" = "no"; then
      AC_MSG_WARN([
@@ -104,18 +106,40 @@ if test "$win32" = "yes"; then
   fi
 fi
 
+if test "$win32" != "yes"; then
+  AC_PATH_PROG([UPDATE_MIME_DATABASE], [update-mime-database], [no])
+  if test "$UPDATE_MIME_DATABASE" = "no"; then
+    AC_MSG_ERROR([
+*** Could not find the Freedesktop.org  mime database update tool.
+*** Web provisioning files could not be automatically installed.])
+  fi
+  AC_PATH_PROG([UPDATE_DESKTOP_DATABASE], [update-desktop-database], [no])
+  if test "$UPDATE_DESKTOP_DATABASE" = "no"; then
+    AC_MSG_ERROR([
+*** Could not find the Freedesktop.org desktop entry database update
+*** tool. Web provisioning files could not be automatically installed.])
+  fi
+fi
+
+MOONSHOT_APP="$bindir/moonshot"
+MOONSHOT_WEBP="$bindir/moonshot-webp"
+
 AC_SUBST(MIDL)
 AC_SUBST(MSVC_LIB)
 AC_SUBST(IMAGEMAGICK_CONVERT)
 AC_SUBST(WIX_CANDLE)
 AC_SUBST(WIX_LIGHT)
+AC_SUBST(UPDATE_MIME_DATABASE)
+AC_SUBST(UPDATE_DESKTOP_DATABASE)
+AC_SUBST(MOONSHOT_APP)
+AC_SUBST(MOONSHOT_WEBP)
 
 # Dependencies
 PKG_CHECK_MODULES(moonshot,[
         atk >= 1.20
-        glib-2.0 >= 2.24
-        gobject-2.0 >= 2.24
-        gtk+-2.0 >= 2.20
+        glib-2.0 >= 2.22
+        gobject-2.0 >= 2.22
+        gtk+-2.0 >= 2.18
         $SERVER_IPC_MODULE
 ])
 
@@ -133,6 +157,9 @@ AC_DEFINE([GETTEXT_PACKAGE],[PACKAGE_TARNAME],[Define to the gettext package nam
 AC_CONFIG_FILES([
         Makefile
         po/Makefile.in
+        moonshot.desktop
+        moonshot-webp.desktop
+       moonshot-ui.spec
 ])
 
 AC_OUTPUT