X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=c184205d2f4c83a640ee23ed75ce9be0290ec927;hp=ecb49b7f20617c5251a04ed2f330009a3a2b1cfa;hb=efe3042bf7b712e2b688121b97bd280ca15a4ff7;hpb=d7c34ab70a937ab9c17e678a971820fdaf1fcd78

diff --git a/configure.ac b/configure.ac
index ecb49b7f..c184205d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(Empathy, 0.3darcs)
+AC_INIT(Empathy, 0.9, http://bugzilla.gnome.org/browse.cgi?product=empathy)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (C) 2003-2007 Imendio AB])
 
@@ -26,7 +26,7 @@ GTK_REQUIRED=2.10.0
 GCONF_REQUIRED=1.2.0
 LIBGLADE_REQUIRED=2.0.0
 TELEPATHY_REQUIRED=0.0.51
-MISSION_CONTROL_REQUIRED=0.21
+MISSION_CONTROL_REQUIRED=4.27
 
 IDT_COMPILE_WARNINGS
 
@@ -64,34 +64,78 @@ PKG_CHECK_MODULES(EMPATHY,
 [
    glib-2.0 >= $GLIB_REQUIRED
    gobject-2.0
-   gtk+-2.0 >= $GTK_REQUIRED
    gconf-2.0 >= $GCONF_REQUIRED
-   libglade-2.0 >= $LIBGLADE_REQUIRED
-   libgnomeui-2.0
+   libxml-2.0
+   gnome-vfs-2.0
    libtelepathy >= $TELEPATHY_REQUIRED
    libmissioncontrol >= $MISSION_CONTROL_REQUIRED
+   gtk+-2.0 >= $GTK_REQUIRED
+   libglade-2.0 >= $LIBGLADE_REQUIRED
+   libgnomeui-2.0
 ])
 
-PKG_CHECK_MODULES(MISSION_CONTROL_PLUGINS,
-[
-   mission-control >= $MISSION_CONTROL_REQUIRED
-   glib-2.0 >= $GLIB_REQUIRED
-   gobject-2.0
-   dbus-glib-1
-   libtelepathy >= $TELEPATHY_REQUIRED
-])
+dnl -----------------------------------------------------------
+dnl ISO codes, used for aspell support
+dnl -----------------------------------------------------------
+AC_MSG_CHECKING([whether iso-codes exists and has iso-639 domain])
+if $PKG_CONFIG --variable=domains iso-codes | grep -q 639 ; then
+   AC_MSG_RESULT([yes])
+   iso_codes_prefix=`$PKG_CONFIG --variable=prefix iso-codes`
+   iso_codes_pkgconfig=iso-codes
+   have_iso_codes=yes
+else
+   AC_MSG_RESULT([no])
+   iso_codes_prefix=
+   iso_codes_pkgconfig=
+   have_iso_codes=no
+fi
+
+AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["$iso_codes_prefix"],[ISO codes prefix])
+
+dnl -----------------------------------------------------------
+dnl ASpell
+dnl -----------------------------------------------------------
+AC_ARG_ENABLE(aspell,
+              AS_HELP_STRING([--enable-aspell=@<:@no/yes/auto@:>@],
+                             [compile with aspell support]), ,
+                             enable_aspell=auto)
+
+if test "x$enable_aspell" = "xyes" -a "x$have_iso_codes" != "xyes"; then
+   AC_MSG_ERROR([You must have iso-codes with the iso-639 domain to use aspell.])
+fi
+
+if test "x$enable_aspell" != "xno" -a "x$have_iso_codes" = "xyes"; then
+   AC_CHECK_LIB(aspell, aspell_speller_check,have_aspell=yes,have_aspell=no,)
+
+   if test "x$have_aspell" = "xyes"; then
+      AC_DEFINE(HAVE_ASPELL, 1, [Define if we have aspell])
+      EMPATHY_LIBS="$EMPATHY_LIBS -laspell"
+   else
+      have_aspell=no
+   fi
+else
+   have_aspell=no
+fi
+
+if test "x$enable_aspell" = "xyes" -a "x$have_aspell" != "xyes"; then
+   AC_MSG_ERROR([Couldn't find aspell.])
+fi
 
 dnl -----------------------------------------------------------
 AC_OUTPUT([
   Makefile
   data/Makefile
+  data/empathy.desktop.in
   data/16x16/Makefile
   data/22x22/Makefile
   data/32x32/Makefile
+  data/48x48/Makefile
   data/scalable/Makefile
   po/Makefile.in
   libempathy/Makefile
+  libempathy/libempathy.pc
   libempathy-gtk/Makefile
+  libempathy-gtk/libempathy-gtk.pc
   src/Makefile
 ])