Index: Makefile.in
===================================================================
--- Makefile.in	(revision 11920)
+++ Makefile.in	(working copy)
@@ -42,6 +42,7 @@
 EXTERNAL_PROJECT_DIRS = @SVN_SUBDIRS@
 
 NEON_LIBS = @NEON_LIBS@
+SVN_SSL_LIBS = @SVN_SSL_LIBS@
 SVN_APR_LIBS = @SVN_APR_LIBS@
 SVN_APRUTIL_LIBS = @SVN_APRUTIL_LIBS@
 SVN_DB_LIBS =
@@ -104,7 +105,7 @@
 LT_CXX_LIBADD = @LT_CXX_LIBADD@
 
 INCLUDES = @SVN_EXTRA_INCLUDES@ @SVN_NEON_INCLUDES@                    \
-           @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@
+           @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@ @SVN_SSL_INCLUDES@
 
 APACHE_INCLUDES = @APACHE_INCLUDES@
 APACHE_TARGET = @APACHE_TARGET@
Index: build.conf
===================================================================
--- build.conf	(revision 11920)
+++ build.conf	(working copy)
@@ -80,7 +80,7 @@
 type = exe
 path = subversion/clients/cmdline
 libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
-	aprutil apriconv apr neon
+	aprutil apriconv apr neon ssl
 manpages = subversion/clients/cmdline/svn.1
 install = bin
 
@@ -189,7 +189,7 @@
 type = ra-module
 path = subversion/libsvn_ra_svn
 install = ramod-lib
-libs = libsvn_delta libsvn_subr aprutil apriconv apr
+libs = libsvn_delta libsvn_subr aprutil apriconv apr ssl
 msvc-static = yes
 
 # Accessing repositories via direct libsvn_fs
@@ -253,7 +253,7 @@
 install = bin
 manpages = subversion/svnserve/svnserve.8 subversion/svnserve/svnserve.conf.5
 libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr libsvn_ra_svn
-       aprutil apriconv apr
+       aprutil apriconv apr ssl
 
 [svnversion]
 description = Subversion Revision Extractor
@@ -824,6 +824,10 @@
 external-lib = $(SVN_FS_LIB_LINK)
 libs = libsvn_fs_base libsvn_fs_fs
 
+[ssl]
+type = lib
+external-lib = $(SVN_SSL_LIBS)
+
 [__ALL__]
 type = project
 path = build/win32
Index: configure.in
===================================================================
--- configure.in	(revision 11920)
+++ configure.in	(working copy)
@@ -65,6 +65,7 @@
 sinclude(build/ac-macros/aprutil.m4)
 sinclude(build/ac-macros/java.m4)
 sinclude(build/ac-macros/swig.m4)
+sinclude(build/ac-macros/ssl.m4)
 
 
 dnl Grab the libtool macros
@@ -284,6 +285,16 @@
 SVN_LIB_BERKELEY_DB($SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MINOR,
                     $SVN_FS_WANT_DB_PATCH, [db4 db])
 
+# Check for SSL
+SVN_LIB_SSL()
+if test "$svn_lib_ssl" = "yes"; then
+  AC_DEFINE(SVN_HAVE_SSL, 1,
+                [Define to 1 to use OpenSSL.])
+else
+  AC_DEFINE(SVN_HAVE_SSL, 0,
+                [Define to 1 to use OpenSSL.])
+fi
+
 dnl I18n -------------------
 
 AC_ARG_ENABLE(nls,
Index: build/ac-macros/ssl.m4
===================================================================
--- build/ac-macros/ssl.m4	(revision 0)
+++ build/ac-macros/ssl.m4	(revision 0)
@@ -0,0 +1,38 @@
+dnl   SVN_LIB_SSL
+dnl
+dnl   If we find a useable version, set the shell variable
+dnl   `svn_lib_ssl' to `yes'.  Otherwise, set `svn_lib_ssl'
+dnl   to `no'. 
+dnl
+dnl   For the moment, we require that Neon library is used,
+dnl   and that SVN_NEON_CONFIG() has been called earlier.
+
+
+AC_DEFUN(SVN_LIB_SSL,
+[
+  AC_MSG_NOTICE([OpenSSL configuration])
+  AC_ARG_WITH(ssl,
+              AC_HELP_STRING([--with-ssl],
+              [Enable SSL. Assumes that the Neon libary is used.]),
+  [
+    svn_lib_ssl=no
+    if test "$withval" = "no"; then
+      AC_MSG_ERROR([No arguments to --with-ssl are allowed.])
+     else
+      svn_neon_ssl_test="`echo $CFLAGS | sed -e 's/DNEON_SSL//g'`"
+      if test "$svn_neon_ssl_test" != "$CFLAGS"; then
+         SVN_SSL_LIBS=$NEON_LIBS
+         SVN_SSL_INCLUDE=$SVN_NEON_INCLUDES
+         svn_lib_ssl=yes
+      else
+         AC_MSG_ERROR([--with-ssl requires Neon.])
+      fi
+    fi
+  ],
+  [
+    # No --with-ssl option:
+    svn_lib_ssl=no
+  ])
+  AC_SUBST(SVN_SSL_LIBS)
+  AC_SUBST(SVN_SSL_INCLUDES)
+])
Index: svn-config.in
===================================================================
--- svn-config.in	(revision 11920)
+++ svn-config.in	(working copy)
@@ -22,10 +22,10 @@
 libdir="@libdir@"
 includedir="@includedir@"
 
-LIBS="@NEON_LIBS@ @SVN_APRUTIL_EXPORT_LIBS@ @SVN_APR_EXPORT_LIBS@ @SVN_DB_LIBS@ @LIBS@"
+LIBS="@NEON_LIBS@ @SVN_SSL_LIBS@ @SVN_APRUTIL_EXPORT_LIBS@ @SVN_APR_EXPORT_LIBS@ @SVN_DB_LIBS@ @LIBS@"
 CFLAGS="@CFLAGS@"
 CPPFLAGS="@CPPFLAGS@"
-INCLUDES="@SVN_NEON_INCLUDES@ @SVN_DB_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@"
+INCLUDES="@SVN_NEON_INCLUDES@ @SVN_SSL_INCLUDES@ @SVN_DB_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@"
 LDFLAGS="@LDFLAGS@"
 
 SVN_SOURCE_DIR="@abs_srcdir@"