X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=70bc999b4ad168570fa646efab5e62237dd78b62;hp=c65be54167ee93b4b22426e2b35425a775481c36;hb=8d014e2a3b73644a51fa341a036a6df0221bc66d;hpb=84d12d32bb206c48ce45c416258f0c1316c2378b

diff --git a/configure.ac b/configure.ac
index c65be541..70bc999b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 dnl If not 1, append datestamp to the version number
-m4_define(empathy_released, 1)
+m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [3])
 m4_define([empathy_minor_version], [1])
-m4_define([empathy_micro_version], [2])
+m4_define([empathy_micro_version], [4])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
@@ -41,8 +41,8 @@ GCR_REQUIRED=2.91.4
 LIBCANBERRA_GTK_REQUIRED=0.25
 LIBNOTIFY_REQUIRED=0.7.0
 TELEPATHY_FARSIGHT_REQUIRED=0.0.14
-TELEPATHY_GLIB_REQUIRED=0.15.1
-TELEPATHY_LOGGER=0.2.8
+TELEPATHY_GLIB_REQUIRED=0.15.3
+TELEPATHY_LOGGER=0.2.10
 
 # Optional deps
 CLUTTER_GTK_REQUIRED=0.90.3
@@ -53,7 +53,7 @@ LIBCHAMPLAIN_GTK_REQUIRED=0.7.1
 LIBCHAMPLAIN_REQUIRED=0.9
 NAUTILUS_SENDTO_REQUIRED=2.90.0
 NETWORK_MANAGER_REQUIRED=0.7.0
-WEBKIT_REQUIRED=1.3.2
+WEBKIT_REQUIRED=1.3.13
 GNOME_CONTROL_CENTER_REQUIRED=2.31.4
 
 # Use --enable-maintainer-mode to disable deprecated symbols,
@@ -196,19 +196,22 @@ if test "x$with_call" != "xno" ; then
    [
       farsight2-0.10
       telepathy-farstream
-   ], have_farstream="yes", have_farstream="no" )
+      clutter-1.0
+      clutter-gtk-1.0
+      clutter-gst-1.0
+   ], have_call="yes", have_call="no" )
 
-   if test "x$have_farstream" = "xyes"; then
+   if test "x$have_call" = "xyes"; then
       AC_DEFINE(HAVE_CALL, 1, [Define if you have Call channel support])
    fi
 else
-  have_farstream=no
+  have_call=no
 fi
 
-if test "x$with_call" = "xyes" -a "x$have_farstream" != "xyes"; then
+if test "x$with_call" = "xyes" -a "x$have_call" != "xyes"; then
    AC_MSG_ERROR([Could not find Call handler dependencies.])
 fi
-AM_CONDITIONAL(HAVE_CALL, test "x$have_farstream" = "xyes")
+AM_CONDITIONAL(HAVE_CALL, test "x$have_call" = "xyes")
 
 
 # -----------------------------------------------------------
@@ -347,6 +350,31 @@ if test "x$enable_webkit" = "xyes" -a "x$have_webkit" != "xyes"; then
 fi
 AM_CONDITIONAL(HAVE_WEBKIT, test "x$have_webkit" = "xyes")
 
+# -----------------------------------------------------------
+# gudev
+# -----------------------------------------------------------
+AC_ARG_ENABLE(gudev,
+              AS_HELP_STRING([--enable-gudev=@<:@no/yes/auto@:>@],
+                             [build with gudev support]), ,
+                             enable_gudev=auto)
+
+if test "x$enable_gudev" != "xno"; then
+
+   PKG_CHECK_MODULES(UDEV, [gudev-1.0],
+        have_gudev="yes", have_gudev="no")
+
+   if test "x$have_gudev" = "xyes"; then
+      AC_DEFINE(HAVE_UDEV, 1, [Define if you have gudev])
+   fi
+else
+   have_gudev=no
+fi
+
+if test "x$enable_gudev" = "xyes" -a "x$have_gudev" != "xyes"; then
+   AC_MSG_ERROR([Could not find gudev dependencies.])
+fi
+AM_CONDITIONAL(HAVE_UDEV, test "x$have_gudev" = "xyes")
+
 # -----------------------------------------------------------
 # spellchecking checks: enchant and iso-codes
 # -----------------------------------------------------------
@@ -629,6 +657,7 @@ Configure summary:
 	Meego widgets...............:  ${have_meego}
 	Control center embedding....:  ${have_control_center_embedding}
 	Cheese webcam support ......:  ${have_cheese}
+	Camera monitoring...........:  ${have_gudev}
 
     Connectivity:
 	NetworkManager integration..:  ${have_nm}
@@ -637,6 +666,6 @@ Configure summary:
     Extras:
 	Nautilus-sendto plugin......:  ${have_nst}
 	Salut E-D-S support.........:  ${with_eds}
-	Exp. Call channel handler...:  ${have_farstream}
+	Exp. Call channel handler...:  ${have_call}
 	Exp. Call log support.......:  ${have_call_logs}
 "