[gthumb: 1/22] added libsoup check



commit 5d95f363ed319e4a56844704bb065397f39dae99
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Thu Jan 21 20:11:17 2010 +0100

    added libsoup check

 configure.ac |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e3aff44..022f8f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,7 @@ CLUTTER_GTK_REQUIRED=0.10.0
 GSTREAMER_REQUIRED=0.10
 OPENRAW_REQUIRED=0.0.8
 UNIQUE_REQUIRED=1.1.2
+LIBSOUP_REQUIRED=2.26
 
 dnl ===========================================================================
 
@@ -243,7 +244,6 @@ CFLAGS+="$WARNINGS "
 
 dnl ===========================================================================
 
-AC_MSG_CHECKING(JPEG Support)
 AC_ARG_ENABLE([jpeg],
 	      [AS_HELP_STRING([--disable-jpeg],[do not compile code that uses the libjpeg library])],,
 	      [enable_jpeg=yes])
@@ -258,12 +258,9 @@ if test "x$enable_jpeg" = "xyes"; then
 fi
 AC_SUBST(JPEG_LIBS)
 AM_CONDITIONAL(ENABLE_JPEG_TOOLS, test "x$enable_jpeg" = xyes)
-AC_MSG_RESULT($enable_jpeg)
-
 
 dnl ===========================================================================
 
-AC_MSG_CHECKING(TIFF Support)
 AC_ARG_ENABLE([tiff],
 	      [AC_HELP_STRING([--disable-tiff],[do not compile code that uses the libtiff library])],,
 	      [enable_tiff=yes])
@@ -279,10 +276,10 @@ if test x$enable_tiff = xyes ; then
 	fi
 fi
 AC_SUBST(TIFF_LIBS)
-AC_MSG_RESULT($enable_tiff)
 
 dnl ===========================================================================
 
+AC_MSG_CHECKING(liboperaw)
 AC_ARG_ENABLE([libopenraw],
 	      [AS_HELP_STRING([--enable-libopenraw],[use the libopenraw library to read raw files [default=no]])],,
 	      [enable_libopenraw=no])
@@ -293,11 +290,36 @@ if test x$enable_libopenraw = xyes ; then
 			  [enable_libopenraw=yes],
 			  [enable_libopenraw=no])
 	if test "x$enable_libopenraw" = "xyes"; then
-		AC_DEFINE(ENABLE_LIBOPENRAW, 1, [Define to 1 if libopenraw must be used to read raw files])
+		AC_DEFINE(ENABLE_LIBOPENRAW, 1, [Define to 1 if libopenraw must be used to read raw files instead of dcraw])
 	fi
 fi
+if test x$enable_libopenraw = xno ; then
+	enable_libopenraw='no (uses dcraw)'
+fi
 AC_SUBST(LIBOPENRAW_LIBS)
 AC_SUBST(LIBOPENRAW_CFLAGS)
+AC_MSG_RESULT($enable_libopenraw)
+
+dnl ===========================================================================
+
+AC_ARG_ENABLE([libsoup],
+	      [AS_HELP_STRING([--disable-libsoup],[do not compile code that uses the libsoup library])],,
+	      [enable_libsoup=yes])
+
+if test x$enable_libsoup = xyes ; then
+	PKG_CHECK_MODULES(LIBSOUP_GNOME,
+			  [libsoup-gnome-2.4 >= $LIBSOUP_REQUIRED],
+			  [LIBSOUP_CFLAGS="$LIBSOUP_GNOME_CFLAGS"
+			   LIBSOUP_LIBS="$LIBSOUP_GNOME_LIBS"
+			   AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [Have libsoup-gnome])
+			   enable_libsoup=yes],
+			  [PKG_CHECK_MODULES(LIBSOUP,
+					     [libsoup-2.4 >= $LIBSOUP_REQUIRED],
+					     [enable_libsoup=yes],
+					     [enable_libsoup=no])])
+fi
+AC_SUBST(LIBSOUP_CFLAGS)
+AC_SUBST(LIBSOUP_LIBS)
 
 dnl ===========================================================================
 
@@ -409,4 +431,5 @@ Configuration:
 	Clutter support      : ${enable_clutter}
 	GStreamer support    : ${enable_gstreamer}
 	Use libopenraw       : ${enable_libopenraw}
+	Web services         : ${enable_libsoup}
 "



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