Don't break the build if we don't have the gnutls libraries.

036dc38d · Lars Magne Ingebrigtsen · d6dcbe70 · 036dc38d · 036dc38d · 036dc38d
Commit 036dc38d authored Sep 26, 2010 by Lars Magne Ingebrigtsen
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 329 additions and 212 deletions

ChangeLog ChangeLog +5 -0

configure configure +318 -209

configure.in configure.in +6 -3

No files found.
--- a/ChangeLog
+++ b/ChangeLog
+2010-09-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* configure.in (HAVE_GNUTLS): Don't break if we don't have the
+	gnutls libraries.
+
 2010-09-26  Teodor Zlatanov  <tzz@lifelogs.com>

 	* configure.in: Set up GnuTLS.

--- a/configure
+++ b/configure
--- a/configure.in
+++ b/configure.in
@@ -2002,10 +2002,13 @@ AC_SUBST(LIBSELINUX_LIBS)

 HAVE_GNUTLS=no
 if test "${with_gnutls}" = "yes" ; then
-  PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.2.4])
-  AC_DEFINE(HAVE_GNUTLS)
-  HAVE_GNUTLS=yes
+  PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.2.4], HAVE_GNUTLS=yes, HAVE_GNUTLS=no)
+  if test "${HAVE_GNUTLS}" = "yes"; then
+    AC_DEFINE(HAVE_GNUTLS)
+  fi
 fi
+AC_SUBST(LIBGNUTLS_LIBS)
+AC_SUBST(LIBGNUTLS_CFLAGS)

 dnl Do not put whitespace before the #include statements below.
 dnl Older compilers (eg sunos4 cc) choke on it.