You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2012/06/13 11:00:30 UTC
svn commit: r1349688 - in /subversion/trunk: ./ build/ac-macros/
build/generator/ build/generator/templates/ build/win32/
Author: hwright
Date: Wed Jun 13 09:00:29 2012
New Revision: 1349688
URL: http://svn.apache.org/viewvc?rev=1349688&view=rev
Log:
Don't build libsvn_ra_neon, in preparation for its removal.
See this thread for more info:
http://svn.haxx.se/dev/archive-2012-06/0195.shtml
* build/ac-macros/neon.m4,
build/generator/templates/neon.vcproj.ezt,
build/generator/templates/neon.vcxproj.ezt,
build/generator/templates/neon.dsp.ezt:
Remove.
* build/generator/gen_vcnet_vcproj.py,
build/generator/gen_msvc_dsp.py,
build/generator/gen_win.py,
build/win32/vc6-build.bat.in,
build/win32/make_dist.py,
configure.ac,
Makefile.in:
Remove neon bits.
* get-deps.sh:
Don't bother fetching the neon deps.
* build.conf:
Remove libsvn_ra_neon, and neon as depenencies.
Removed:
subversion/trunk/build/ac-macros/neon.m4
subversion/trunk/build/generator/templates/neon.dsp.ezt
subversion/trunk/build/generator/templates/neon.vcproj.ezt
subversion/trunk/build/generator/templates/neon.vcxproj.ezt
Modified:
subversion/trunk/Makefile.in
subversion/trunk/build.conf
subversion/trunk/build/generator/gen_msvc_dsp.py
subversion/trunk/build/generator/gen_vcnet_vcproj.py
subversion/trunk/build/generator/gen_win.py
subversion/trunk/build/win32/make_dist.py
subversion/trunk/build/win32/vc6-build.bat.in
subversion/trunk/configure.ac
subversion/trunk/get-deps.sh
Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1349688&r1=1349687&r2=1349688&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Wed Jun 13 09:00:29 2012
@@ -42,7 +42,6 @@ SVN_EXTERNAL_PROJECT_SUBDIRS = @SVN_EXTE
SCHEMA_DIR = subversion/svn/schema
-NEON_LIBS = @NEON_LIBS@
SVN_APR_LIBS = @SVN_APR_LIBS@
SVN_APRUTIL_LIBS = @SVN_APRUTIL_LIBS@
SVN_APR_MEMCACHE_LIBS = @SVN_APR_MEMCACHE_LIBS@
@@ -70,7 +69,6 @@ gnome_keyring_libdir = @libdir@
gpg_agent_libdir = @libdir@
gssapi_libdir = @libdir@
kwallet_libdir = @libdir@
-neon_libdir = @libdir@
serf_libdir = @libdir@
bindir = @bindir@
includedir = @includedir@
@@ -129,7 +127,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_KWALLET_INCLUDES@ @SVN_MAGIC_INCLUDES@ @SVN_NEON_INCLUDES@ \
+ @SVN_KWALLET_INCLUDES@ @SVN_MAGIC_INCLUDES@ \
@SVN_SASL_INCLUDES@ @SVN_SERF_INCLUDES@ @SVN_SQLITE_INCLUDES@ \
@SVN_XML_INCLUDES@ @SVN_ZLIB_INCLUDES@
@@ -218,7 +216,6 @@ libsvn_fs_fs_LDFLAGS = @libsvn_fs_fs_LDF
libsvn_fs_util_LDFLAGS = @libsvn_fs_util_LDFLAGS@
libsvn_ra_LDFLAGS = @libsvn_ra_LDFLAGS@
libsvn_ra_local_LDFLAGS = @libsvn_ra_local_LDFLAGS@
-libsvn_ra_neon_LDFLAGS = @libsvn_ra_neon_LDFLAGS@
libsvn_ra_serf_LDFLAGS = @libsvn_ra_serf_LDFLAGS@
libsvn_ra_svn_LDFLAGS = @libsvn_ra_svn_LDFLAGS@
libsvn_repos_LDFLAGS = @libsvn_repos_LDFLAGS@
@@ -245,7 +242,6 @@ INSTALL_GPG_AGENT_LIB = $(INSTALL_LIB)
INSTALL_GNOME_KEYRING_LIB = $(INSTALL_LIB)
INSTALL_GSSAPI_LIB = $(INSTALL_LIB)
INSTALL_KWALLET_LIB = $(INSTALL_LIB)
-INSTALL_NEON_LIB = $(INSTALL_LIB)
INSTALL_SERF_LIB = $(INSTALL_LIB)
INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL)
INSTALL_CONTRIB = $(LIBTOOL) --mode=install $(INSTALL)
@@ -584,15 +580,9 @@ external-clean external-distclean extern
revlist="$$i $$revlist"; \
done; \
for i in $$revlist; do \
- if test "$$i" = "neon" -a "$$target" = "extraclean"; then \
- echo "------ making distclean (no extraclean) in $$i"; \
- (cd $$i && $(MAKE) distclean) || exit 1; \
- echo "------ completed distclean (no extraclean) in $$i"; \
- else \
- echo "------ making $$target in $$i"; \
- (cd $$i && $(MAKE) $$target) || exit 1; \
- echo "------ completed $$target in $$i"; \
- fi; \
+ echo "------ making $$target in $$i"; \
+ (cd $$i && $(MAKE) $$target) || exit 1; \
+ echo "------ completed $$target in $$i"; \
done;
Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1349688&r1=1349687&r2=1349688&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Wed Jun 13 09:00:29 2012
@@ -84,32 +84,13 @@ swig-checkout-files = common.swg swigrun
# BUILD TARGETS
#
-# Explanation for the seemingly-spurious mention of 'neon' in the libs lines
-# for svn, svnsync, ra-local-test, client-test, svn-push and svnmucc:
-# This is a workaround for a libtool bug, which manifests on Linux and similar
-# ELF platforms, when linking to an installed Neon, and there are old
-# Subversion libraries in the same directory as the installed Neon. In such
-# cases, the run-before-installing version of the executables (.libs/lt-foo),
-# gets given an ELF RPATH which includes the install directory *before* all the
-# uninstalled libsvn_foo/.libs directories have been mentioned. This occurs
-# because when libtool is at the point of handling Neon, it adds an RPATH entry
-# pointing to its directory, but fails to correctly consider that it should
-# prioritize all the RPATH entries for *un*installed libraries before all those
-# for installed libraries, to avoid this bug. As a kludgy workaround, we add
-# a mention of 'neon' to the end of the libs lines for executables which
-# indirectly link to libsvn_ra_neon, which has the effect of 'pulling' the
-# harmful RPATH entry toward the end of RPATH, enabling the executables to run
-# correctly before installation, even when old versions of the Subversion
-# libraries are present.
-# This bug was last confirmed to be present in libtool 1.5.22.
-
# The subversion command-line client
[svn]
description = Subversion Client
type = exe
path = subversion/svn
libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr
- apriconv apr neon
+ apriconv apr
manpages = subversion/svn/svn.1
install = bin
@@ -154,7 +135,7 @@ msvc-libs = advapi32.lib ws2_32.lib
description = Subversion repository replicator
type = exe
path = subversion/svnsync
-libs = libsvn_ra libsvn_delta libsvn_subr apr neon
+libs = libsvn_ra libsvn_delta libsvn_subr apr
install = bin
manpages = subversion/svnsync/svnsync.1
@@ -178,7 +159,7 @@ manpages = subversion/svnrdump/svnrdump.
description = Subversion Multiple URL Command Client
type = exe
path = subversion/svnmucc
-libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr neon
+libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr
install = bin
manpages = subversion/svnmucc/svnmucc.1
@@ -274,14 +255,6 @@ add-install-deps = $(SVN_RA_LIB_INSTALL_
install = lib
msvc-export = svn_ra.h private\svn_ra_private.h
-# Accessing repositories via DAV through neon
-[libsvn_ra_neon]
-type = ra-module
-path = subversion/libsvn_ra_neon
-install = neon-lib
-libs = libsvn_delta libsvn_subr aprutil apriconv apr neon
-msvc-static = yes
-
# Accessing repositories via DAV through serf
[libsvn_ra_serf]
type = ra-module
@@ -615,7 +588,7 @@ description = Subversion Java HighLevel
type = lib
path = subversion/bindings/javahl/native
libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff
- libsvn_subr libsvn_fs aprutil apriconv apr neon
+ libsvn_subr libsvn_fs aprutil apriconv apr
sources = *.cpp *.c
add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS) $(javahl_callback_javah_DEPS) $(javahl_types_javah_DEPS)
install = javahl-lib
@@ -932,7 +905,7 @@ type = exe
path = subversion/tests/libsvn_client
sources = client-test.c
install = test
-libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr neon
+libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr
# ----------------------------------------------------------------------------
# Tests for libsvn_diff
@@ -963,7 +936,7 @@ path = subversion/tests/libsvn_ra_local
sources = ra-local-test.c
install = test
libs = libsvn_test libsvn_ra_local libsvn_ra libsvn_fs libsvn_delta libsvn_subr
- apriconv apr neon
+ apriconv apr
# ----------------------------------------------------------------------------
# Tests for libsvn_wc
@@ -1120,14 +1093,6 @@ external-lib = $(SVN_ZLIB_LIBS)
external-project = zlib
msvc-static = yes
-[neon]
-type = lib
-external-lib = $(NEON_LIBS)
-external-project = neon/neon
-libs = xml
-msvc-libs = ws2_32.lib
-msvc-static = yes
-
[apr_memcache]
type = lib
external-lib = $(SVN_APR_MEMCACHE_LIBS)
@@ -1150,7 +1115,7 @@ external-lib = $(SVN_XML_LIBS)
[ra-libs]
type = lib
external-lib = $(SVN_RA_LIB_LINK)
-libs = libsvn_ra_neon libsvn_ra_serf libsvn_ra_local libsvn_ra_svn
+libs = libsvn_ra_serf libsvn_ra_local libsvn_ra_svn
[fs-libs]
type = lib
@@ -1194,7 +1159,7 @@ libs = __ALL__
type = project
path = build/win32
libs = fs-libs ra-libs libsvn_client libsvn_subr libsvn_wc
- aprutil apriconv apr neon
+ aprutil apriconv apr
[__CONFIG__]
type = lib
Modified: subversion/trunk/build/generator/gen_msvc_dsp.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_msvc_dsp.py?rev=1349688&r1=1349687&r2=1349688&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_msvc_dsp.py (original)
+++ subversion/trunk/build/generator/gen_msvc_dsp.py Wed Jun 13 09:00:29 2012
@@ -129,7 +129,6 @@ class Generator(gen_win.WinGeneratorBase
('project_guid', self.makeguid('svn_locale')),
))
self.write_zlib_project_file('zlib.dsp')
- self.write_neon_project_file('neon.dsp')
self.write_serf_project_file('serf.dsp')
install_targets = self.get_install_targets()
Modified: subversion/trunk/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_vcnet_vcproj.py?rev=1349688&r1=1349687&r2=1349688&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/trunk/build/generator/gen_vcnet_vcproj.py Wed Jun 13 09:00:29 2012
@@ -156,7 +156,6 @@ class Generator(gen_win.WinGeneratorBase
('project_guid', self.makeguid('svn_locale')),
))
self.write_zlib_project_file('zlib' + self.vcproj_extension)
- self.write_neon_project_file('neon' + self.vcproj_extension)
self.write_serf_project_file('serf' + self.vcproj_extension)
install_targets = self.get_install_targets()
Modified: subversion/trunk/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1349688&r1=1349687&r2=1349688&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Wed Jun 13 09:00:29 2012
@@ -73,9 +73,6 @@ class GeneratorBase(gen_base.GeneratorBa
self.serf_path = None
self.serf_lib = None
self.bdb_path = 'db4-win32'
- self.without_neon = False
- self.neon_path = 'neon'
- self.neon_ver = 25005
self.httpd_path = None
self.libintl_path = None
self.zlib_path = 'zlib'
@@ -119,10 +116,6 @@ class GeneratorBase(gen_base.GeneratorBa
self.apr_iconv_path = val
elif opt == '--with-serf':
self.serf_path = val
- elif opt == '--with-neon':
- self.neon_path = val
- elif opt == '--without-neon':
- self.without_neon = True
elif opt == '--with-httpd':
self.httpd_path = val
del self.skip_sections['mod_dav_svn']
@@ -270,10 +263,6 @@ class WinGeneratorBase(GeneratorBase):
self._find_zlib()
self._find_ml()
- # Find neon version
- if self.neon_path:
- self._find_neon()
-
# Find serf and its dependencies
if self.serf_path:
self._find_serf()
@@ -391,9 +380,6 @@ class WinGeneratorBase(GeneratorBase):
if not self.serf_lib:
install_targets = [x for x in install_targets if x.name != 'serf']
install_targets = [x for x in install_targets if x.name != 'libsvn_ra_serf']
- if self.without_neon:
- install_targets = [x for x in install_targets if x.name != 'neon']
- install_targets = [x for x in install_targets if x.name != 'libsvn_ra_neon']
# Drop the swig targets if we don't have swig
if not self.swig_path and not self.swig_libdir:
@@ -690,9 +676,7 @@ class WinGeneratorBase(GeneratorBase):
and target.external_project):
return None
- if target.external_project[:5] == 'neon/':
- path = self.neon_path + target.external_project[4:]
- elif target.external_project[:5] == 'serf/' and self.serf_lib:
+ if target.external_project[:5] == 'serf/' and self.serf_lib:
path = self.serf_path + target.external_project[4:]
elif target.external_project.find('/') != -1:
path = target.external_project
@@ -715,8 +699,8 @@ class WinGeneratorBase(GeneratorBase):
if self.enable_nls and name == '__ALL__':
depends.extend(self.sections['locale'].get_targets())
- # Build ZLib as a dependency of Neon or Serf if we have it
- if self.zlib_path and (name == 'neon' or name == 'serf'):
+ # Build ZLib as a dependency of Serf if we have it
+ if self.zlib_path and name == 'serf':
depends.extend(self.sections['zlib'].get_targets())
# To set the correct build order of the JavaHL targets, the javahl-javah
@@ -881,26 +865,10 @@ class WinGeneratorBase(GeneratorBase):
if self.enable_nls:
fakedefines.append("ENABLE_NLS")
- # check for neon 0.26.x or newer
- if self.neon_ver >= 26000:
- fakedefines.append("SVN_NEON_0_26=1")
-
- # check for neon 0.27.x or newer
- if self.neon_ver >= 27000:
- fakedefines.append("SVN_NEON_0_27=1")
-
- # check for neon 0.28.x or newer
- if self.neon_ver >= 28000:
- fakedefines.append("SVN_NEON_0_28=1")
-
if self.serf_lib:
fakedefines.append("SVN_HAVE_SERF")
fakedefines.append("SVN_LIBSVN_CLIENT_LINKS_RA_SERF")
- if self.neon_lib:
- fakedefines.append("SVN_HAVE_NEON")
- fakedefines.append("SVN_LIBSVN_CLIENT_LINKS_RA_NEON")
-
# check we have sasl
if self.sasl_path:
fakedefines.append("SVN_HAVE_SASL")
@@ -938,7 +906,6 @@ class WinGeneratorBase(GeneratorBase):
self.path(util_includes) ])
else:
fakeincludes.extend([ self.apath(self.apr_util_path, "xml/expat/lib"),
- self.apath(self.neon_path, "src"),
self.path("subversion/bindings/swig/proxy"),
self.apath(self.bdb_path, "include") ])
@@ -988,7 +955,6 @@ class WinGeneratorBase(GeneratorBase):
libcfg = cfg.replace("Debug", "LibD").replace("Release", "LibR")
fakelibdirs = [ self.apath(self.bdb_path, "lib"),
- self.apath(self.neon_path),
self.apath(self.zlib_path),
]
@@ -1029,9 +995,6 @@ class WinGeneratorBase(GeneratorBase):
if self.bdb_lib:
dblib = self.bdb_lib+(cfg == 'Debug' and 'd.lib' or '.lib')
- if self.neon_lib:
- neonlib = self.neon_lib+(cfg == 'Debug' and 'd.lib' or '.lib')
-
if self.serf_lib:
if self.serf_ver_maj != 0:
serflib = 'serf-%d.lib' % self.serf_ver_maj
@@ -1080,9 +1043,6 @@ class WinGeneratorBase(GeneratorBase):
if dep.external_lib == '$(SVN_SQLITE_LIBS)' and not self.sqlite_inline:
nondeplibs.append('sqlite3.lib')
- if self.neon_lib and dep.external_lib == '$(NEON_LIBS)':
- nondeplibs.append(neonlib)
-
if self.serf_lib and dep.external_lib == '$(SVN_SERF_LIBS)':
nondeplibs.append(serflib)
@@ -1171,30 +1131,6 @@ class WinGeneratorBase(GeneratorBase):
('use_ml', self.have_ml and 1 or None),
))
- def write_neon_project_file(self, name):
- if self.without_neon:
- return
-
- neon_path = os.path.abspath(self.neon_path)
- neon_sources = map(lambda x : os.path.relpath(x, self.neon_path),
- glob.glob(os.path.join(neon_path, 'src', '*.c')))
- neon_headers = map(lambda x : os.path.relpath(x, self.neon_path),
- glob.glob(os.path.join(neon_path, 'src', '*.h')))
-
- self.move_proj_file(self.neon_path, name,
- (('neon_sources', neon_sources),
- ('neon_headers', neon_headers),
- ('expat_path',
- os.path.relpath(os.path.join(self.apr_util_path,
- 'xml', 'expat', 'lib'),
- self.neon_path)),
- ('zlib_path', os.path.relpath(self.zlib_path,
- self.neon_path)),
- ('openssl_path', os.path.relpath(self.openssl_path,
- self.neon_path)),
- ('project_guid', self.makeguid('neon')),
- ))
-
def write_serf_project_file(self, name):
if not self.serf_lib:
return
@@ -1232,7 +1168,7 @@ class WinGeneratorBase(GeneratorBase):
def move_proj_file(self, path, name, params=()):
### Move our slightly templatized pre-built project files into place --
- ### these projects include zlib, neon, serf, locale, config, etc.
+ ### these projects include zlib, serf, locale, config, etc.
dest_file = os.path.join(path, name)
source_template = os.path.join('templates', name + '.ezt')
@@ -1443,33 +1379,6 @@ class WinGeneratorBase(GeneratorBase):
finally:
fp.close()
- def _find_neon(self):
- "Find the neon version"
- msg = 'WARNING: Unable to determine neon version\n'
- if self.without_neon:
- self.neon_lib = None
- msg = 'Not attempting to find neon\n'
- else:
- try:
- self.neon_lib = "libneon"
- fp = open(os.path.join(self.neon_path, '.version'))
- txt = fp.read()
- vermatch = re.compile(r'(\d+)\.(\d+)\.(\d+)$', re.M) \
- .search(txt)
-
- if vermatch:
- version = tuple(map(int, vermatch.groups()))
- # build/ac-macros/swig.m4 explains the next incantation
- self.neon_ver = int('%d%02d%03d' % version)
- msg = 'Found neon version %d.%d.%d\n' % version
- if self.neon_ver < 25005:
- msg = 'WARNING: Neon version 0.25.5 or higher is required'
- except:
- msg = 'WARNING: Error while determining neon version\n'
- self.neon_lib = None
-
- print(msg)
-
def _get_serf_version(self):
"Retrieves the serf version from serf.h"
Modified: subversion/trunk/build/win32/make_dist.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/win32/make_dist.py?rev=1349688&r1=1349687&r2=1349688&view=diff
==============================================================================
--- subversion/trunk/build/win32/make_dist.py (original)
+++ subversion/trunk/build/win32/make_dist.py Wed Jun 13 09:00:29 2012
@@ -273,9 +273,6 @@ _disttree = {'': OptFile('%(readme)s', '
File('%(@apr-util)s/%(aprxml)s/xml.lib'),
File('%(@apr-util)s/%(aprxml)s/xml.pdb'),
),
- 'lib/neon': (File('%(@neon)s/libneon.lib'),
- OptFile('%(@zlib)s/zlibstat.lib'),
- ),
'lib/serf': (File('%(@serf)s/Release/serf.lib'),
),
@@ -286,7 +283,6 @@ _disttree = {'': OptFile('%(readme)s', '
'licenses': None,
'licenses/bdb': File('%(@berkeley-db)s/LICENSE'),
- 'licenses/neon': File('%(@neon)s/src/COPYING.LIB'),
'licenses/serf': File('%(@serf)s/LICENSE'),
'licenses/zlib': File('%(@zlib)s/README'),
'licenses/apr-util': (File('%(@apr-util)s/LICENSE'),
@@ -381,8 +377,6 @@ def _read_config():
os.path.abspath(os.path.join(_srcdir, 'apr-iconv')),
'@apr-util':
os.path.abspath(os.path.join(_srcdir, 'apr-util')),
- '@neon':
- os.path.abspath(os.path.join(_srcdir, 'neon')),
}
cfg = configparser.ConfigParser(path_defaults)
Modified: subversion/trunk/build/win32/vc6-build.bat.in
URL: http://svn.apache.org/viewvc/subversion/trunk/build/win32/vc6-build.bat.in?rev=1349688&r1=1349687&r2=1349688&view=diff
==============================================================================
--- subversion/trunk/build/win32/vc6-build.bat.in (original)
+++ subversion/trunk/build/win32/vc6-build.bat.in Wed Jun 13 09:00:29 2012
@@ -56,7 +56,6 @@ if not exist src-%DIR% goto svnerr
if not exist zlib goto zliberr
if not exist zlib\zlibstat.lib goto zlibstaterr
if not exist src-%DIR%\db4-win32 goto bdberr
-if not exist src-%DIR%\neon goto neonerr
if not exist gettext goto gettexterr
goto allok
@@ -84,9 +83,6 @@ goto end
:bdberr
echo Unable to find Berekely DB
goto end
-:neonerr
-echo Unable to find neon
-goto end
:gettexterr
echo Unable to find gettext
goto end
Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1349688&r1=1349687&r2=1349688&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Wed Jun 13 09:00:29 2012
@@ -115,29 +115,7 @@ AC_SUBST(SVN_LT_SOVERSION)
dnl Search for pkg-config
AC_PATH_PROG(PKG_CONFIG, pkg-config)
-# Either a space-separated list of allowable Neon versions, or "any" to
-# mean allow anything.
-NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28 0\.29"
-NEON_RECOMMENDED_VER="0.29.6"
-NEON_URL="http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz"
-dnl You can skip the neon version check only if you know what you are doing
-AC_ARG_ENABLE(neon-version-check,
- AS_HELP_STRING([--disable-neon-version-check],
- [do not check the Neon version]),
- [
- if test "$enableval" = "no" ; then
- NEON_ALLOWED_LIST="any"
- fi
- ],
- [])
-SVN_LIB_NEON($NEON_ALLOWED_LIST, $NEON_RECOMMENDED_VER, $NEON_URL)
-
-if test "$svn_lib_neon" = "yes"; then
- AC_DEFINE([SVN_HAVE_NEON], 1,
- [Defined if support for Neon is enabled])
-fi
-
-dnl Search for serf as an alternative to neon
+dnl Search for serf
SVN_LIB_SERF(1,0,0)
if test "$svn_lib_serf" = "yes"; then
@@ -840,12 +818,6 @@ if test "$svn_lib_berkeley_db" = "yes";
BDB_TEST_DEPS="\$(BDB_TEST_DEPS)"
BDB_TEST_PROGRAMS="\$(BDB_TEST_PROGRAMS)"
fi
-
-if test "$svn_lib_neon" = "yes"; then
- BUILD_RULES="$BUILD_RULES neon-lib"
- INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-ramod-lib/install-ramod-lib install-neon-lib/'`"
- INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-neon-lib"
-fi
if test "$svn_lib_serf" = "yes"; then
BUILD_RULES="$BUILD_RULES serf-lib"
@@ -924,10 +896,7 @@ AS_HELP_STRING([--with-openssl],
process where to locate the OpenSSL library when (and only when)
building Serf as an integrated part of the Subversion build
process. When linking to a previously installed version of Serf
- instead, you do not need to use this option. (Note that
- Subversion may also or alternatively be configured to use the
- Neon library for http:// and https:// access; see the
- --with-neon and --with-ssl options.)]),
+ instead, you do not need to use this option.]),
[])
AC_ARG_ENABLE(debug,
@@ -996,7 +965,6 @@ AC_SUBST([libsvn_fs_fs_LDFLAGS])
AC_SUBST([libsvn_fs_util_LDFLAGS])
AC_SUBST([libsvn_ra_LDFLAGS])
AC_SUBST([libsvn_ra_local_LDFLAGS])
-AC_SUBST([libsvn_ra_neon_LDFLAGS])
AC_SUBST([libsvn_ra_serf_LDFLAGS])
AC_SUBST([libsvn_ra_svn_LDFLAGS])
AC_SUBST([libsvn_repos_LDFLAGS])
@@ -1232,11 +1200,6 @@ AS_HELP_STRING([--enable-runtime-module-
])
if test "$svn_enable_shared" = "no" || test "$use_dso" != "yes"; then
- ### We want ra_local first to handle the following scenario:
- ### user has neon and db3 in /usr/local, and db4 in
- ### /usr/local/BerkeleyDB.4.0. If libsvn_ra_neon.la comes before
- ### libsvn_fs.la then libtool ends up linking libsvn_fs to the db3
- ### in /usr/local/lib
AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL, 1,
[Defined if libsvn_client should link against libsvn_ra_local])
svn_ra_lib_deps="\$(RA_LOCAL_DEPS)"
@@ -1248,14 +1211,6 @@ if test "$svn_enable_shared" = "no" || t
svn_ra_lib_deps="$svn_ra_lib_deps \$(RA_SVN_DEPS)"
svn_ra_lib_link="$svn_ra_lib_link \$(RA_SVN_LINK)"
- if test "$svn_lib_neon" = "yes"; then
- AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_NEON, 1,
- [Defined if libsvn_client should link against libsvn_ra_neon])
- svn_ra_lib_deps="$svn_ra_lib_deps \$(RA_NEON_DEPS)"
- svn_ra_lib_install_deps="$svn_ra_lib_install_deps install-neon-lib"
- svn_ra_lib_link="$svn_ra_lib_link \$(RA_NEON_LINK)"
- fi
-
if test "$svn_lib_serf" = "yes"; then
AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_SERF, 1,
[Defined if libsvn_client should link against libsvn_ra_serf])
Modified: subversion/trunk/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/get-deps.sh?rev=1349688&r1=1349687&r2=1349688&view=diff
==============================================================================
--- subversion/trunk/get-deps.sh (original)
+++ subversion/trunk/get-deps.sh Wed Jun 13 09:00:29 2012
@@ -25,7 +25,6 @@
APR=apr-1.4.6
APR_UTIL=apr-util-1.4.1
-NEON=neon-0.29.6
SERF=serf-1.0.1
ZLIB=zlib-1.2.6
SQLITE_VERSION=3.7.12
@@ -67,16 +66,6 @@ get_apr() {
mv $APR_UTIL apr-util
}
-get_neon() {
- cd $TEMPDIR
- $HTTP_FETCH http://webdav.org/neon/$NEON.tar.gz
- cd $BASEDIR
-
- gzip -dc $TEMPDIR/$NEON.tar.gz | tar -xf -
-
- mv $NEON neon
-}
-
get_serf() {
cd $TEMPDIR
$HTTP_FETCH http://serf.googlecode.com/files/$SERF.tar.bz2
@@ -124,7 +113,6 @@ get_deps() {
done
else
get_apr
- get_neon
get_serf
get_zlib
get_sqlite