diff options
| author | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2008-10-31 08:59:02 +0000 |
|---|---|---|
| committer | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2008-10-31 08:59:02 +0000 |
| commit | d94422cbb1655b281548485eb8638416c770d48d (patch) | |
| tree | 45033c871d54115aefdeb5a9b081f158e6a1b98e /macros | |
| parent | 86f4e40ff4f617573e4eee69db71ffc7f6493ccf (diff) | |
| download | neon-d94422cbb1655b281548485eb8638416c770d48d.tar.gz | |
* macros/neon.m4 (NEON_SSL): Configure GnuTLS support via pkg-config
data if possible.
git-svn-id: http://svn.webdav.org/repos/projects/neon/trunk@1594 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/neon.m4 | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/macros/neon.m4 b/macros/neon.m4 index be2de7d..e349d15 100644 --- a/macros/neon.m4 +++ b/macros/neon.m4 @@ -953,27 +953,37 @@ yes|openssl) NEON_EXTRAOBJS="$NEON_EXTRAOBJS ne_openssl" ;; gnutls) - AC_PATH_PROG(GNUTLS_CONFIG, libgnutls-config, no) + NE_PKG_CONFIG(NE_SSL, gnutls, + [AC_MSG_NOTICE(using GnuTLS configuration from pkg-config) + CPPFLAGS="$CPPFLAGS ${NE_SSL_CFLAGS}" + NEON_LIBS="$NEON_LIBS ${NE_SSL_LIBS}" + + ne_gnutls_ver=`$PKG_CONFIG --modversion gnutls` + ], [ + # Fall back on libgnutls-config script + AC_PATH_PROG(GNUTLS_CONFIG, libgnutls-config, no) + + if test "$GNUTLS_CONFIG" = "no"; then + AC_MSG_ERROR([could not find libgnutls-config in \$PATH]) + fi - if test "$GNUTLS_CONFIG" = "no"; then - AC_MSG_ERROR([could not find libgnutls-config in \$PATH]) - fi + CPPFLAGS="$CPPFLAGS `$GNUTLS_CONFIG --cflags`" + NEON_LIBS="$NEON_LIBS `$GNUTLS_CONFIG --libs`" + + ne_gnutls_ver=`$GNUTLS_CONFIG --version` + ]) - ne_gnutls_ver=`$GNUTLS_CONFIG --version` case $ne_gnutls_ver in 1.0.?|1.0.1?|1.0.20|1.0.21) AC_MSG_ERROR([GNU TLS version $ne_gnutls_ver is too old -- 1.0.22 or later required]) ;; esac - CPPFLAGS="$CPPFLAGS `$GNUTLS_CONFIG --cflags`" - AC_CHECK_HEADER([gnutls/gnutls.h],, [AC_MSG_ERROR([could not find gnutls/gnutls.h in include path])]) NE_ENABLE_SUPPORT(SSL, [SSL support enabled, using GnuTLS $ne_gnutls_ver]) NEON_EXTRAOBJS="$NEON_EXTRAOBJS ne_gnutls" - NEON_LIBS="$NEON_LIBS `$GNUTLS_CONFIG --libs`" AC_DEFINE([HAVE_GNUTLS], 1, [Define if GnuTLS support is enabled]) # Check for functions in later releases |