wok-next view gnome-vfs/stuff/patches/gnutls-config.patch @ rev 20519

Synchronize wok-hg with wok. Some yesterday's patches are lost :(
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Mar 23 10:45:35 2018 +0200 (2018-03-23)
parents
children
line source
1 # Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0
2 # Use pkg-config in place of gnutls own macro since it's not present anymore.
3 --- a/configure.in 2009-03-07 19:59:53.805507753 +0100
4 +++ b/configure.in 2009-03-07 18:34:36.928169018 +0100
5 @@ -686,14 +686,14 @@
6 AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***])
7 else
8 AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***]))
9 - AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
10 - have_ssl=true])
11 + PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
12 + have_ssl=true])
14 if test "x${LIBGNUTLS_LIBS}" = "x"; then
15 - AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
16 - AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
17 - have_ssl=true],
18 - AC_MSG_ERROR([Unable to find GNUTLS]))
19 + PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
20 + AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
21 + have_ssl=true],
22 + AC_MSG_ERROR([Unable to find GNUTLS]))
23 fi
24 fi
25 fi