diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-08-18 08:10:00 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-08-18 08:10:00 +0800 |
| commit | 2021c145e0c5eb6aa9eda91d58d54b13007113ad (patch) | |
| tree | ab6b5ba09764a785e8c06efae2f69dca111089be /configure.ac | |
| parent | d3e8563fe9b3d3c0b5ee5f225964b8078e18d1e6 (diff) | |
| parent | dc7080f5071a9130bbd9288b50f807b41a5f9864 (diff) | |
| download | gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.tar gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.tar.gz gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.tar.bz2 gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.tar.lz gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.tar.xz gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.tar.zst gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.zip | |
Merge branch 'log-window-webview'
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/configure.ac b/configure.ac index d8de67f2c..3aa266b93 100644 --- a/configure.ac +++ b/configure.ac @@ -46,6 +46,7 @@ LIBNOTIFY_REQUIRED=0.7.0 TELEPATHY_FARSIGHT_REQUIRED=0.0.14 TELEPATHY_GLIB_REQUIRED=0.15.3 TELEPATHY_LOGGER=0.2.10 +WEBKIT_REQUIRED=1.3.13 # Optional deps CLUTTER_GTK_REQUIRED=0.90.3 @@ -56,7 +57,6 @@ 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.13 GNOME_CONTROL_CENTER_REQUIRED=2.31.4 # Use --enable-maintainer-mode to disable deprecated symbols, @@ -181,6 +181,7 @@ PKG_CHECK_MODULES(EMPATHY, gcr-3 >= $GCR_REQUIRED libpulse libpulse-mainloop-glib + webkitgtk-3.0 >= $WEBKIT_REQUIRED ]) PKG_CHECK_MODULES(YELL, [telepathy-yell]) @@ -338,30 +339,6 @@ AM_CONDITIONAL(HAVE_NM, test "x$have_nm" = "xyes") AM_CONDITIONAL(HAVE_CONNMAN, test "x$have_connman" = "xyes") # ----------------------------------------------------------- -# Webkit -# ----------------------------------------------------------- -AC_ARG_ENABLE(webkit, - AS_HELP_STRING([--enable-webkit=@<:@no/yes/auto@:>@], - [build with webkit support]), , - enable_webkit=auto) - -if test "x$enable_webkit" != "xno"; then - PKG_CHECK_MODULES(WEBKIT, [webkitgtk-3.0 >= $WEBKIT_REQUIRED], - have_webkit="yes", have_webkit="no") - - if test "x$have_webkit" = "xyes"; then - AC_DEFINE(HAVE_WEBKIT, 1, [Define if you have libwebkitgtk]) - fi -else - have_webkit=no -fi - -if test "x$enable_webkit" = "xyes" -a "x$have_webkit" != "xyes"; then - AC_MSG_ERROR([Could not find webkit dependencies.]) -fi -AM_CONDITIONAL(HAVE_WEBKIT, test "x$have_webkit" = "xyes") - -# ----------------------------------------------------------- # gudev # ----------------------------------------------------------- AC_ARG_ENABLE(gudev, @@ -667,7 +644,6 @@ Configure summary: Display maps (libchamplain).: ${have_libchamplain} Location awareness (Geoclue): ${have_geoclue} Geocode support (Geoclue)...: ${have_geocode} - Adium themes (Webkit).......: ${have_webkit} Meego widgets...............: ${have_meego} Control center embedding....: ${have_control_center_embedding} Cheese webcam support ......: ${have_cheese} |