From 91d0fcf1f794acc90a671bf5557d2d2a505843f7 Mon Sep 17 00:00:00 2001
From: joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845>
Date: Thu, 31 Jan 2008 11:40:22 +0000
Subject: 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
---
 Makefile.in | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index c0ccf60..b40a1be 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2006 Joe Orton <joe@manyfish.co.uk>
+# Copyright (C) 2001-2008 Joe Orton <joe@manyfish.co.uk>
 # Copyright (C) 1994, 1995-8, 1999, 2000 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -59,10 +59,11 @@ MSGMERGE = msgmerge
 LINGUAS = @ALL_LINGUAS@
 
 # The headers to distribute - making up the public interface of neon
-DIST_HEADERS = ne_request.h ne_session.h ne_utils.h ne_uri.h ne_socket.h  \
-	ne_basic.h ne_207.h ne_props.h ne_xml.h ne_dates.h ne_string.h	  \
-	ne_defs.h ne_locks.h ne_alloc.h ne_md5.h ne_i18n.h ne_redirect.h  \
-	ne_auth.h ne_compress.h ne_acl.h ne_ssl.h ne_xmlreq.h
+DIST_HEADERS = ne_request.h ne_session.h ne_utils.h ne_uri.h		\
+	ne_socket.h ne_basic.h ne_207.h ne_props.h ne_xml.h ne_dates.h	\
+	ne_string.h ne_defs.h ne_locks.h ne_alloc.h ne_md5.h ne_i18n.h	\
+	ne_redirect.h ne_auth.h ne_compress.h ne_acl.h ne_ssl.h		\
+	ne_xmlreq.h ne_gnutls.h
 
 all: subdirs
 
@@ -148,7 +149,8 @@ install-memleak:
 	@echo "ERROR: purposes only; this copy of neon must not be installed."
 	@false
 
-install-yes: install-lib install-headers install-config install-docs install-nls
+install-yes: install-lib install-headers install-config install-docs install-nls \
+	install-lib-ssl-@NE_SSL_LIBNAME@
 
 # libtool does all the necessary magic here
 install-lib: subdirs
@@ -156,6 +158,13 @@ install-lib: subdirs
 	$(LIBTOOL) --mode=install $(INSTALL) src/libneon.la \
 		$(DESTDIR)$(libdir)/libneon.la
 
+install-lib-ssl-no: 
+install-lib-ssl-gnutls:
+	$(LIBTOOL) --mode=install $(INSTALL) src/libneon-@NE_SSL_LIBNAME@.la \
+		$(DESTDIR)$(libdir)/libneon-@NE_SSL_LIBNAME@.la
+	$(INSTALL_DATA) neon-@NE_SSL_LIBNAME@.pc \
+		$(DESTDIR)$(pkgconfigdir)/neon-@NE_SSL_LIBNAME@.pc
+
 install-headers:
 	$(INSTALL) -d $(DESTDIR)$(neonincludes)
 	@for h in $(DIST_HEADERS); do \
-- 
cgit v1.2.1