Revert diff r1320:r1314.

Makefile.in

@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2008 Joe Orton <joe@manyfish.co.uk>
+# Copyright (C) 2001-2006 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,11 +59,10 @@ 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 ne_gnutls.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
 
 all: subdirs
 
@@ -149,22 +148,14 @@ 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-lib-ssl-@NE_SSL_LIBNAME@
+install-yes: install-lib install-headers install-config install-docs install-nls
 
 # libtool does all the necessary magic here
 install-lib: subdirs
 	$(INSTALL) -d $(DESTDIR)$(libdir)
 	$(LIBTOOL) --mode=install $(INSTALL) src/libneon.la \
 		$(DESTDIR)$(libdir)/libneon.la
 
-install-lib-ssl-none:
-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 \

configure.in

@@ -6,7 +6,7 @@ m4_define(ne_version, [m4_translit(m4_include(.version), [
 
 AC_INIT(neon, ne_version, [neon@webdav.org])
 
-AC_COPYRIGHT([Copyright 2000-2008 Joe Orton and others
+AC_COPYRIGHT([Copyright 2000-2005 Joe Orton and others
 This configure script may be copied, distributed and modified under the 
 terms of the GNU Library General Public license; see src/COPYING.LIB for
 more details.])
@@ -138,27 +138,22 @@ fi
 AC_SUBST(NEON_PC_LIBS)
 
 # Pass the interface version on to libtool when linking libneon.la
-NE_LIBNEON_LTFLAGS="-version-info ${NE_LIBTOOL_VERSINFO}"
+NEON_LINK_FLAGS="-version-info ${NE_LIBTOOL_VERSINFO}"
 # If any non-default ABI variations are used, add them to the SONAME:
 if test "x${NE_LIBTOOL_RELEASE}y" != "xy"; then
-   NE_LIBNEON_LTFLAGS="${NE_LIBNEON_LTFLAGS} -release ${NE_LIBTOOL_RELEASE}"
+   NEON_LINK_FLAGS="${NEON_LINK_FLAGS} -release ${NE_LIBTOOL_RELEASE}"
 fi
 
 # Library-internal symbols are in the ne__ namespace: tell libtool
 # to not export these from the built library if possible.
-NE_LIBNEON_LTFLAGS="$NE_LIBNEON_LTFLAGS -export-symbols-regex '^ne_[[^_]]'"
-
-NE_LIBSSL_LTFLAGS="-version-info 1:0:0"
+NEON_LINK_FLAGS="$NEON_LINK_FLAGS -export-symbols-regex '^ne_[[^_]]'"
 
 # Bundled language catalogs
 ALL_LINGUAS="cs de fr ja nn pl ru tr zh"
 AC_SUBST(ALL_LINGUAS)
 
 AC_CONFIG_FILES([neon-config], [chmod +x neon-config])
 AC_CONFIG_FILES([Makefile src/Makefile test/Makefile neon.pc])
-if test x$NE_SSL_LIBNAME = xgnutls; then
-   AC_CONFIG_FILES([neon-gnutls.pc])
-fi
 
 AC_SUBST(NEON_VERSION)
 AC_SUBST(NEON_BUILD_BUNDLED)

macros/neon.m4

@@ -777,19 +777,18 @@ else
   NE_ENABLE_SUPPORT(DAV, [WebDAV support is enabled])
 fi
 
-AC_SUBST(NEON_LIBEXT)
+AC_SUBST(NEON_TARGET)
 AC_SUBST(NEON_OBJEXT)
 AC_SUBST(NEONOBJS)
 AC_SUBST(NEON_EXTRAOBJS)
-AC_SUBST(NE_LIBNEON_LTFLAGS)
-AC_SUBST(NE_LIBSSL_LTFLAGS)
+AC_SUBST(NEON_LINK_FLAGS)
 
 ])
 
 # The libtoolized build case:
 AC_DEFUN([NEON_LIBTOOL_BUILD], [
 
-NEON_LIBEXT=la
+NEON_TARGET=libneon.la
 NEON_OBJEXT=lo
 
 NEON_COMMON_BUILD($#, $*)
@@ -812,7 +811,7 @@ AC_PATH_TOOL(RANLIB, ranlib, :, $ne_PATH)
 # The non-libtool build case:
 AC_DEFUN([NEON_NORMAL_BUILD], [
 
-NEON_LIBEXT=a
+NEON_TARGET=libneon.a
 NEON_OBJEXT=o
 
 AC_REQUIRE([NE_FIND_AR])
@@ -882,8 +881,6 @@ AC_ARG_WITH(ssl,
 AC_ARG_WITH(egd,
 [[  --with-egd[=PATH]       enable EGD support [using EGD socket at PATH]]])
 
-NE_SSL_LIBNAME=none
-
 case $with_ssl in
 /*)
    AC_MSG_NOTICE([to use SSL libraries in non-standard locations, try --with-ssl --with-libs=$with_ssl])
@@ -952,8 +949,7 @@ gnutls)
       ;;
    esac
 
-   NE_SSL_CFLAGS=`$GNUTLS_CONFIG --cflags`
-   CPPFLAGS="$CPPFLAGS $NE_SSL_CFLAGS"   
+   CPPFLAGS="$CPPFLAGS `$GNUTLS_CONFIG --cflags`"
 
    AC_CHECK_HEADER([gnutls/gnutls.h],,
       [AC_MSG_ERROR([could not find gnutls/gnutls.h in include path])])
@@ -964,25 +960,20 @@ gnutls)
    AC_DEFINE([HAVE_GNUTLS], 1, [Define if GnuTLS support is enabled])
 
    # Check for functions in later releases
-   NE_CHECK_FUNCS([gnutls_session_get_data2 gnutls_x509_dn_get_rdn_ava \
-                   gnutls_sign_callback_set])
+   NE_CHECK_FUNCS(gnutls_session_get_data2 gnutls_x509_dn_get_rdn_ava)
 
    # Check for iconv support if using the new RDN access functions:
    if test ${ac_cv_func_gnutls_x509_dn_get_rdn_ava}X${ac_cv_header_iconv_h} = yesXyes; then
       AC_CHECK_FUNCS(iconv)
    fi
-
-   NE_SSL_LIBNAME=gnutls
    ;;
 *) # Default to off; only create crypto-enabled binaries if requested.
    NE_DISABLE_SUPPORT(SSL, [SSL support is not enabled])
    NE_DISABLE_SUPPORT(TS_SSL, [Thread-safe SSL support is not enabled])
    NEON_EXTRAOBJS="$NEON_EXTRAOBJS ne_stubssl"
    ;;
 esac
-
-AC_SUBST(NE_SSL_LIBNAME)
-AC_SUBST(NE_SSL_CFLAGS)
+AC_SUBST(NEON_SUPPORTS_SSL)
 
 AC_ARG_WITH(ca-bundle, 
   AS_HELP_STRING(--with-ca-bundle, specify filename of an SSL CA root bundle),,

neon-config.in

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Originally from libxml, Copyright (C) Daniel Veillard
-# Adapted for neon, Copyright (C) 2000-2008 Joe Orton.
+# Modifications for neon Copyright (C) 2000-2006 Joe Orton.
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -17,9 +17,7 @@ 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
@@ -70,14 +68,6 @@ 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@
        	;;
@@ -95,14 +85,6 @@ 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
 
@@ -119,8 +101,7 @@ while test $# -gt 0; do
 	;;
 
     *)
-        echo "neon-config: unrecognized option $1, see --help" 1>&2
-        exit 1
+	usage 1 1>&2
 	;;
     esac
     shift

src/Makefile.in

@@ -27,21 +27,20 @@ LIBTOOL = @LIBTOOL@
 CPPFLAGS = @DEFS@ @CPPFLAGS@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
-NE_LIBNEON_LTFLAGS = @NE_LIBNEON_LTFLAGS@
-NE_LIBSSL_LTFLAGS = @NE_LIBSSL_LTFLAGS@
+NEON_LINK_FLAGS = @NEON_LINK_FLAGS@
 # Note: don't substitute @LIBS@ in here; during a bundled
 # build of this directory, @LIBS@ may include -lneon.
 LIBS = @NEON_LIBS@ @NEON_LTLIBS@
 
 COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS)
 LINK = $(LIBTOOL) --quiet --mode=link $(CC) -no-undefined $(LDFLAGS)
 
-NEON_BASEOBJS = ne_request.@NEON_OBJEXT@ ne_session.@NEON_OBJEXT@		\
-	ne_basic.@NEON_OBJEXT@  ne_string.@NEON_OBJEXT@				\
-	ne_uri.@NEON_OBJEXT@ ne_dates.@NEON_OBJEXT@ ne_alloc.@NEON_OBJEXT@	\
-	ne_md5.@NEON_OBJEXT@ ne_utils.@NEON_OBJEXT@				\
-	ne_socket.@NEON_OBJEXT@ ne_auth.@NEON_OBJEXT@				\
-	ne_redirect.@NEON_OBJEXT@ ne_compress.@NEON_OBJEXT@			\
+NEON_BASEOBJS = ne_request.@NEON_OBJEXT@ ne_session.@NEON_OBJEXT@ 	    \
+	ne_basic.@NEON_OBJEXT@  ne_string.@NEON_OBJEXT@ 		    \
+	ne_uri.@NEON_OBJEXT@ ne_dates.@NEON_OBJEXT@ ne_alloc.@NEON_OBJEXT@  \
+	ne_md5.@NEON_OBJEXT@ ne_utils.@NEON_OBJEXT@    \
+	ne_socket.@NEON_OBJEXT@ ne_auth.@NEON_OBJEXT@ 			    \
+	ne_redirect.@NEON_OBJEXT@ ne_compress.@NEON_OBJEXT@		    \
 	ne_i18n.@NEON_OBJEXT@
 
 NEON_DAVOBJS = $(NEON_BASEOBJS) \
@@ -54,41 +53,30 @@ OBJECTS = @NEONOBJS@ @NEON_EXTRAOBJS@
 .SUFFIXES:
 .SUFFIXES: .c .lo .o
 
-.PHONY: all all-yes all-no libneon-gnutls libneon-none check-incl \
-	clean check-c++ update-deps
+NEON_TARGET = @NEON_TARGET@
 
+# Thanks to gettext for this neat trick.
 all: all-@NEON_BUILD_BUNDLED@
-all-yes: libneon.@NEON_LIBEXT@ libneon-@NE_SSL_LIBNAME@
+
+all-yes: $(NEON_TARGET)
 all-no:
 	@echo "Bundled neon build not being used."
 
-libneon-gnutls: libneon-gnutls.@NEON_LIBEXT@
-libneon-none:
-	@:
-
 .c.lo:
 	$(LIBTOOL) --quiet --mode=compile $(COMPILE) -c $< -o $@
 .c.o:
 	$(COMPILE) -c $< -o $@
 
 libneon.la: $(OBJECTS)
-	$(LINK) -rpath $(libdir) $(NE_LIBNEON_LTFLAGS) -o $@ $(OBJECTS) $(LIBS)
+	$(LINK) -rpath $(libdir) $(NEON_LINK_FLAGS) -o $@ $(OBJECTS) $(LIBS)
 
 libneon.a: $(OBJECTS)
 	@rm -f $@
 	$(AR) cru $@ $(OBJECTS)
 	$(RANLIB) $@
 
-libneon-@NE_SSL_LIBNAME@.a: lib_@NE_SSL_LIBNAME@.lo
-	@rm -f $@
-	$(AR) cru $@ @NE_SSL_LIBNAME@.lo
-	$(RANLIB) $@
-
-libneon-@NE_SSL_LIBNAME@.la: libneon.la lib_@NE_SSL_LIBNAME@.lo
-	$(LINK) -rpath $(libdir) $(NE_LIBSSL_LTFLAGS) -o $@ lib_@NE_SSL_LIBNAME@.lo ./libneon.la
-
 clean:
-	rm -f *.la *.o *.lo *.bbg *.bb *.gc*
+	rm -f $(NEON_TARGET) *.o *.lo *.bbg *.bb *.gc*
 	rm -rf .libs
 
 c++.c:
@@ -106,21 +94,13 @@ check-incl:
 
 # Update generated dependencies below; requires cc -MM as in gcc.
 update-deps:
-	for f in `echo $(OBJECTS) | sed 's/\\.@NEON_OBJEXT@/.c/g;s/ne_gnutls.c//;s/ne_openssl.c//'`; do \
+	for f in `echo $(OBJECTS) | sed 's/\\.@NEON_OBJEXT@/.c/g'`; do \
 	  $(CC) $(CPPFLAGS) -MM -c $$f; \
 	done | sed 's, \.\./, $$(top_builddir)/,g;s/\.o: /.@NEON''_OBJEXT@: /' > new-deps
 	sed '/[-]--CUT---/q' Makefile.in > Makefile.new
 	cat Makefile.new new-deps > Makefile.in
 	rm new-deps Makefile.new
 
-ne_openssl.@NEON_OBJEXT@: ne_openssl.c $(top_builddir)/config.h ne_ssl.h ne_defs.h ne_string.h \
-  ne_alloc.h ne_session.h ne_uri.h ne_socket.h ne_internal.h ne_private.h \
-  ne_request.h ne_utils.h ne_privssl.h
-ne_gnutls.@NEON_OBJEXT@: ne_gnutls.c $(top_builddir)/config.h ne_ssl.h ne_defs.h ne_string.h \
-  ne_alloc.h ne_session.h ne_uri.h ne_socket.h ne_internal.h ne_private.h \
-  ne_request.h ne_utils.h ne_privssl.h
-lib_gnutls.@NEON_OBJEXT@: lib_gnutls.c $(top_builddir)/config.h ne_privssl.h ne_defs.h \
-  ne_socket.h ne_gnutls.h
 #### ---CUT--- DO NOT REMOVE THIS LINE.  Generated dependencies follow.  ####
 ne_request.@NEON_OBJEXT@: ne_request.c $(top_builddir)/config.h ne_internal.h ne_defs.h ne_alloc.h \
   ne_request.h ne_utils.h ne_string.h ne_session.h ne_ssl.h ne_uri.h \
@@ -137,11 +117,10 @@ ne_dates.@NEON_OBJEXT@: ne_dates.c $(top_builddir)/config.h ne_alloc.h ne_defs.h
   ne_string.h
 ne_alloc.@NEON_OBJEXT@: ne_alloc.c $(top_builddir)/config.h ne_alloc.h ne_defs.h
 ne_md5.@NEON_OBJEXT@: ne_md5.c $(top_builddir)/config.h ne_md5.h ne_defs.h ne_string.h ne_alloc.h
-ne_utils.@NEON_OBJEXT@: ne_utils.c $(top_builddir)/config.h ne_utils.h ne_defs.h \
-  ne_string.h ne_alloc.h ne_dates.h
-ne_socket.@NEON_OBJEXT@: ne_socket.c $(top_builddir)/config.h ne_privssl.h ne_ssl.h \
-  ne_defs.h ne_socket.h ne_internal.h ne_utils.h ne_string.h ne_alloc.h \
-  ne_sspi.h
+ne_utils.@NEON_OBJEXT@: ne_utils.c $(top_builddir)/config.h ne_utils.h ne_defs.h ne_string.h \
+  ne_alloc.h ne_dates.h
+ne_socket.@NEON_OBJEXT@: ne_socket.c $(top_builddir)/config.h ne_privssl.h ne_ssl.h ne_defs.h \
+  ne_socket.h ne_internal.h ne_utils.h ne_string.h ne_alloc.h ne_sspi.h
 ne_auth.@NEON_OBJEXT@: ne_auth.c $(top_builddir)/config.h ne_md5.h ne_defs.h ne_dates.h \
   ne_request.h ne_utils.h ne_string.h ne_alloc.h ne_session.h ne_ssl.h \
   ne_uri.h ne_socket.h ne_auth.h ne_internal.h
@@ -170,3 +149,9 @@ ne_xmlreq.@NEON_OBJEXT@: ne_xmlreq.c $(top_builddir)/config.h ne_internal.h ne_d
 ne_acl.@NEON_OBJEXT@: ne_acl.c $(top_builddir)/config.h ne_request.h ne_utils.h ne_defs.h \
   ne_string.h ne_alloc.h ne_session.h ne_ssl.h ne_uri.h ne_socket.h \
   ne_locks.h ne_acl.h ne_xml.h
+ne_openssl.@NEON_OBJEXT@: ne_openssl.c $(top_builddir)/config.h ne_ssl.h ne_defs.h ne_string.h \
+  ne_alloc.h ne_session.h ne_uri.h ne_socket.h ne_internal.h ne_private.h \
+  ne_request.h ne_utils.h ne_privssl.h
+ne_gnutls.@NEON_OBJEXT@: ne_gnutls.c $(top_builddir)/config.h ne_ssl.h ne_defs.h ne_string.h \
+  ne_alloc.h ne_session.h ne_uri.h ne_socket.h ne_internal.h ne_private.h \
+  ne_request.h ne_utils.h ne_privssl.h