Author: philip
Date: Fri Feb 22 13:11:28 2013
New Revision: 1449023
URL: http://svn.apache.org/r1449023
Log:
Remove obsolete configure options: --with-ssl, which was used by in-tree
neon builds, and --with-gssapi, which was used when GSSAPI support was in
ra_serf rather than serf itself.
* configure.ac: Remove --with-ssl and --with-gssapi.
* build/ac-macros/gssapi.m4: Remove.
* Makefile.in: Remove SVN_GSSAPI_LIBS, SVN_GSSAPI_INCLUDES, INSTALL_GSSAPI_LIB.
Removed:
subversion/trunk/build/ac-macros/gssapi.m4
Modified:
subversion/trunk/Makefile.in
subversion/trunk/configure.ac
Modified: subversion/trunk/Makefile.in
URL:
http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1449023&r1=1449022&r2=1449023&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Fri Feb 22 13:11:28 2013
@@ -48,7 +48,6 @@ SVN_APR_MEMCACHE_LIBS = @SVN_APR_MEMCACH
SVN_DB_LIBS = @SVN_DB_LIBS@
SVN_GPG_AGENT_LIBS = @SVN_GPG_AGENT_LIBS@
SVN_GNOME_KEYRING_LIBS = @SVN_GNOME_KEYRING_LIBS@
-SVN_GSSAPI_LIBS = @SVN_GSSAPI_LIBS@
SVN_KWALLET_LIBS = @SVN_KWALLET_LIBS@
SVN_MAGIC_LIBS = @SVN_MAGIC_LIBS@
SVN_SASL_LIBS = @SVN_SASL_LIBS@
@@ -126,7 +125,7 @@ LT_CXX_LIBADD = @LT_CXX_LIBADD@
INCLUDES = -I$(top_srcdir)/subversion/include -I$(top_builddir)/subversion \
@SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@
@SVN_APR_MEMCACHE_INCLUDES@ \
- @SVN_DB_INCLUDES@ @SVN_GNOME_KEYRING_INCLUDES@
@SVN_GSSAPI_INCLUDES@ \
+ @SVN_DB_INCLUDES@ @SVN_GNOME_KEYRING_INCLUDES@ \
@SVN_KWALLET_INCLUDES@ @SVN_MAGIC_INCLUDES@ \
@SVN_SASL_INCLUDES@ @SVN_SERF_INCLUDES@ @SVN_SQLITE_INCLUDES@ \
@SVN_XML_INCLUDES@ @SVN_ZLIB_INCLUDES@
@@ -249,7 +248,6 @@ INSTALL_APR_MEMCACHE_LIB = $(INSTALL_LIB
INSTALL_BDB_LIB = $(INSTALL_LIB)
INSTALL_GPG_AGENT_LIB = $(INSTALL_LIB)
INSTALL_GNOME_KEYRING_LIB = $(INSTALL_LIB)
-INSTALL_GSSAPI_LIB = $(INSTALL_LIB)
INSTALL_KWALLET_LIB = $(INSTALL_LIB)
INSTALL_SERF_LIB = $(INSTALL_LIB)
INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL)
Modified: subversion/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1449023&r1=1449022&r2=1449023&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Fri Feb 22 13:11:28 2013
@@ -132,14 +132,6 @@ if test "$svn_lib_serf" = "yes"; then
[Defined if support for Serf is enabled])
fi
-dnl Search for GSSAPI
-SVN_LIB_RA_SERF_GSSAPI
-
-if test "$svn_lib_gssapi" = "yes"; then
- AC_DEFINE([SVN_RA_SERF_HAVE_GSSAPI], 1,
- [Defined if support for GSSAPI is enabled])
-fi
-
dnl Search for apr_memcache (only affects fs_fs)
SVN_LIB_APR_MEMCACHE
@@ -892,20 +884,6 @@ AC_CHECK_HEADER(termios.h,[
dnl Process some configuration options ----------
-AC_ARG_WITH(ssl,
-AS_HELP_STRING([--with-ssl],
- [This option does NOT affect the Subversion build process in any
- way. It enables OpenSSL support in the Neon HTTP client
- library. If and only if you are building Neon as an integrated
- part of the Subversion build process, rather than linking to
- an already installed version of Neon, you probably want to pass
- this option so that Neon (and so indirectly, Subversion) will
- be capable of https:// access via that library. (Note that
- Subversion may also or alternatively be configured to use
- the Serf library for http:// and https:// access; see the
- --with-serf and --with-openssl options.)]),
-[])
-
AC_ARG_WITH(openssl,
AS_HELP_STRING([--with-openssl],
[This option does NOT affect the Subversion build process in any
