diff options
author | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2008-01-31 11:40:22 +0000 |
---|---|---|
committer | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2008-01-31 11:40:22 +0000 |
commit | 91d0fcf1f794acc90a671bf5557d2d2a505843f7 (patch) | |
tree | 2d7572c6c4f2dd15b07daa6abbf5b5897501cea2 /neon-config.in | |
parent | 50a193569c765191e14961718af2d004d184c7f1 (diff) | |
download | neon-91d0fcf1f794acc90a671bf5557d2d2a505843f7.tar.gz |
Add libneon-gnutls support library to allow use of external signing
callback with GnuTLS:
* src/lib_gnutls.c, src/ne_gnutls.h, neon-gnutls.pc.in: New files.
* src/ne_privssl.h (struct ne_ssl_context_s): Add sign_func, sign_data
fields.
* macros/neon.m4 (NEON_SSL): Define NE_SSL_LIBNAME; check for
gnutls_sign_callback_set, add new exports NE_SSL_CFLAGS and
NE_LIBSSL_LTFLAGS. Export NEON_LIBEXT in place of NEON_TARGET,
NE_LIBNEON_LTFLAGS in place of NEON_LINK_FLAGS;
* src/Makefile.in: Add and adjust targets to build libneon-gnutls iff
configured with GnuTLS support.
* Makefile.in (install-lib-ssl-no, install-lib-ssl-gnutls): New
targets.
* neon-config.in: Add --la-file=gnutls, --cflags=gnutls support.
* src/ne_socket.c (ne_sock_connect_ssl): Set up the sign_func callback
if non-NULL.
* configure.in: Adjust for NEON_LINK_FLAGS rename. Define
NE_LIBSSL_LTFLAGS. Generate neon-gnutls.pc.
git-svn-id: http://svn.webdav.org/repos/projects/neon/trunk@1315 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
Diffstat (limited to 'neon-config.in')
-rw-r--r-- | neon-config.in | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/neon-config.in b/neon-config.in index 3475122..1114cde 100644 --- a/neon-config.in +++ b/neon-config.in @@ -1,6 +1,6 @@ #! /bin/sh # Originally from libxml, Copyright (C) Daniel Veillard -# Modifications for neon Copyright (C) 2000-2006 Joe Orton. +# Adapted for neon, Copyright (C) 2000-2008 Joe Orton. prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -17,7 +17,9 @@ Known values for OPTION are: --prefix=DIR change neon prefix [default $prefix] --libs print library linking information --la-file print location of libtool .la file + --la-file=gnutls print location of libneon-gnutls .la file --cflags print pre-processor and compiler flags + --cflags-gnutls print additional CFLAGS needed by ne_gnutls.h --help display this help and exit --version output version information --support FEATURE exit with success if feature is supported @@ -68,6 +70,14 @@ while test $# -gt 0; do usage 0 ;; + --cflags=gnutls) + if [ "x@NE_SSL_LIBNAME@" = "xgnutls" ]; then + echo @NE_SSL_CFLAGS@ + else + echo neon-config: GnuTLS toolkit interface not supported + fi + ;; + --cflags) echo -I${includedir}/neon @NEON_CFLAGS@ ;; @@ -85,6 +95,14 @@ while test $# -gt 0; do echo ${libdir}/libneon.la ;; + --la-file=gnutls) + if [ "x@NE_SSL_LIBNAME@" = "xgnutls" ]; then + echo ${libdir}/libneon-gnutls.la + else + echo neon-config: GnuTLS toolkit interface not supported + fi + ;; + --support) shift @@ -101,7 +119,8 @@ while test $# -gt 0; do ;; *) - usage 1 1>&2 + echo "neon-config: unrecognized option $1, see --help" 1>&2 + exit 1 ;; esac shift |