118584: remove internal neon and dependencies, build webdav ucp only if system neon is enabled

16 files changed, 8 insertions, 1740 deletions

diff --git a/configure.in b/configure.in
index edb0e9c98b20..947d9d75dbdb 100644
--- a/configure.in
+++ b/configure.in
@@ -526,9 +526,6 @@ AC_ARG_WITH(system-mdds,
 AC_ARG_WITH(system-vigra,
 [  --with-system-vigra     Use vigra already on system
 ],,)
-AC_ARG_ENABLE(neon,
-[  --disable-neon          Disable neon and the compilation of webdav binding
-],,)
 AC_ARG_ENABLE(Xaw,
 [  --disable-Xaw           Disables the use of Xaw for the Netscape/Mozilla
                            plugin
@@ -1240,13 +1237,11 @@ if test "$enable_copyleft" != "yes"; then
    enable_nss_module="no"
    enable_gstreamer="no"
    with_myspell_dicts="no"
-   enable_neon="no"
 
    DISABLE_HUNSPELL="TRUE"
    DISABLE_HYPHEN="TRUE"
    DISABLE_LIBWPD="TRUE"
    DISABLE_SAXON="TRUE"
-   DISABLE_NEON="TRUE"
 
    BUILD_EPM="NO"
 
@@ -1258,7 +1253,6 @@ else
    DISABLE_HYPHEN=
    DISABLE_LIBWPD=
    DISABLE_SAXON=
-   DISABLE_NEON=
 
    AC_MSG_RESULT([no])
 
@@ -1267,7 +1261,6 @@ AC_SUBST(DISABLE_HUNSPELL)
 AC_SUBST(DISABLE_HYPHEN)
 AC_SUBST(DISABLE_LIBWPD)
 AC_SUBST(DISABLE_SAXON)
-AC_SUBST(DISABLE_NEON)
 AC_SUBST(BUILD_EPM)
 
 
@@ -5020,19 +5013,9 @@ AC_SUBST(XRANDR_LIBS)
 AC_SUBST(ENABLE_RANDR)
 
 dnl ===================================================================
-dnl Check for building neon
-dnl ===================================================================
-AC_MSG_CHECKING([whether to use neon])
-if test "$enable_neon" = "no"; then
-    AC_MSG_RESULT([no])
-    DISABLE_NEON=TRUE
-    AC_SUBST(DISABLE_NEON)
-else
-    AC_MSG_RESULT([yes])
-dnl ===================================================================
 dnl Check for system neon
 dnl ===================================================================
-AC_MSG_CHECKING([which neon to use])
+AC_MSG_CHECKING([which neon is used])
 if test -n "$with_system_neon" -o -n "$with_system_libs" && \
 	test "$with_system_neon" != "no"; then
         AC_MSG_RESULT([external])
@@ -5040,18 +5023,11 @@ if test -n "$with_system_neon" -o -n "$with_system_libs" && \
         NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
         NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
         SYSTEM_NEON=YES
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_NEON=NO
-    NEON_LIBS=-lneon
-    NEON_CFLAGS=
-    BUILD_TYPE="$BUILD_TYPE NEON"
-fi
+fi	
 AC_SUBST(SYSTEM_NEON)
 AC_SUBST(NEON_VERSION)
 AC_SUBST(NEON_LIBS)
 AC_SUBST(NEON_CFLAGS)
-fi
 
 dnl ===================================================================
 dnl Check for system openssl
diff --git a/neon/makefile.mk b/neon/makefile.mk
deleted file mode 100644
index c92a84936f46..000000000000
--- a/neon/makefile.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=so_neon
-TARGET=so_neon
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_NEON)" == "YES"
-@all:
-    @echo "Using system neon...."
-.ENDIF
-
-.IF "$(DISABLE_NEON)" == "TRUE"
-@all:
-    @echo "neon disabled...."
-.ENDIF
-
-NEON_NAME=neon-0.29.5
-
-TARFILE_NAME=$(NEON_NAME)
-TARFILE_MD5=ff369e69ef0f0143beb5626164e87ae2
-PATCH_FILES=neon.patch
-
-.IF "$(GUI)"=="WNT"
-    PATCH_FILES+=neon_exports_win.patch
-.ELSE
-    PATCH_FILES+=neon_exports_unix.patch
-.ENDIF
-
-ADDITIONAL_FILES=src$/makefile.mk src$/config.h
-
-BUILD_DIR=src
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-
-OUT2INC= \
-    $(BUILD_DIR)$/ne_207.h \
-    $(BUILD_DIR)$/ne_alloc.h \
-    $(BUILD_DIR)$/ne_auth.h \
-    $(BUILD_DIR)$/ne_basic.h \
-    $(BUILD_DIR)$/ne_compress.h \
-    $(BUILD_DIR)$/ne_defs.h \
-    $(BUILD_DIR)$/ne_locks.h \
-    $(BUILD_DIR)$/ne_props.h \
-    $(BUILD_DIR)$/ne_redirect.h \
-    $(BUILD_DIR)$/ne_request.h \
-    $(BUILD_DIR)$/ne_session.h \
-    $(BUILD_DIR)$/ne_socket.h \
-    $(BUILD_DIR)$/ne_ssl.h \
-    $(BUILD_DIR)$/ne_string.h \
-    $(BUILD_DIR)$/ne_uri.h \
-    $(BUILD_DIR)$/ne_utils.h \
-    $(BUILD_DIR)$/ne_xml.h \
-    $(BUILD_DIR)$/ne_xmlreq.h
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
diff --git a/neon/neon.patch b/neon/neon.patch
deleted file mode 100644
index 473b88695ccc..000000000000
--- a/neon/neon.patch
+++ /dev/null
@@ -1,973 +0,0 @@
---- misc/neon-0.29.5/src/config.h	2011-02-03 10:32:38.000000000 +0100
-+++ misc/build/neon-0.29.5/src/config.h	2011-02-03 10:26:19.000000000 +0100
-@@ -1 +1,488 @@
--dummy
-+
-+/* Define to specific EGD socket path */
-+/* #undef EGD_PATH */
-+
-+/* Define if EGD should be supported */
-+/* #undef ENABLE_EGD */
-+
-+/* Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise */
-+/* #undef GSS_C_NT_HOSTBASED_SERVICE */
-+
-+/* Define to 1 if you have the <arpa/inet.h> header file. */
-+#ifdef UNX
-+#define HAVE_ARPA_INET_H 1
-+#endif
-+
-+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-+/* #undef HAVE_BIND_TEXTDOMAIN_CODESET 1 */
-+
-+/* Define to 1 if you have the declaration of `h_errno', and to 0 if you
-+   don't. */
-+#ifdef WIN32
-+#define HAVE_DECL_H_ERRNO 1
-+#endif
-+
-+/* Define to 1 if you have the declaration of `stpcpy', and to 0 if you don't.
-+   */
-+#ifdef LINUX
-+#define HAVE_DECL_STPCPY 1
-+#endif
-+
-+/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
-+   don't. */
-+#ifdef LINUX
-+#define HAVE_DECL_STRERROR_R 1
-+#endif
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#ifdef UNX
-+#define HAVE_DLFCN_H 1
-+#endif
-+
-+/* Define to 1 if you have the <errno.h> header file. */
-+#define HAVE_ERRNO_H 1
-+
-+/* Define if you have expat */
-+/* #undef HAVE_EXPAT */
-+
-+/* Define to 1 if you have the `fstat64' function. */
-+#define HAVE_FSTAT64
-+
-+/* Define to 1 if you have the `gai_strerror' function. */
-+#define HAVE_GAI_STRERROR 1
-+
-+/* Define if GnuTLS support is enabled */
-+/* #undef HAVE_GNUTLS */
-+
-+/* Define to 1 if you have the `gnutls_session_get_data2' function. */
-+/* #undef HAVE_GNUTLS_SESSION_GET_DATA2 */
-+
-+/* Define if GSSAPI support is enabled */
-+/* #undef HAVE_GSSAPI */
-+
-+/* Define to 1 if you have the <gssapi/gssapi_generic.h> header file. */
-+/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */
-+
-+/* Define to 1 if you have the <gssapi/gssapi.h> header file. */
-+/* #undef HAVE_GSSAPI_GSSAPI_H */
-+
-+/* Define to 1 if you have the <gssapi.h> header file. */
-+/* #undef HAVE_GSSAPI_H */
-+
-+/* Define to 1 if you have the `gss_init_sec_context' function. */
-+/* #undef HAVE_GSS_INIT_SEC_CONTEXT */
-+
-+/* Define to 1 if you have the `hstrerror' function. */
-+/* #undef HAVE_HSTRERROR */
-+
-+/* Define to 1 if you have the `inet_ntop' function. */
-+#ifdef UNX
-+#define HAVE_INET_NTOP 1
-+#endif
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#ifdef UNX
-+#define HAVE_INTTYPES_H 1
-+#endif
-+
-+/* Define to 1 if you have the `isatty' function. */
-+#define HAVE_ISATTY 1
-+
-+/* Define to 1 if you have the <libintl.h> header file. */
-+/* #undef HAVE_LIBINTL_H */
-+
-+/* Define if you have libxml */
-+#define HAVE_LIBXML 1
-+
-+/* Define to 1 if you have the <libxml/parser.h> header file. */
-+#define HAVE_LIBXML_PARSER_H 1
-+
-+/* Define to 1 if you have the <libxml/xmlversion.h> header file. */
-+#define HAVE_LIBXML_XMLVERSION_H 1
-+
-+/* Define to 1 if you have the <limits.h> header file. */
-+#define HAVE_LIMITS_H 1
-+
-+/* Define to 1 if you have the <locale.h> header file. */
-+#define HAVE_LOCALE_H 1
-+
-+/* Define to 1 if you have the `lseek64' function. */
-+#define HAVE_LSEEK64 1
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#define HAVE_MEMORY_H 1
-+
-+/* Define to 1 if you have the <netdb.h> header file. */
-+#ifdef UNX
-+#define HAVE_NETDB_H 1
-+#endif
-+
-+/* Define to 1 if you have the <netinet/in.h> header file. */
-+#ifdef UNX
-+#define HAVE_NETINET_IN_H 1
-+#endif
-+
-+/* Define to 1 if you have the <netinet/tcp.h> header file. */
-+#ifdef UNX
-+#define HAVE_NETINET_TCP_H 1
-+#endif
-+
-+/* Define if OpenSSL support is enabled */
-+#define HAVE_OPENSSL 1
-+
-+/* Define to 1 if you have the <openssl/opensslv.h> header file. */
-+#define HAVE_OPENSSL_OPENSSLV_H 1
-+
-+/* Define to 1 if you have the <openssl/ssl.h> header file. */
-+#define HAVE_OPENSSL_SSL_H 1
-+
-+/* Define to 1 if you have the `pipe' function. */
-+#define HAVE_PIPE 1
-+
-+/* Define to 1 if you have the `poll' function. */
-+#define HAVE_POLL 1
-+
-+/* Define to 1 if you have the `pthread_mutex_init' function. */
-+/* #undef HAVE_PTHREAD_MUTEX_INIT */
-+
-+/* Define to 1 if you have the `pthread_mutex_lock' function. */
-+/* #undef HAVE_PTHREAD_MUTEX_LOCK */
-+
-+/* Define to 1 if you have the `setlocale' function. */
-+#define HAVE_SETLOCALE 1
-+
-+/* Define to 1 if you have the `setsockopt' function. */
-+#if defined (LINUX) || defined (WIN32)
-+#define HAVE_SETSOCKOPT 1
-+#endif
-+
-+/* Define to 1 if you have the `setvbuf' function. */
-+#define HAVE_SETVBUF 1
-+
-+/* Define to 1 if you have the `shutdown' function. */
-+#ifdef LINUX
-+#define HAVE_SHUTDOWN 1
-+#endif
-+
-+/* Define to 1 if you have the `signal' function. */
-+#define HAVE_SIGNAL 1
-+
-+/* Define to 1 if you have the <signal.h> header file. */
-+#define HAVE_SIGNAL_H 1
-+
-+/* Define to 1 if you have the `snprintf' function. */
-+#ifdef UNX
-+#define HAVE_SNPRINTF 1
-+#endif
-+
-+#ifdef WIN32
-+#define snprintf _snprintf
-+#endif
-+
-+/* Define to 1 if you have the <socks.h> header file. */
-+/* #undef HAVE_SOCKS_H */
-+
-+/* Define to 1 if you have the <stdarg.h> header file. */
-+#define HAVE_STDARG_H 1
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#define HAVE_STDINT_H 1
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#define HAVE_STDLIB_H 1
-+
-+/* Define to 1 if you have the `stpcpy' function. */
-+#ifdef LINUX
-+#define HAVE_STPCPY 1
-+#endif
-+
-+/* Define to 1 if you have the `strcasecmp' function. */
-+#ifdef UNX
-+#define HAVE_STRCASECMP 1
-+#endif
-+
-+#ifdef WIN32
-+#define strcasecmp strcmpi
-+#endif
-+
-+/* Define to 1 if you have the `strerror_r' function. */
-+#ifdef LINUX
-+#define HAVE_STRERROR_R 1
-+#endif
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#ifdef UNX
-+#define HAVE_STRINGS_H 1
-+#endif
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#define HAVE_STRING_H 1
-+
-+/* Define to 1 if you have the `strtoll' function. */
-+#define HAVE_STRTOLL 1
-+
-+/* Define to 1 if you have the `strtoq' function. */
-+/* #undef HAVE_STRTOQ */
-+
-+/* Define to 1 if `tm_gmtoff' is member of `struct tm'. */
-+#ifdef LINUX
-+#define HAVE_STRUCT_TM_TM_GMTOFF 1
-+#endif
-+
-+/* Define to 1 if `__tm_gmtoff' is member of `struct tm'. */
-+/* #undef HAVE_STRUCT_TM___TM_GMTOFF */
-+
-+/* Define to 1 if you have the <sys/limits.h> header file. */
-+/* #undef HAVE_SYS_LIMITS_H */
-+
-+/* Define to 1 if you have the <sys/poll.h> header file. */
-+#ifdef UNX
-+#define HAVE_SYS_POLL_H 1
-+#endif
-+
-+/* Define to 1 if you have the <sys/select.h> header file. */
-+#ifdef UNX
-+#define HAVE_SYS_SELECT_H 1
-+#endif
-+
-+/* Define to 1 if you have the <sys/socket.h> header file. */
-+#ifdef UNX
-+#define HAVE_SYS_SOCKET_H 1
-+#endif
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#define HAVE_SYS_STAT_H 1
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#ifdef UNX
-+#define HAVE_SYS_TIME_H 1
-+#endif
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#define HAVE_SYS_TYPES_H 1
-+
-+/* Define if the timezone global is available */
-+#ifndef MACOSX
-+#define HAVE_TIMEZONE 1
-+#endif
-+
-+/* Use trio printf replacement library */
-+/* #undef HAVE_TRIO */
-+
-+/* Define to 1 if you have the <trio.h> header file. */
-+/* #undef HAVE_TRIO_H */
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#ifdef UNX
-+#define HAVE_UNISTD_H 1
-+#endif
-+
-+/* Define to 1 if you have the `usleep' function. */
-+#ifdef UNX
-+#define HAVE_USLEEP 1
-+#endif
-+
-+/* Define to 1 if you have the `vsnprintf' function. */
-+#if defined( UNX ) || (defined(_MSC_VER) && (_MSC_VER > 1400))
-+#define HAVE_VSNPRINTF 1
-+#endif
-+
-+#ifdef WIN32
-+#if (defined(_MSC_VER) && (_MSC_VER < 1500)) || defined(__MINGW32__)
-+#define vsnprintf _vsnprintf
-+#endif
-+#endif
-+
-+/* Define to be location of localedir */
-+/* #undef LOCALEDIR */
-+
-+/* Defined when neon is built as a library */
-+#define NEON_IS_LIBRARY 1
-+
-+/* Define to be the neon version string */
-+#define NEON_VERSION "0.29.5"
-+
-+/* Define to enable debugging */
-+/* #undef NE_DEBUGGING */
-+
-+/* Define to be printf format string for off64_t */
-+#define NE_FMT_OFF64_T "lld"
-+
-+/* Define to be printf format string for off_t */
-+#define NE_FMT_OFF_T "ld"
-+
-+/* Define to be printf format string for size_t */
-+#define NE_FMT_SIZE_T "u"
-+
-+/* Define to be printf format string for ssize_t */
-+#define NE_FMT_SSIZE_T "d"
-+
-+/* Define to be printf format string for time_t */
-+#define NE_FMT_TIME_T "ld"
-+
-+/* Defined if DAV is supported */
-+#define NE_HAVE_DAV 1
-+
-+/* Defined if I18N is supported */
-+/* #undef NE_HAVE_I18N 1 */
-+
-+/* Defined if IPV6 is supported */
-+#define NE_HAVE_IPV6 1
-+
-+/* Defined if LFS is supported */
-+#define NE_HAVE_LFS 1
-+
-+/* Defined if SOCKS is supported */
-+/* #undef NE_HAVE_SOCKS */
-+
-+/* Defined if SSL is supported */
-+#define NE_HAVE_SSL
-+
-+/* Defined if TS_SSL is supported */
-+/* #undef NE_HAVE_TS_SSL */
-+
-+/* Defined if ZLIB is supported */
-+#define NE_HAVE_ZLIB 1
-+
-+/* Define to be filename of an SSL CA root bundle */
-+/* #undef NE_SSL_CA_BUNDLE */
-+
-+/* Define if poll() should be used */
-+#ifdef UNX
-+#define NE_USE_POLL 1
-+#endif
-+
-+/* Define to be neon library major version */
-+#define NE_VERSION_MAJOR (0)
-+
-+/* Define to be neon library minor version */
-+#define NE_VERSION_MINOR (29)
-+
-+/* Define to be neon library patch version */
-+#define NE_VERSION_PATCH (5)
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#define PACKAGE_BUGREPORT "neon@webdav.org"
-+
-+/* Define to the full name of this package. */
-+#define PACKAGE_NAME "neon"
-+
-+/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "neon 0.29.5"
-+
-+/* Define to the one symbol short name of this package. */
-+#define PACKAGE_TARNAME "neon"
-+
-+/* Define to the version of this package. */
-+#define PACKAGE_VERSION "0.29.5"
-+
-+/* The size of a `int', as computed by sizeof. */
-+#define SIZEOF_INT 4
-+
-+/* The size of a `long', as computed by sizeof. */
-+#define SIZEOF_LONG 4
-+
-+/* The size of a `long long', as computed by sizeof. */
-+#define SIZEOF_LONG_LONG 8
-+
-+/* The size of a `off64_t', as computed by sizeof. */
-+#define SIZEOF_OFF64_T 8
-+
-+/* The size of a `off_t', as computed by sizeof. */
-+#define SIZEOF_OFF_T 4
-+
-+/* The size of a `size_t', as computed by sizeof. */
-+#define SIZEOF_SIZE_T 4
-+
-+/* The size of a `ssize_t', as computed by sizeof. */
-+#define SIZEOF_SSIZE_T 4
-+
-+/* The size of a `time_t', as computed by sizeof. */
-+#define SIZEOF_TIME_T 4
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#ifdef SOLARIS
-+#define STDC_HEADERS 1
-+#endif
-+
-+/* Define to 1 if strerror_r returns char *. */
-+#ifdef LINUX
-+#define STRERROR_R_CHAR_P 1
-+#endif
-+
-+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-+#define TIME_WITH_SYS_TIME 1
-+
-+/* Define if getaddrinfo supports AI_ADDRCONFIG */
-+/* #undef USE_GAI_ADDRCONFIG */
-+
-+/* Define if getaddrinfo() should be used */
-+#define USE_GETADDRINFO 1
-+
-+/* Define to 1 if your processor stores words with the most significant byte
-+   first (like Motorola and SPARC, unlike Intel and VAX). */
-+#if defined (SOLARIS) && defined (SPARC)
-+#define WORDS_BIGENDIAN 1
-+#endif
-+
-+/* Always defined to enable GNU extensions */
-+#define _GNU_SOURCE 1
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+/* #undef const */
-+
-+/* Define if in_addr_t is not available */
-+/* #undef in_addr_t */
-+
-+/* Define to `__inline__' or `__inline' if that's what the C compiler
-+   calls it, or to nothing if 'inline' is not supported under any name.  */
-+#ifndef __cplusplus
-+#if defined (SOLARIS) && defined (__SUNPRO_C)
-+#define inline
-+#endif
-+#endif
-+
-+/* Define to `long' if <sys/types.h> does not define. */
-+/* #undef off_t */
-+
-+/* Define to `int' if <sys/types.h> does not define. */
-+/* #undef pid_t */
-+
-+/* Define to `unsigned' if <sys/types.h> does not define. */
-+/* #undef size_t */
-+
-+/* MS IIS does not send Lock-Token response header after creation of a */
-+/* new lock. This violates RFC, but... if we want to talk with this   */
-+/* beast we need a workaround */
-+#define IIS_LOCK_BUG_WORKAROUND 1
-+
-+/* Enable leak-tracking versions of ne_*alloc when NEON_MEMLEAK is enabled */
-+#ifdef NEON_MEMLEAK
-+# include "memleak.h"
-+#endif
-+
-+#if defined(HAVE_STPCPY) && defined(HAVE_DECL_STPCPY) && !HAVE_DECL_STPCPY && !defined(stpcpy)
-+char *stpcpy(char *, const char *);
-+#endif
-+
-+#ifdef WIN32
-+
-+#include <io.h>
-+
-+#define HAVE_MEMCPY 1
-+
-+#define strncasecmp strnicmp
-+#define inline      __inline
-+#define WIN32_LEAN_AND_MEAN
-+#define NOUSER
-+#define NOGDI
-+#define NONLS
-+#define NOCRYPT
-+
-+#endif
-+
-+#ifdef WIN32
-+#define HAVE_SSPI 1
-+#else
-+#define HAVE_NTLM 1
-+#endif
---- misc/neon-0.29.5/src/makefile.mk	2011-02-03 10:32:38.000000000 +0100
-+++ misc/build/neon-0.29.5/src/makefile.mk	2011-02-03 10:26:19.000000000 +0100
-@@ -1 +1,102 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=neon
-+TARGET=neon
-+LIBTARGET=NO
-+USE_DEFFILE=TRUE
-+NO_DEFAULT_STL=TRUE
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+UWINAPILIB=
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  settings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+CDEFS+=-DHAVE_CONFIG_H
-+
-+.IF "$(SYSTEM_LIBXML)" == "YES"
-+CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
-+.ELSE
-+LIBXMLINCDIR=external$/libxml
-+CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR)
-+.ENDIF
-+
-+.IF "$(SYSTEM_OPENSSL)" == "YES"
-+CFLAGS+= $(OPENSSL_CFLAGS)
-+.ENDIF
-+
-+.IF "$(SYSTEM_ZLIB)" == "YES"
-+CFLAGS+=-DSYSTEM_ZLIB
-+.ELSE
-+ZLIBINCDIR=external$/zlib
-+CFLAGS+=-I$(SOLARINCDIR)$/$(ZLIBINCDIR)
-+.ENDIF
-+
-+SLOFILES= \
-+        $(SLO)$/ne_207.obj \
-+        $(SLO)$/ne_acl3744.obj \
-+        $(SLO)$/ne_alloc.obj \
-+        $(SLO)$/ne_auth.obj \
-+        $(SLO)$/ne_basic.obj \
-+        $(SLO)$/ne_compress.obj \
-+        $(SLO)$/ne_dates.obj \
-+        $(SLO)$/ne_i18n.obj \
-+        $(SLO)$/ne_locks.obj \
-+        $(SLO)$/ne_md5.obj \
-+        $(SLO)$/ne_props.obj \
-+        $(SLO)$/ne_redirect.obj \
-+        $(SLO)$/ne_request.obj \
-+        $(SLO)$/ne_session.obj \
-+        $(SLO)$/ne_socket.obj \
-+        $(SLO)$/ne_socks.obj \
-+        $(SLO)$/ne_string.obj \
-+        $(SLO)$/ne_uri.obj \
-+        $(SLO)$/ne_utils.obj \
-+        $(SLO)$/ne_xml.obj \
-+        $(SLO)$/ne_xmlreq.obj \
-+        $(SLO)$/ne_openssl.obj
-+
-+.IF "$(OS)"=="WNT"
-+SLOFILES+=$(SLO)$/ne_sspi.obj
-+.ELSE
-+SLOFILES+=$(SLO)$/ne_ntlm.obj
-+.ENDIF
-+
-+#       $(SLO)$/ne_gnutls.obj \
-+#       $(SLO)$/ne_stubssl.obj
-+
-+SHL1OBJS=$(SLOFILES)
-+SHL1TARGET=$(TARGET)
-+SHL1VERSIONMAP=exports.map
-+SHL1IMPLIB=i$(TARGET)
-+
-+SHL1STDLIBS+= $(LIBXML2LIB) \
-+              $(ZLIB3RDLIB)
-+
-+.IF "$(GUI)"=="WNT"
-+	SHL1STDLIBS+= $(WSOCK32LIB)
-+	.IF "$(WINDOWS_VISTA_PSDK)" != ""
-+		SHL1STDLIBS+= $(WS2_32LIB)
-+	.ENDIF
-+	SHL1STDLIBS+= $(OPENSSLLIB)
-+.ELSE # WNT
-+	.IF "$(OS)"=="SOLARIS"
-+		SHL1STDLIBS+= -lnsl -lsocket -ldl
-+	.ENDIF # SOLARIS
-+	.IF "$(OS)"=="OS2"
-+		SHL1STDLIBS+= pthread.lib libz.lib
-+	.ENDIF # OS2
-+	.IF "$(SYSTEM_OPENSSL)"=="YES"
-+		SHL1STDLIBS+= $(OPENSSLLIB)
-+	.ELSE
-+		SHL1STDLIBS+= $(OPENSSLLIBST)
-+	.ENDIF
-+.ENDIF # WNT
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+
-+# --- Targets ------------------------------------------------------
-+DEF1NAME=$(SHL1TARGET)
-+.INCLUDE :  target.mk
---- misc/neon-0.29.5/src/ne_auth.c	2010-10-14 17:00:53.000000000 +0200
-+++ misc/build/neon-0.29.5/src/ne_auth.c	2011-02-03 10:31:22.000000000 +0100
-@@ -367,7 +367,7 @@
- static int get_credentials(auth_session *sess, ne_buffer **errmsg, int attempt,
-                            struct auth_challenge *chall, char *pwbuf) 
- {
--    if (chall->handler->creds(chall->handler->userdata, sess->realm, 
-+    if (chall->handler->creds(chall->handler->userdata, chall->protocol->name, sess->realm, 
-                               chall->handler->attempt++, sess->username, pwbuf) == 0) {
-         return 0;
-     } else {
-@@ -385,15 +385,19 @@
- {
-     char *tmp, password[NE_ABUFSIZ];
- 
-+#if 0 /* Workaround - IIS sends challenge without realm. */
-+
-     /* Verify challenge... must have a realm */
-     if (parms->realm == NULL) {
-         challenge_error(errmsg, _("missing realm in Basic challenge"));
- 	return -1;
-     }
-+#endif
- 
-     clean_session(sess);
-     
--    sess->realm = ne_strdup(parms->realm);
-+    if (parms->realm != NULL)
-+        sess->realm = ne_strdup(parms->realm);
- 
-     if (get_credentials(sess, errmsg, attempt, parms, password)) {
- 	/* Failed to get credentials */
-@@ -610,10 +614,12 @@
-         return NULL;
- }
- 
--static int continue_sspi(auth_session *sess, int ntlm, const char *hdr)
-+static int continue_sspi(auth_session *sess, int ntlm, const char *hdr,
-+                         int attempt, struct auth_challenge *parms, ne_buffer **errmsg)
- {
-     int status;
-     char *response = NULL;
-+    char password[NE_ABUFSIZ];
-     
-     NE_DEBUG(NE_DBG_HTTPAUTH, "auth: SSPI challenge.\n");
-     
-@@ -630,8 +636,17 @@
-             return status;
-         }
-     }
--    
--    status = ne_sspi_authenticate(sess->sspi_context, hdr, &response);
-+   
-+    /* Authentification needs more than one http request.
-+     * As long as authentification in progress use the existing credentials.
-+     * Otherwise get new credentials.*/
-+    if (!hdr)
-+        if (get_credentials(sess, errmsg, attempt, parms, password)) {
-+            /* Failed to get credentials */
-+            return -1;
-+        } 
-+
-+    status = ne_sspi_authenticate(sess->sspi_context, hdr, &response, sess->username, password);
-     if (status) {
-         return status;
-     }
-@@ -651,7 +666,7 @@
- {
-     int ntlm = ne_strcasecmp(parms->protocol->name, "NTLM") == 0;
- 
--    return continue_sspi(sess, ntlm, parms->opaque);
-+    return continue_sspi(sess, ntlm, parms->opaque, attempt, parms, errmsg);
- }
- 
- static int verify_sspi(struct auth_request *req, auth_session *sess,
-@@ -674,7 +689,7 @@
-         return NE_OK;
-     }
- 
--    return continue_sspi(sess, ntlm, ptr);
-+    return continue_sspi(sess, ntlm, ptr, 0, NULL, NULL);
- }
- 
- #endif
---- misc/neon-0.29.5/src/ne_auth.h	2009-09-01 22:13:12.000000000 +0200
-+++ misc/build/neon-0.29.5/src/ne_auth.h	2011-02-03 10:26:20.000000000 +0100
-@@ -47,8 +47,8 @@
-  * Hint: if you just wish to attempt authentication just once (even if
-  * the user gets the username/password wrong), have the callback
-  * function use 'attempt' value as the function return value. */
--typedef int (*ne_auth_creds)(void *userdata, const char *realm, int attempt,
--			     char *username, char *password);
-+typedef int (*ne_auth_creds)(void *userdata, const char * auth_protocol,
-+                 const char *realm, int attempt, char *username, char *password);
- 
- /* Set callbacks to provide credentials for server and proxy
-  * authentication, using the default set of authentication protocols.
---- misc/neon-0.29.5/src/ne_defs.h	2010-01-11 23:57:34.000000000 +0100
-+++ misc/build/neon-0.29.5/src/ne_defs.h	2011-02-03 10:26:20.000000000 +0100
-@@ -41,7 +41,7 @@
- #endif
- 
- /* define ssize_t for Win32 */
--#if defined(WIN32) && !defined(ssize_t)
-+#if defined(WIN32) && !defined(ssize_t) && !defined(__MINGW32__)
- #define ssize_t int
- #endif
- 
---- misc/neon-0.29.5/src/ne_locks.c	2007-02-05 11:09:27.000000000 +0100
-+++ misc/build/neon-0.29.5/src/ne_locks.c	2011-02-03 10:26:21.000000000 +0100
-@@ -579,6 +579,23 @@
-         const char *token = ne_get_response_header(ctx->req, "Lock-Token");
-         /* at the root element; retrieve the Lock-Token header,
-          * and bail if it wasn't given. */
-+#ifdef IIS_LOCK_BUG_WORKAROUND
-+        /* MS IIS violates RFC 2518/4918. It does not send a Lock-Token response
-+           header upon successful creation of a new lock. As a workaround, we
-+           will try to pick the lock token from the response body (although
-+           this is not 100% safe in case of multiple activelocks). */
-+        if (token == NULL)
-+	  NE_DEBUG(NE_DBG_LOCKS,
-+		   "Ignoring missing LOCK response Lock-Token header\n");
-+
-+        if (token != NULL) {
-+	  if (token[0] == '<') token++;
-+	  ctx->token = ne_strdup(token);
-+	  ne_shave(ctx->token, ">");
-+	  NE_DEBUG(NE_DBG_LOCKS, "lk_startelm: Finding token %s\n",
-+		   ctx->token);
-+        }
-+#else
-         if (token == NULL) {
-             ne_xml_set_error(ctx->parser, 
-                              _("LOCK response missing Lock-Token header"));
-@@ -590,12 +607,28 @@
-         ne_shave(ctx->token, ">");
-         NE_DEBUG(NE_DBG_LOCKS, "lk_startelm: Finding token %s\n",
-                  ctx->token);
-+#endif
-     }
- 
-     /* TODO: only accept 'prop' as root for LOCK response */
-     if (!can_accept(parent, id))
-         return NE_XML_DECLINE;
- 
-+#ifdef IIS_LOCK_BUG_WORKAROUND
-+    if (id == ELM_activelock && ctx->found) {
-+      /* Found another activelock... */
-+      const char *token = ne_get_response_header(ctx->req, "Lock-Token");
-+      if (token == NULL) {
-+	/* Response contains more than one activelock and no Lock-Token
-+	 * response header. We are doomed. No safe workaround for IIS
-+	 * lock bug possible. */
-+	ne_xml_set_error(ctx->parser,
-+			 _("LOCK response missing Lock-Token header and more than one activelock"));
-+	return NE_XML_ABORT;
-+      }
-+    }
-+#endif
-+
-     if (id == ELM_activelock && !ctx->found) {
- 	/* a new activelock */
- 	ne_lock_free(&ctx->active);
-@@ -621,7 +654,12 @@
- 	return -1;
- 
-     if (state == ELM_activelock) {
-+#ifdef IIS_LOCK_BUG_WORKAROUND
-+      if (ctx->active.token) {
-+        ctx->token = ne_strdup(ctx->active.token);
-+#else
- 	if (ctx->active.token && strcmp(ctx->active.token, ctx->token) == 0) {
-+#endif
- 	    ctx->found = 1;
- 	}
-     }
---- misc/neon-0.29.5/src/ne_locks.h	2006-01-02 12:43:19.000000000 +0100
-+++ misc/build/neon-0.29.5/src/ne_locks.h	2011-02-03 10:26:21.000000000 +0100
-@@ -22,6 +22,10 @@
- #ifndef NE_LOCKS_H
- #define NE_LOCKS_H
- 
-+# if defined __GNUC__
-+# pragma GCC system_header
-+# endif
-+
- #include "ne_request.h" /* for ne_session + ne_request */
- #include "ne_uri.h" /* for ne_uri */
- 
---- misc/neon-0.29.5/src/ne_sspi.c	2007-08-10 17:26:08.000000000 +0200
-+++ misc/build/neon-0.29.5/src/ne_sspi.c	2011-02-03 10:26:21.000000000 +0100
-@@ -206,6 +206,45 @@
- }
- 
- /*
-+ * Simplification wrapper arround AcquireCredentialsHandle as most of
-+ * the parameters do not change.
-+ */
-+static int acquireCredentialsHandleForUsername(CredHandle * credentials, char *package, const char *username, const char *password)
-+{
-+    SECURITY_STATUS status;
-+    TimeStamp timestamp;
-+
-+	const char *domain = "";
-+
-+	int rc, rcISC;
-+	SecPkgInfo *secPackInfo;
-+	SEC_WINNT_AUTH_IDENTITY *nameAndPwd = NULL;
-+	int bytesReceived = 0, bytesSent = 0;
-+
-+	nameAndPwd = (SEC_WINNT_AUTH_IDENTITY *) malloc( sizeof(SEC_WINNT_AUTH_IDENTITY) );
-+	memset( nameAndPwd, '\0', sizeof (*nameAndPwd) );
-+	nameAndPwd->Domain = (unsigned char *) _strdup( domain? domain: "" );
-+	nameAndPwd->DomainLength = domain? strlen( domain ): 0;
-+	nameAndPwd->User = (unsigned char *) _strdup( username? username: "" );
-+	nameAndPwd->UserLength = username? strlen( username ): 0;
-+	nameAndPwd->Password = (unsigned char *) _strdup( password? password: "" );
-+	nameAndPwd->PasswordLength = password? strlen( password ): 0;
-+	nameAndPwd->Flags = SEC_WINNT_AUTH_IDENTITY_ANSI;
-+
-+	status = pSFT->AcquireCredentialsHandle( NULL, package, SECPKG_CRED_OUTBOUND,
-+		NULL, nameAndPwd, NULL, NULL, credentials, &timestamp );
-+
-+    if (status != SEC_E_OK) {
-+        NE_DEBUG(NE_DBG_HTTPAUTH,
-+                 "sspi: AcquireCredentialsHandle [fail] [%x].\n", status);
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
-+/*
-  * Wrapper arround initializeSecurityContext.  Supplies several
-  * default parameters as well as logging in case of errors.
-  */
-@@ -483,7 +522,7 @@
-  * Processes received authentication tokens as well as supplies the
-  * response token.
-  */
--int ne_sspi_authenticate(void *context, const char *base64Token, char **responseToken)
-+int ne_sspi_authenticate(void *context, const char *base64Token, char **responseToken, const char* username, const char* password)
- {
-     SecBufferDesc outBufferDesc;
-     SecBuffer outBuffer;
-@@ -561,13 +600,22 @@
-         /* Reset any existing context since we are starting over */
-         resetContext(sspiContext);
- 
--        if (acquireCredentialsHandle
--            (&sspiContext->credentials, sspiContext->mechanism) != SEC_E_OK) {
--                freeBuffer(&outBufferDesc);
--                NE_DEBUG(NE_DBG_HTTPAUTH,
--                    "sspi: acquireCredentialsHandle failed.\n");
--                return -1;
--        }
-+	if (strlen(username) != 0) {
-+	  if (acquireCredentialsHandleForUsername
-+	        (&sspiContext->credentials, sspiContext->mechanism, username, password) != SEC_E_OK) {
-+	    freeBuffer(&outBufferDesc);
-+	    NE_DEBUG(NE_DBG_HTTPAUTH, "sspi: acquireCredentialsHandleForUsername failed.\n");
-+	    return -1;
-+	  }
-+	} else {
-+	  if (acquireCredentialsHandle
-+	      (&sspiContext->credentials, sspiContext->mechanism) != SEC_E_OK) {
-+	    freeBuffer(&outBufferDesc);
-+	    NE_DEBUG(NE_DBG_HTTPAUTH, "sspi: acquireCredentialsHandle failed.\n");
-+	    return -1;
-+	  }
-+	}
-+
- 
-         securityStatus =
-             initializeSecurityContext(&sspiContext->credentials, NULL,
---- misc/neon-0.29.5/src/ne_sspi.h	2006-02-12 13:05:14.000000000 +0100
-+++ misc/build/neon-0.29.5/src/ne_sspi.h	2011-02-03 10:26:21.000000000 +0100
-@@ -41,7 +41,7 @@
- int ne_sspi_clear_context(void *context);
- 
- int ne_sspi_authenticate(void *context, const char *base64Token,
--                         char **responseToken);
-+                         char **responseToken, const char* username, const char* password);
- 
- #endif /* HAVE_SSPI */
- 
---- misc/neon-0.29.5/src/ne_uri.c	2007-12-05 12:04:47.000000000 +0100
-+++ misc/build/neon-0.29.5/src/ne_uri.c	2011-02-03 10:26:21.000000000 +0100
-@@ -42,7 +42,7 @@
- #include "ne_alloc.h"
- #include "ne_uri.h"
- 
--/* URI ABNF from RFC 3986: */
-+/* URI ABNF from RFC 3986: (TKR: SharePoint is contradictory to this RFC. So I fix it here. )*/
- 
- #define PS (0x0001) /* "+" */
- #define PC (0x0002) /* "%" */
-@@ -67,6 +67,9 @@
- 
- #define OT (0x4000) /* others */
- 
-+/* TKR new symbol */
-+#define WS (0x8000) /* Whitespaces ( Space, Tab ) */
-+
- #define URI_ALPHA (AL)
- #define URI_DIGIT (DG)
- 
-@@ -83,20 +86,21 @@
- /* pchar = unreserved / pct-encoded / sub-delims / ":" / "@" */
- #define URI_PCHAR (URI_UNRESERVED | PC | URI_SUBDELIM | CL | AT)
- /* invented: segchar = pchar / "/" */
--#define URI_SEGCHAR (URI_PCHAR | FS)
-+/* (TKR) WS added */
-+#define URI_SEGCHAR (URI_PCHAR | FS | WS)
- /* query = *( pchar / "/" / "?" ) */
- #define URI_QUERY (URI_PCHAR | FS | QU)
- /* fragment == query */
- #define URI_FRAGMENT URI_QUERY
- 
- /* any characters which should be path-escaped: */
--#define URI_ESCAPE ((URI_GENDELIM & ~(FS)) | URI_SUBDELIM | OT | PC)
-+#define URI_ESCAPE ((URI_GENDELIM & ~(FS)) | URI_SUBDELIM | OT | WS | PC)
- 
- static const unsigned int uri_chars[256] = {
- /* 0xXX    x0      x2      x4      x6      x8      xA      xC      xE     */
--/*   0x */ OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT,
-+/*   0x */ OT, OT, OT, OT, OT, OT, OT, OT, OT, WS, OT, OT, OT, OT, OT, OT,
- /*   1x */ OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT,
--/*   2x */ OT, SD, OT, GD, SD, PC, SD, SD, SD, SD, SD, PS, SD, DS, DT, FS,
-+/*   2x */ WS, SD, OT, GD, SD, PC, SD, SD, SD, SD, SD, PS, SD, DS, DT, FS,
- /*   3x */ DG, DG, DG, DG, DG, DG, DG, DG, DG, DG, CL, SD, OT, SD, OT, QU,
- /*   4x */ AT, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL,
- /*   5x */ AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, GD, OT, GD, OT, US,
---- misc/neon-0.29.5/src/ne_utils.c	2006-03-07 10:36:43.000000000 +0100
-+++ misc/build/neon-0.29.5/src/ne_utils.c	2011-02-03 10:26:21.000000000 +0100
-@@ -118,6 +118,9 @@
- #ifdef HAVE_GNUTLS
-     ", GNU TLS " LIBGNUTLS_VERSION
- #endif /* HAVE_GNUTLS */
-+#ifdef HAVE_SSPI
-+    ", SSPI"
-+#endif /* HAVE_SSPI */
-    "."
- ;
- 
-@@ -137,7 +140,7 @@
-     switch (feature) {
- #if defined(NE_HAVE_SSL) || defined(NE_HAVE_ZLIB) || defined(NE_HAVE_IPV6) \
-     || defined(NE_HAVE_SOCKS) || defined(NE_HAVE_LFS) \
--    || defined(NE_HAVE_TS_SSL) || defined(NE_HAVE_I18N)
-+    || defined(NE_HAVE_TS_SSL) || defined(NE_HAVE_I18N) || defined(HAVE_SSPI)
- #ifdef NE_HAVE_SSL
-     case NE_FEATURE_SSL:
- #endif
-@@ -159,6 +162,9 @@
- #ifdef NE_HAVE_I18N
-     case NE_FEATURE_I18N:
- #endif
-+#ifdef HAVE_SSPI
-+    case NE_FEATURE_SSPI:
-+#endif
-         return 1;
- #endif /* NE_HAVE_* */
-     default:
---- misc/neon-0.29.5/src/ne_utils.h	2007-07-16 08:54:57.000000000 +0200
-+++ misc/build/neon-0.29.5/src/ne_utils.h	2011-02-03 10:26:21.000000000 +0100
-@@ -54,6 +54,7 @@
- #define NE_FEATURE_SOCKS (5) /* SOCKSv5 support */
- #define NE_FEATURE_TS_SSL (6) /* Thread-safe SSL/TLS support */
- #define NE_FEATURE_I18N (7) /* i18n error message support */
-+#define NE_FEATURE_SSPI (8) /* NTLM/Negotiate authentication protocol via SSPI */
- 
- /* Returns non-zero if library is built with support for the given
-  * NE_FEATURE_* feature code 'code'. */
diff --git a/neon/neon_exports_unix.patch b/neon/neon_exports_unix.patch
deleted file mode 100644
index d162a145d707..000000000000
--- a/neon/neon_exports_unix.patch
+++ /dev/null
@@ -1,291 +0,0 @@
---- misc/neon-0.29.5/src/exports.map	2009-09-29 10:28:13.531250000 +0200
-+++ misc/build/neon-0.29.5/src/exports.map	2009-09-21 12:16:53.453125000 +0200
-@@ -0,0 +1,288 @@
-+UDK_3_0_0 {
-+	global:
-+		ne__negotiate_ssl;
-+		ne__ssl_exit;
-+		ne__ssl_init;
-+		ne_ssl_cert_cmp;
-+		ne_ssl_cert_digest;
-+		ne_ssl_cert_export;
-+		ne_ssl_cert_free;
-+		ne_ssl_cert_identity;
-+		ne_ssl_cert_import;
-+		ne_ssl_cert_issuer;
-+		ne_ssl_cert_read;
-+		ne_ssl_cert_signedby;
-+		ne_ssl_cert_subject;
-+		ne_ssl_cert_validity_time;
-+		ne_ssl_cert_write;
-+		ne_ssl_clicert_decrypt;
-+		ne_ssl_clicert_encrypted;
-+		ne_ssl_clicert_free;
-+		ne_ssl_clicert_name;
-+		ne_ssl_clicert_owner;
-+		ne_ssl_clicert_read;
-+		ne_ssl_context_create;
-+		ne_ssl_context_destroy;
-+		ne_ssl_context_keypair;
-+		ne_ssl_context_set_flag;
-+		ne_ssl_context_set_verify;
-+		ne_ssl_context_trustcert;
-+		ne_ssl_dname_cmp;
-+		ne_ssl_readable_dname;
-+		ne_ssl_set_clicert;
-+		ne_ssl_trust_default_ca;
-+		ne_xml_dispatch_request;
-+		ne_xml_parse_response;
-+		ne_xml_create;
-+		ne_xml_currentline;
-+		ne_xml_destroy;
-+		ne_xml_doc_encoding;
-+		ne_xml_failed;
-+		ne_xml_get_attr;
-+		ne_xml_get_error;
-+		ne_xml_mapid;
-+		ne_xml_parse;
-+		ne_xml_parse_v;
-+		ne_xml_push_handler;
-+		ne_xml_resolve_nspace;
-+		ne_xml_set_error;
-+		ne_debug;
-+		ne_debug_init;
-+		ne_debug_mask;
-+		ne_debug_stream;
-+		ne_has_support;
-+		ne_parse_statusline;
-+		ne_version_match;
-+		ne_version_string;
-+		ne_path_childof;
-+		ne_path_compare;
-+		ne_path_escape;
-+		ne_path_has_trailing_slash;
-+		ne_path_parent;
-+		ne_path_unescape;
-+		ne_uri_cmp;
-+		ne_uri_copy;
-+		ne_uri_defaultport;
-+		ne_uri_free;
-+		ne_uri_parse;
-+		ne_uri_resolve;
-+		ne_uri_unparse;
-+		ne_base64;
-+		ne_buffer_altered;
-+		ne_buffer_append;
-+		ne_buffer_clear;
-+		ne_buffer_concat;
-+		ne_buffer_create;
-+		ne_buffer_destroy;
-+		ne_buffer_finish;
-+		ne_buffer_grow;
-+		ne_buffer_ncreate;
-+		ne_buffer_snprintf;
-+		ne_buffer_zappend;
-+		ne_concat;
-+		ne_qtoken;
-+		ne_shave;
-+		ne_snprintf;
-+		ne_strcasecmp;
-+		ne_strclean;
-+		ne_strerror;
-+		ne_strncasecmp;
-+		ne_token;
-+		ne_tolower_array;
-+		ne_unbase64;
-+		ne_vsnprintf;
-+		ne__sock_sslsock;
-+		ne_addr_destroy;
-+		ne_addr_error;
-+		ne_addr_first;
-+		ne_addr_next;
-+		ne_addr_resolve;
-+		ne_addr_result;
-+		ne_iaddr_cmp;
-+		ne_iaddr_free;
-+		ne_iaddr_make;
-+		ne_iaddr_print;
-+		ne_iaddr_reverse;
-+		ne_iaddr_typeof;
-+		ne_sock_accept;
-+		ne_sock_accept_ssl;
-+		ne_sock_block;
-+		ne_sock_cipher;
-+		ne_sock_close;
-+		ne_sock_connect;
-+		ne_sock_connect_ssl;
-+		ne_sock_connect_timeout;
-+		ne_sock_create;
-+		ne_sock_error;
-+		ne_sock_exit;
-+		ne_sock_fd;
-+		ne_sock_fullread;
-+		ne_sock_fullwrite;
-+		ne_sock_init;
-+		ne_sock_peek;
-+		ne_sock_peer;
-+		ne_sock_prebind;
-+		ne_sock_proxy;
-+		ne_sock_read;
-+		ne_sock_read_timeout;
-+		ne_sock_readline;
-+		ne_sock_sessid;
-+		ne__ssl_set_verify_err;
-+		ne_close_connection;
-+		ne_fill_proxy_uri;
-+		ne_fill_server_uri;
-+		ne_get_error;
-+		ne_get_scheme;
-+		ne_get_server_hostport;
-+		ne_get_session_flag;
-+		ne_hook_close_conn;
-+		ne_hook_create_request;
-+		ne_hook_destroy_request;
-+		ne_hook_destroy_session;
-+		ne_hook_post_headers;
-+		ne_hook_post_send;
-+		ne_hook_pre_send;
-+		ne_session_create;
-+		ne_session_destroy;
-+		ne_session_proxy;
-+		ne_set_addrlist;
-+		ne_set_connect_timeout;
-+		ne_set_error;
-+		ne_set_localaddr;
-+		ne_set_notifier;
-+		ne_set_progress;
-+		ne_set_read_timeout;
-+		ne_set_session_flag;
-+		ne_set_session_private;
-+		ne_set_useragent;
-+		ne_ssl_cert_validity;
-+		ne_ssl_provide_clicert;
-+		ne_ssl_set_verify;
-+		ne_ssl_trust_cert;
-+		ne_unhook_close_conn;
-+		ne_unhook_create_request;
-+		ne_unhook_destroy_request;
-+		ne_unhook_destroy_session;
-+		ne_unhook_post_headers;
-+		ne_unhook_post_send;
-+		ne_unhook_pre_send;
-+		ne_version_pre_http11;
-+		ne_accept_2xx;
-+		ne_accept_always;
-+		ne_add_request_header;
-+		ne_add_response_body_reader;
-+		ne_begin_request;
-+		ne_discard_response;
-+		ne_end_request;
-+		ne_get_request_flag;
-+		ne_get_request_private;
-+		ne_get_response_header;
-+		ne_get_session;
-+		ne_get_session_private;
-+		ne_get_status;
-+		ne_print_request_header;
-+		ne_read_response_block;
-+		ne_read_response_to_fd;
-+		ne_request_create;
-+		ne_request_destroy;
-+		ne_request_dispatch;
-+		ne_response_header_iterate;
-+		ne_set_request_body_buffer;
-+		ne_set_request_body_fd;
-+		ne_set_request_body_provider;
-+		ne_set_request_flag;
-+		ne_set_request_private;
-+		ne_redirect_location;
-+		ne_redirect_register;
-+		ne_propfind_allprop;
-+		ne_propfind_create;
-+		ne_propfind_current_private;
-+		ne_propfind_destroy;
-+		ne_propfind_get_parser;
-+		ne_propfind_get_request;
-+		ne_propfind_named;
-+		ne_propfind_set_private;
-+		ne_propnames;
-+		ne_proppatch;
-+		ne_propset_iterate;
-+		ne_propset_lang;
-+		ne_propset_private;
-+		ne_propset_status;
-+		ne_propset_value;
-+		ne_simple_propfind;
-+		ne_ascii_to_md5;
-+		ne_md5_create_ctx;
-+		ne_md5_destroy_ctx;
-+		ne_md5_dup_ctx;
-+		ne_md5_finish_ascii;
-+		ne_md5_finish_ctx;
-+		ne_md5_process_block;
-+		ne_md5_process_bytes;
-+		ne_md5_read_ctx;
-+		ne_md5_reset_ctx;
-+		ne_md5_stream;
-+		ne_md5_to_ascii;
-+		ne_lock;
-+		ne_lock_copy;
-+		ne_lock_create;
-+		ne_lock_destroy;
-+		ne_lock_discover;
-+		ne_lock_free;
-+		ne_lock_refresh;
-+		ne_lock_using_parent;
-+		ne_lock_using_resource;
-+		ne_lockstore_add;
-+		ne_lockstore_create;
-+		ne_lockstore_destroy;
-+		ne_lockstore_findbyuri;
-+		ne_lockstore_first;
-+		ne_lockstore_next;
-+		ne_lockstore_register;
-+		ne_lockstore_remove;
-+		ne_unlock;
-+		ne_i18n_init;
-+		ne_asctime_parse;
-+		ne_httpdate_parse;
-+		ne_iso8601_parse;
-+		ne_rfc1036_parse;
-+		ne_rfc1123_date;
-+		ne_rfc1123_parse;
-+		ne_decompress_destroy;
-+		ne_decompress_reader;
-+		ne_add_depth_header;
-+		ne_copy;
-+		ne_delete;
-+		ne_get;
-+		ne_get_content_type;
-+		ne_get_range;
-+		ne_getmodtime;
-+		ne_mkcol;
-+		ne_move;
-+		ne_options;
-+		ne_options2;
-+		ne_post;
-+		ne_put;
-+		ne_add_proxy_auth;
-+		ne_add_server_auth;
-+		ne_forget_auth;
-+		ne_set_proxy_auth;
-+		ne_set_server_auth;
-+		ne_calloc;
-+		ne_malloc;
-+		ne_oom_callback;
-+		ne_realloc;
-+		ne_strdup;
-+		ne_strndup;
-+		ne_acl3744_set;
-+		ne_207_create;
-+		ne_207_destroy;
-+		ne_207_get_current_propstat;
-+		ne_207_get_current_response;
-+		ne_207_set_propstat_handlers;
-+		ne_207_set_response_handlers;
-+		ne_accept_207;
-+		ne_simple_request;
-+		GetVersionInfo;
-+	local:
-+		*;
-+};
diff --git a/neon/neon_exports_win.patch b/neon/neon_exports_win.patch
deleted file mode 100644
index 40f130e66da3..000000000000
--- a/neon/neon_exports_win.patch
+++ /dev/null
@@ -1,297 +0,0 @@
---- misc/neon-0.29.5/src/exports.map	2009-09-29 10:28:13.531250000 +0200
-+++ misc/build/neon-0.29.5/src/exports.map	2009-09-21 12:16:53.453125000 +0200
-@@ -0,0 +1,294 @@
-+UDK_3_0_0 {
-+	global:
-+		ne_sspi_authenticate;
-+		ne_sspi_clear_context;
-+		ne_sspi_create_context;
-+		ne_sspi_deinit;
-+		ne_sspi_destroy_context;
-+		ne_sspi_init;
-+		ne__negotiate_ssl;
-+		ne__ssl_exit;
-+		ne__ssl_init;
-+		ne_ssl_cert_cmp;
-+		ne_ssl_cert_digest;
-+		ne_ssl_cert_export;
-+		ne_ssl_cert_free;
-+		ne_ssl_cert_identity;
-+		ne_ssl_cert_import;
-+		ne_ssl_cert_issuer;
-+		ne_ssl_cert_read;
-+		ne_ssl_cert_signedby;
-+		ne_ssl_cert_subject;
-+		ne_ssl_cert_validity_time;
-+		ne_ssl_cert_write;
-+		ne_ssl_clicert_decrypt;
-+		ne_ssl_clicert_encrypted;
-+		ne_ssl_clicert_free;
-+		ne_ssl_clicert_name;
-+		ne_ssl_clicert_owner;
-+		ne_ssl_clicert_read;
-+		ne_ssl_context_create;
-+		ne_ssl_context_destroy;
-+		ne_ssl_context_keypair;
-+		ne_ssl_context_set_flag;
-+		ne_ssl_context_set_verify;
-+		ne_ssl_context_trustcert;
-+		ne_ssl_dname_cmp;
-+		ne_ssl_readable_dname;
-+		ne_ssl_set_clicert;
-+		ne_ssl_trust_default_ca;
-+		ne_xml_dispatch_request;
-+		ne_xml_parse_response;
-+		ne_xml_create;
-+		ne_xml_currentline;
-+		ne_xml_destroy;
-+		ne_xml_doc_encoding;
-+		ne_xml_failed;
-+		ne_xml_get_attr;
-+		ne_xml_get_error;
-+		ne_xml_mapid;
-+		ne_xml_parse;
-+		ne_xml_parse_v;
-+		ne_xml_push_handler;
-+		ne_xml_resolve_nspace;
-+		ne_xml_set_error;
-+		ne_debug;
-+		ne_debug_init;
-+		ne_debug_mask;
-+		ne_debug_stream;
-+		ne_has_support;
-+		ne_parse_statusline;
-+		ne_version_match;
-+		ne_version_string;
-+		ne_path_childof;
-+		ne_path_compare;
-+		ne_path_escape;
-+		ne_path_has_trailing_slash;
-+		ne_path_parent;
-+		ne_path_unescape;
-+		ne_uri_cmp;
-+		ne_uri_copy;
-+		ne_uri_defaultport;
-+		ne_uri_free;
-+		ne_uri_parse;
-+		ne_uri_resolve;
-+		ne_uri_unparse;
-+		ne_base64;
-+		ne_buffer_altered;
-+		ne_buffer_append;
-+		ne_buffer_clear;
-+		ne_buffer_concat;
-+		ne_buffer_create;
-+		ne_buffer_destroy;
-+		ne_buffer_finish;
-+		ne_buffer_grow;
-+		ne_buffer_ncreate;
-+		ne_buffer_snprintf;
-+		ne_buffer_zappend;
-+		ne_concat;
-+		ne_qtoken;
-+		ne_shave;
-+		ne_snprintf;
-+		ne_strcasecmp;
-+		ne_strclean;
-+		ne_strerror;
-+		ne_strncasecmp;
-+		ne_token;
-+		ne_tolower_array;
-+		ne_unbase64;
-+		ne_vsnprintf;
-+		ne__sock_sslsock;
-+		ne_addr_destroy;
-+		ne_addr_error;
-+		ne_addr_first;
-+		ne_addr_next;
-+		ne_addr_resolve;
-+		ne_addr_result;
-+		ne_iaddr_cmp;
-+		ne_iaddr_free;
-+		ne_iaddr_make;
-+		ne_iaddr_print;
-+		ne_iaddr_reverse;
-+		ne_iaddr_typeof;
-+		ne_sock_accept;
-+		ne_sock_accept_ssl;
-+		ne_sock_block;
-+		ne_sock_cipher;
-+		ne_sock_close;
-+		ne_sock_connect;
-+		ne_sock_connect_ssl;
-+		ne_sock_connect_timeout;
-+		ne_sock_create;
-+		ne_sock_error;
-+		ne_sock_exit;
-+		ne_sock_fd;
-+		ne_sock_fullread;
-+		ne_sock_fullwrite;
-+		ne_sock_init;
-+		ne_sock_peek;
-+		ne_sock_peer;
-+		ne_sock_prebind;
-+		ne_sock_proxy;
-+		ne_sock_read;
-+		ne_sock_read_timeout;
-+		ne_sock_readline;
-+		ne_sock_sessid;
-+		ne__ssl_set_verify_err;
-+		ne_close_connection;
-+		ne_fill_proxy_uri;
-+		ne_fill_server_uri;
-+		ne_get_error;
-+		ne_get_scheme;
-+		ne_get_server_hostport;
-+		ne_get_session_flag;
-+		ne_hook_close_conn;
-+		ne_hook_create_request;
-+		ne_hook_destroy_request;
-+		ne_hook_destroy_session;
-+		ne_hook_post_headers;
-+		ne_hook_post_send;
-+		ne_hook_pre_send;
-+		ne_session_create;
-+		ne_session_destroy;
-+		ne_session_proxy;
-+		ne_set_addrlist;
-+		ne_set_connect_timeout;
-+		ne_set_error;
-+		ne_set_localaddr;
-+		ne_set_notifier;
-+		ne_set_progress;
-+		ne_set_read_timeout;
-+		ne_set_session_flag;
-+		ne_set_session_private;
-+		ne_set_useragent;
-+		ne_ssl_cert_validity;
-+		ne_ssl_provide_clicert;
-+		ne_ssl_set_verify;
-+		ne_ssl_trust_cert;
-+		ne_unhook_close_conn;
-+		ne_unhook_create_request;
-+		ne_unhook_destroy_request;
-+		ne_unhook_destroy_session;
-+		ne_unhook_post_headers;
-+		ne_unhook_post_send;
-+		ne_unhook_pre_send;
-+		ne_version_pre_http11;
-+		ne_accept_2xx;
-+		ne_accept_always;
-+		ne_add_request_header;
-+		ne_add_response_body_reader;
-+		ne_begin_request;
-+		ne_discard_response;
-+		ne_end_request;
-+		ne_get_request_flag;
-+		ne_get_request_private;
-+		ne_get_response_header;
-+		ne_get_session;
-+		ne_get_session_private;
-+		ne_get_status;
-+		ne_print_request_header;
-+		ne_read_response_block;
-+		ne_read_response_to_fd;
-+		ne_request_create;
-+		ne_request_destroy;
-+		ne_request_dispatch;
-+		ne_response_header_iterate;
-+		ne_set_request_body_buffer;
-+		ne_set_request_body_fd;
-+		ne_set_request_body_provider;
-+		ne_set_request_flag;
-+		ne_set_request_private;
-+		ne_redirect_location;
-+		ne_redirect_register;
-+		ne_propfind_allprop;
-+		ne_propfind_create;
-+		ne_propfind_current_private;
-+		ne_propfind_destroy;
-+		ne_propfind_get_parser;
-+		ne_propfind_get_request;
-+		ne_propfind_named;
-+		ne_propfind_set_private;
-+		ne_propnames;
-+		ne_proppatch;
-+		ne_propset_iterate;
-+		ne_propset_lang;
-+		ne_propset_private;
-+		ne_propset_status;
-+		ne_propset_value;
-+		ne_simple_propfind;
-+		ne_ascii_to_md5;
-+		ne_md5_create_ctx;
-+		ne_md5_destroy_ctx;
-+		ne_md5_dup_ctx;
-+		ne_md5_finish_ascii;
-+		ne_md5_finish_ctx;
-+		ne_md5_process_block;
-+		ne_md5_process_bytes;
-+		ne_md5_read_ctx;
-+		ne_md5_reset_ctx;
-+		ne_md5_stream;
-+		ne_md5_to_ascii;
-+		ne_lock;
-+		ne_lock_copy;
-+		ne_lock_create;
-+		ne_lock_destroy;
-+		ne_lock_discover;
-+		ne_lock_free;
-+		ne_lock_refresh;
-+		ne_lock_using_parent;
-+		ne_lock_using_resource;
-+		ne_lockstore_add;
-+		ne_lockstore_create;
-+		ne_lockstore_destroy;
-+		ne_lockstore_findbyuri;
-+		ne_lockstore_first;
-+		ne_lockstore_next;
-+		ne_lockstore_register;
-+		ne_lockstore_remove;
-+		ne_unlock;
-+		ne_i18n_init;
-+		ne_asctime_parse;
-+		ne_httpdate_parse;
-+		ne_iso8601_parse;
-+		ne_rfc1036_parse;
-+		ne_rfc1123_date;
-+		ne_rfc1123_parse;
-+		ne_decompress_destroy;
-+		ne_decompress_reader;
-+		ne_add_depth_header;
-+		ne_copy;
-+		ne_delete;
-+		ne_get;
-+		ne_get_content_type;
-+		ne_get_range;
-+		ne_getmodtime;
-+		ne_mkcol;
-+		ne_move;
-+		ne_options;
-+		ne_options2;
-+		ne_post;
-+		ne_put;
-+		ne_add_proxy_auth;
-+		ne_add_server_auth;
-+		ne_forget_auth;
-+		ne_set_proxy_auth;
-+		ne_set_server_auth;
-+		ne_calloc;
-+		ne_malloc;
-+		ne_oom_callback;
-+		ne_realloc;
-+		ne_strdup;
-+		ne_strndup;
-+		ne_free;
-+		ne_acl3744_set;
-+		ne_207_create;
-+		ne_207_destroy;
-+		ne_207_get_current_propstat;
-+		ne_207_get_current_response;
-+		ne_207_set_propstat_handlers;
-+		ne_207_set_response_handlers;
-+		ne_accept_207;
-+		ne_simple_request;
-+	local:
-+		*;
-+};
diff --git a/neon/prj/build.lst b/neon/prj/build.lst
deleted file mode 100755
index a9786c796bd2..000000000000
--- a/neon/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-xh      neon  :  OPENSSL:openssl ZLIB:zlib stlport soltools external EXPAT:expat LIBXML2:libxml2 NULL
-xh      neon     usr1           -       all     xh_mkout NULL
-xh      neon     nmake          -       all     xh_neon NULL
diff --git a/neon/prj/d.lst b/neon/prj/d.lst
deleted file mode 100644
index a6c269e96600..000000000000
--- a/neon/prj/d.lst
+++ /dev/null
@@ -1,8 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\external
-mkdir: %_DEST%\inc%_EXT%\external\neon
-..\version.mk %_DEST%\inc%_EXT%\external\neon\version.mk
-..\%__SRC%\inc\ne_*.h %_DEST%\inc%_EXT%\external\neon\ne_*.h
-..\%__SRC%\lib\ineon.lib %_DEST%\lib%_EXT%\ineon.lib
-..\%__SRC%\bin\neon*.dll %_DEST%\bin%_EXT%\neon*.dll
-..\%__SRC%\lib\libneon*.so %_DEST%\lib%_EXT%\libneon*.so
-..\%__SRC%\lib\libneon*.dylib %_DEST%\lib%_EXT%\libneon*.dylib
\ No newline at end of file
diff --git a/neon/version.mk b/neon/version.mk
deleted file mode 100644
index 0bac1cd47f05..000000000000
--- a/neon/version.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# the major
-NEON_MAJOR=0
-# the minor
-NEON_MINOR=29
-# the micro
-NEON_MICRO=5
-
-# concat
-NEON_VERSION=$(NEON_MAJOR)$(NEON_MINOR)$(NEON_MICRO)
-
diff --git a/ooo.lst b/ooo.lst
index 20598b89ff1f..42ef7b66b12c 100644
--- a/ooo.lst
+++ b/ooo.lst
@@ -58,7 +58,6 @@ fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
 831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip
 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
 cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2
-ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
 220035f111ea045a51e290906025e8b5-libpng-1.5.1.tar.gz
 a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
 c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 298d248b82b8..74da9c5d033a 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -214,7 +214,7 @@ my_components +=     wpft
 my_components += emboleobj
 .END
 
-.IF "$(DISABLE_NEON)" != "TRUE"
+.IF "$(SYSTEM_NEON)" == "YES"
 my_components += ucpdav1
 .END
 
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index a995bcbaf652..2cc7a8c44c86 100755
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1396,11 +1396,8 @@ File gid_File_Lib_Ucpchelp1
     Styles = (PACKED);
 End
 
-#ifndef DISABLE_NEON
+#ifdef SYSTEM_NEON
 SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
- #ifndef SYSTEM_NEON
-   SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon)
- #endif
 #endif
 
 SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 0777c72a78cc..9550b58fba2a 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -223,9 +223,6 @@ SCPDEFS+=\
 
 SCPDEFS+=-DISOLANG_MAJOR=$(ISOLANG_MAJOR)
 
-.IF "$(DISABLE_NEON)" == "TRUE"
-SCPDEFS+=-DDISABLE_NEON
-.ENDIF
 .IF "$(SYSTEM_NEON)" == "YES"
 SCPDEFS+=-DSYSTEM_NEON
 .ENDIF
diff --git a/set_soenv.in b/set_soenv.in
index 3c09bc309fbf..939958e2369d 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1971,7 +1971,6 @@ ToFile( "SYSTEM_LIBJPEG",    "@SYSTEM_LIBJPEG@",   "e" );
 ToFile( "NEON_VERSION",      "@NEON_VERSION@",     "e" );
 ToFile( "NEON_LIBS",         "@NEON_LIBS@",        "e" );
 ToFile( "NEON_CFLAGS",       "@NEON_CFLAGS@",      "e" );
-ToFile( "DISABLE_NEON",      "@DISABLE_NEON@",     "e" );
 ToFile( "DISABLE_XAW",       "@DISABLE_XAW@",      "e" );
 ToFile( "ENABLE_AGG",        "@ENABLE_AGG@",       "e" );
 ToFile( "SYSTEM_AGG",	     "@SYSTEM_AGG@",       "e" );
diff --git a/ucb/prj/build.lst b/ucb/prj/build.lst
index 6f2d146aabbf..20f42e276bb6 100644
--- a/ucb/prj/build.lst
+++ b/ucb/prj/build.lst
@@ -1,4 +1,4 @@
-uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 LIBXSLT:libxslt offapi sal salhelper ucbhelper udkapi comphelper tools NULL
+uc ucb : cppuhelper CURL:curl OPENSSL:openssl LIBXML2:libxml2 LIBXSLT:libxslt offapi sal salhelper ucbhelper udkapi comphelper tools NULL
 uc	ucb							usr1	-	all	uc_mkout NULL
 uc	ucb\inc					    nmake	-	all	uc_inc NULL
 uc	ucb\source\regexp		    nmake	-	all	uc_regexp uc_inc NULL
diff --git a/ucb/source/ucp/webdav/makefile.mk b/ucb/source/ucp/webdav/makefile.mk
index 162d58266406..8d7591383943 100644
--- a/ucb/source/ucp/webdav/makefile.mk
+++ b/ucb/source/ucp/webdav/makefile.mk
@@ -48,10 +48,10 @@ NO_BSYMBOLIC=TRUE
 .INCLUDE: settings.mk
 .IF "$(L10N_framework)"==""
 
-.IF "$(DISABLE_NEON)" == "TRUE"
+.IF "$(SYSTEM_NEON)" != "YES"
 
 @all:
-    @echo "neon disabled...."
+    @echo "no system neon is used...."
 
 .ELSE
 
diff --git a/xmlsecurity/prj/build.lst b/xmlsecurity/prj/build.lst
index f480685a7dad..45b6126c6cb4 100644
--- a/xmlsecurity/prj/build.lst
+++ b/xmlsecurity/prj/build.lst
@@ -1,4 +1,4 @@
-xs	xmlsecurity	:    L10N:l10n xmloff unotools offapi unoil svx MOZ:moz SO:moz_prebuilt LIBXMLSEC:libxmlsec NSS:nss LIBXSLT:libxslt NEON:neon NULL
+xs	xmlsecurity	:    L10N:l10n xmloff unotools offapi unoil svx MOZ:moz SO:moz_prebuilt LIBXMLSEC:libxmlsec NSS:nss LIBXSLT:libxslt NULL
 xs	xmlsecurity                                                        usr1	 -	all	xs_mkout	NULL
 xs	xmlsecurity\inc				                                       nmake -	all	xs_inc NULL
 xs	xmlsecurity\source\framework                                       nmake -	all	xs_fw xs_inc NULL