[gthumb] check for json_glib and webkit2



commit d101c61fe075fd363612013db0ec783588fe04dd
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Dec 9 16:40:19 2012 +0100

    check for json_glib and webkit2

 configure.ac       |   37 ++++++++++++++++++++++++++++++++++++-
 gthumb/Makefile.am |    2 ++
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0c5f13a..4d058bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,8 @@ LIBBRASERO_REQUIRED=3.2.0
 LIBCHAMPLAIN_REQUIRED=0.12.0
 LIBRSVG_REQUIRED=2.34.0
 LIBWEBP_REQUIRED=0.2.0
+LIBJSON_GLIB_REQUIRED=0.15.0
+WEBKITGTK_REQUIRED=1.10.0
 
 dnl ===========================================================================
 
@@ -513,7 +515,40 @@ if test x$enable_libsoup = xyes ; then
 fi
 AC_SUBST(LIBSOUP_CFLAGS)
 AC_SUBST(LIBSOUP_LIBS)
-AM_CONDITIONAL(ENABLE_WEB_SERVICES, test "x$enable_libsoup" = xyes)
+
+dnl ===========================================================================
+
+AC_ARG_ENABLE([libjson_glib],
+	      [AS_HELP_STRING([--disable-libjson-glib],[do not compile code that uses the libjson-glib library])],,
+	      [enable_libjson_glib=yes])
+
+if test x$enable_libjson_glib = xyes ; then
+	PKG_CHECK_MODULES(LIBJSON_GLIB,
+			  [libjson-glib-1.0 >= $LIBJSON_GLIB_REQUIRED],
+			  [AC_DEFINE(HAVE_LIBJSON_GLIB, 1, [Have libjson-glib])
+			   enable_libjson_glib=yes],
+			  [enable_libjson_glib=no])
+fi
+AC_SUBST(LIBJSON_GLIB_CFLAGS)
+AC_SUBST(LIBJSON_GLIB_LIBS)
+
+dnl ===========================================================================
+
+AC_ARG_ENABLE([webkit2],
+	      [AS_HELP_STRING([--disable-webkit2],[do not compile code that uses webkit2gtk])],,
+	      [enable_webkit2=yes])
+
+if test x$enable_webkit2 = xyes ; then
+	PKG_CHECK_MODULES(WEBKIT2,
+			  [webkit2gtk-3.0 >= $WEBKIT2_REQUIRED],
+			  [AC_DEFINE(HAVE_WEBKIT2, 1, [Have webkit2gtk])
+			   enable_webkit2=yes],
+			  [enable_webkit2=no])
+fi
+AC_SUBST(WEBKIT2_CFLAGS)
+AC_SUBST(WEBKIT2_LIBS)
+
+AM_CONDITIONAL(ENABLE_WEB_SERVICES, test "x$enable_libsoup" = xyes && test "x$enable_libjson_glib" = xyes && test "x$enable_webkit2" = xyes)
 
 dnl ===========================================================================
 
diff --git a/gthumb/Makefile.am b/gthumb/Makefile.am
index 4b93d3e..ab1d71c 100644
--- a/gthumb/Makefile.am
+++ b/gthumb/Makefile.am
@@ -289,6 +289,8 @@ gthumb_LDADD =						\
 	$(LIBCHAMPLAIN_LIBS)				\
 	$(LIBRSVG_LIBS)					\
 	$(LIBWEBP_LIBS)					\
+	$(LIBJSON_GLIB_LIBS)				\
+	$(WEBKIT2_LIBS)					\
 	$(NULL)
 
 if RUN_IN_PLACE



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]