From: Dan Winship <danw@src.gnome.org>
Date: Mon, 19 Feb 2007 23:31:38 +0000 (+0000)
Subject: Get gcrypt libs/cflags.
X-Git-Tag: LIBSOUP_2_2_105~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b9585a06ccdf8d0229d2d4967fe8189ac1d83566;p=platform%2Fupstream%2Flibsoup.git

Get gcrypt libs/cflags.

	* configure.in: Get gcrypt libs/cflags.

	* libsoup/Makefile.am (INCLUDES, libsoup_2_2_la_LIBADD): add
	gcrypt flags. Patch from "Cygwin Ports Maintainer", #384498

svn path=/trunk/; revision=913
---

diff --git a/ChangeLog b/ChangeLog
index d8711e9..54dfb3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-19  Dan Winship  <danw@novell.com>
+
+	* configure.in: Get gcrypt libs/cflags.
+
+	* libsoup/Makefile.am (INCLUDES, libsoup_2_2_la_LIBADD): add
+	gcrypt flags. Patch from "Cygwin Ports Maintainer", #384498
+
 2007-02-12  Dan Winship  <danw@novell.com>
 
 	* configure.in: 2.2.100
diff --git a/configure.in b/configure.in
index 5e0f92f..650773e 100644
--- a/configure.in
+++ b/configure.in
@@ -134,7 +134,8 @@ AC_ARG_ENABLE(ssl,
 	      enable_ssl=auto)
 
 if test "$enable_ssl" != "no"; then
-	PKG_CHECK_MODULES(LIBGNUTLS, gnutls, have_ssl=yes, have_ssl=no)
+	PKG_CHECK_MODULES(LIBGNUTLS, gnutls,
+		[AM_PATH_LIBGCRYPT([], have_ssl=yes, have_ssl=no)], have_ssl=no)
 	if test "$have_ssl" = "yes"; then
 		AC_DEFINE(HAVE_SSL, 1, [Defined if you have SSL support])
 		SSL_REQUIREMENT="gnutls"
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
index 9e99a98..d281079 100644
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
@@ -10,6 +10,7 @@ INCLUDES = 				\
 	$(SOUP_DEBUG_FLAGS)		\
 	$(GLIB_CFLAGS)			\
 	$(XML_CFLAGS)			\
+	$(LIBGCRYPT_CFLAGS)		\
 	$(LIBGNUTLS_CFLAGS)
 
 MARSHAL_GENERATED = soup-marshal.c soup-marshal.h
@@ -67,6 +68,7 @@ libsoup_2_2_la_LIBADD =			\
 	$(XML_LIBS)			\
 	$(LIBGNUTLS_LIBS_STATIC)	\
 	$(LIBGNUTLS_LIBS)		\
+	$(LIBGCRYPT_LIBS)		\
 	$(LIBWS2_32)
 
 libsoup_2_2_la_SOURCES =		\