Author: philip
Date: Fri Mar 15 12:21:46 2013
New Revision: 1456924
URL: http://svn.apache.org/r1456924
Log:
Remove support for in-tree apr, apr-util and apr-memcache builds. The
only external project we now build in-tree is SQLite.
* Makefile.in
(SVN_EXTERNAL_PROJECT_SUBDIRS, external-all, external-install,
external-clean, external-distclean, external-extraclean): Remove.
(all, clean, distclean, extra-clean, install): Remove external support
* build/ac-macros/svn-macros.m4
(SVN_EXTERNAL_PROJECT_SETUP, SVN_EXTERNAL_PROJECT): Remove.
* build/ac-macros/apr.m4: Don't look for source or setup as an external
project, error on reconfig, tweak download message.
* build/ac-macros/aprutil.m4: Don't look for source or setup as an external
project, error on reconfig, tweak name in messages, tweak download message.
* build/ac-macros/apr_memcache.m4: Don't look for source or setup as an
external project.
* INSTALL: Remove in-tree details.
Modified:
subversion/trunk/INSTALL
subversion/trunk/Makefile.in
subversion/trunk/build/ac-macros/apr.m4
subversion/trunk/build/ac-macros/apr_memcache.m4
subversion/trunk/build/ac-macros/aprutil.m4
subversion/trunk/build/ac-macros/svn-macros.m4
Modified: subversion/trunk/INSTALL
URL:
http://svn.apache.org/viewvc/subversion/trunk/INSTALL?rev=1456924&r1=1456923&r2=1456924&view=diff
==============================================================================
--- subversion/trunk/INSTALL (original)
+++ subversion/trunk/INSTALL Fri Mar 15 12:21:46 2013
@@ -243,11 +243,10 @@ I. INTRODUCTION
be able to find them.
There are a couple of options to "./configure" that tell it where
- to look for the APR and APR-util libraries. By default, it will first
- look for bundled versions of APR and APR-util, and then try to locate
- already installed versions of the libraries using the apr-config and
- apu-config scripts. These scripts provide all the relevant information
- for the APR and APR-util installations.
+ to look for the APR and APR-util libraries. By default it will try
+ to locate the libraries using apr-config and apu-config scripts.
+ These scripts provide all the relevant information for the APR and
+ APR-util installations.
If you want to specify the location of the APR library, you can use
the "--with-apr=" option of "./configure". It should be able to find
@@ -264,10 +263,6 @@ I. INTRODUCTION
$ ./configure --with-apr=/usr/local/apache2 \
--with-apr-util=/usr/local/apache2 ...
- If you want Subversion to build the APR libraries from source
- code as part of the Subversion build process, you can put their
- source code into the "./apr" and "./apr-util" directories.
-
Be sure to use a native Windows SVN client (as opposed to
Cygwin's version) so that the .dsp files get carriage-returns at
the ends of their lines. Otherwise Visual Studio will complain
@@ -278,9 +273,12 @@ I. INTRODUCTION
library's directory, to regenerate the configure scripts and
other files required for compiling the libraries:
- $ cd apr; ./buildconf; cd ..
+ $ cd apr; ./buildconf; ./configure ...; make; make install; cd ..
+
+ $ cd apr-util; ./buildconf; ./configure ...; make; make install; cd ..
- $ cd apr-util; ./buildconf; cd ..
+ Configure build and install both libraries before running Subversion's
+ configure script.
2. Zlib (REQUIRED)
@@ -695,19 +693,6 @@ II. INSTALLATION
It probably means that the dynamic loader/linker can't find all
of the libsvn_* libraries.
- Note that if you commonly build with the -jN option to make and
- have used the get-deps.sh script to fetch dependencies, the make
- step above may fail, because we don't ensure that third party
- libraries in our source tree will finish building before
- subversion itself. If you want to use -jN, use the following
- instead:
-
- $ ./configure
- $ make -jN external-all
- $ make -jN local-all
- $ make check
- # make install
-
C. Building under Unix in Different Directories
--------------------------------------------
@@ -717,7 +702,7 @@ II. INSTALLATION
$ svn co https://svn.apache.org/repos/asf/subversion/trunk svn
$ cd svn
- $ # get any dependencies to be built in-tree, if required
+ $ # get SQLite amalgamation if required
$ chmod +x autogen.sh
$ ./autogen.sh
$ mkdir ../obj
Modified: subversion/trunk/Makefile.in
URL:
http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1456924&r1=1456923&r2=1456924&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Fri Mar 15 12:21:46 2013
@@ -38,8 +38,6 @@ SVN_FS_LIB_LINK = @SVN_FS_LIB_LINK@
SWIG_SRC_DIR = $(abs_srcdir)/subversion/bindings/swig
SWIG_BUILD_DIR = $(abs_builddir)/subversion/bindings/swig
-SVN_EXTERNAL_PROJECT_SUBDIRS = @SVN_EXTERNAL_PROJECT_SUBDIRS@
-
SCHEMA_DIR = subversion/svn/schema
SVN_APR_LIBS = @SVN_APR_LIBS@
@@ -372,11 +370,11 @@ ECHO_N = @ECHO_N@
TESTS = $(TEST_PROGRAMS) @BDB_TEST_PROGRAMS@
-all: mkdir-init external-all local-all
-clean: external-clean local-clean
-distclean: external-distclean local-distclean
-extraclean: external-extraclean local-extraclean
-install: external-install local-install revision-install
+all: mkdir-init local-all
+clean: local-clean
+distclean: local-distclean
+extraclean: local-extraclean
+install: local-install revision-install
@INCLUDE_OUTPUTS@
@@ -616,32 +614,6 @@ mkdir-init:
fi; \
done
-# recursive targets to handle external projects (e.g. APR, Neon)
-external-all external-install:
- @target=`echo $@ | sed s/external-//`; \
- list='$(SVN_EXTERNAL_PROJECT_SUBDIRS)'; \
- for i in $$list; do \
- echo "------ making $$target in $$i"; \
- (cd $$i && $(MAKE) $$target) || exit 1; \
- echo "------ completed $$target in $$i"; \
- done;
-
-### apr-util relies on generated files in apr, so reverse the
-### list so that it is cleaned before apr. also note that Neon does
-### not have an extraclean target, so get "close" with distclean
-external-clean external-distclean external-extraclean:
- @target=`echo $@ | sed s/external-//`; \
- list='$(SVN_EXTERNAL_PROJECT_SUBDIRS)'; \
- for i in $$list; do \
- revlist="$$i $$revlist"; \
- done; \
- for i in $$revlist; do \
- echo "------ making $$target in $$i"; \
- (cd $$i && $(MAKE) $$target) || exit 1; \
- echo "------ completed $$target in $$i"; \
- done;
-
-
# DOCUMENTATION RULES
# Every single document in every format.
Modified: subversion/trunk/build/ac-macros/apr.m4
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/apr.m4?rev=1456924&r1=1456923&r2=1456924&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/apr.m4 (original)
+++ subversion/trunk/build/ac-macros/apr.m4 Fri Mar 15 12:21:46 2013
@@ -32,7 +32,7 @@ AC_DEFUN(SVN_LIB_APR,
AC_MSG_NOTICE([Apache Portable Runtime (APR) library configuration])
- APR_FIND_APR("$abs_srcdir/apr", "$abs_builddir/apr", 1, [1 0])
+ APR_FIND_APR("", "", 1, [1 0])
if test $apr_found = "no"; then
AC_MSG_WARN([APR not found])
@@ -40,7 +40,7 @@ AC_DEFUN(SVN_LIB_APR,
fi
if test $apr_found = "reconfig"; then
- SVN_EXTERNAL_PROJECT([apr])
+ AC_MSG_ERROR([Unexpected APR reconfig])
fi
dnl check APR version number against regex
@@ -117,29 +117,12 @@ dnl no apr found, print out a message te
AC_DEFUN(SVN_DOWNLOAD_APR,
[
echo "The Apache Portable Runtime (APR) library cannot be found."
- echo "Please install APR on this system and supply the appropriate"
- echo "--with-apr option to 'configure'"
+ echo "Please install APR on this system and configure Subversion"
+ echo "with the appropriate --with-apr option."
echo ""
- echo "or"
+ echo "You probably need to do something similar with the Apache"
+ echo "Portable Runtime Utility (APRUTIL) library and then configure"
+ echo "Subversion with both the --with-apr and --with-apr-util options."
echo ""
- echo "get it with SVN and put it in a subdirectory of this source:"
- echo ""
- echo " svn co \\"
- echo " http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x \\"
- echo " apr"
- echo ""
- echo "Run that right here in the top level of the Subversion tree."
- echo "Afterwards, run ./buildconf in that subdirectory and"
- echo "then run configure again here."
- echo ""
- echo "Whichever of the above you do, you probably need to do"
- echo "something similar for apr-util, either providing both"
- echo "--with-apr and --with-apr-util to 'configure', or"
- echo "getting both from SVN with:"
- echo ""
- echo " svn co \\"
- echo " http://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x \\"
- echo " apr-util"
- echo ""
- AC_MSG_ERROR([no suitable apr found])
+ AC_MSG_ERROR([no suitable APR found])
])
Modified: subversion/trunk/build/ac-macros/apr_memcache.m4
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/apr_memcache.m4?rev=1456924&r1=1456923&r2=1456924&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/apr_memcache.m4 (original)
+++ subversion/trunk/build/ac-macros/apr_memcache.m4 Fri Mar 15 12:21:46 2013
@@ -48,32 +48,20 @@ AC_DEFUN(SVN_LIB_APR_MEMCACHE,
CPPFLAGS="$save_cppflags"
fi
], [
- if test -d "$srcdir/apr_memcache"; then
- apr_memcache_found=reconfig
- else
dnl Try just looking in apr-util (>= 1.3 has it already).
- AC_MSG_NOTICE([looking for apr_memcache as part of apr-util])
- save_cppflags="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES"
- AC_CHECK_HEADER(apr_memcache.h,[
- save_ldflags="$LDFLAGS"
- LDFLAGS="$LDFLAGS $SVN_APRUTIL_LIBS"
- AC_CHECK_LIB(aprutil-1, apr_memcache_create,
- [apr_memcache_found="aprutil"])
- LDFLAGS="$save_ldflags"])
- CPPFLAGS="$save_cppflags"
-
- fi
+ AC_MSG_NOTICE([looking for apr_memcache as part of apr-util])
+ save_cppflags="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES"
+ AC_CHECK_HEADER(apr_memcache.h,[
+ save_ldflags="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $SVN_APRUTIL_LIBS"
+ AC_CHECK_LIB(aprutil-1, apr_memcache_create,
+ [apr_memcache_found="aprutil"])
+ LDFLAGS="$save_ldflags"])
+ CPPFLAGS="$save_cppflags"
])
- if test $apr_memcache_found = "reconfig"; then
- SVN_EXTERNAL_PROJECT([apr_memcache], [--with-apr=$apr_config
--with-apr-util=$apu_config])
- apr_memcache_prefix=$prefix
- SVN_APR_MEMCACHE_INCLUDES="-I$srcdir/memcache"
- SVN_APR_MEMCACHE_LIBS="$abs_builddir/memcache/libapr_memcache.la"
- fi
-
if test $apr_memcache_found = "standalone"; then
SVN_APR_MEMCACHE_INCLUDES="-I$apr_memcache_prefix/include/apr_memcache-0"
SVN_APR_MEMCACHE_LIBS="$apr_memcache_prefix/lib/libapr_memcache.la"
Modified: subversion/trunk/build/ac-macros/aprutil.m4
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/aprutil.m4?rev=1456924&r1=1456923&r2=1456924&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/aprutil.m4 (original)
+++ subversion/trunk/build/ac-macros/aprutil.m4 Fri Mar 15 12:21:46 2013
@@ -38,7 +38,7 @@ AC_DEFUN(SVN_LIB_APRUTIL,
AC_MSG_NOTICE([Apache Portable Runtime Utility (APRUTIL) library
configuration])
- APR_FIND_APU("$abs_srcdir/apr-util", "$abs_builddir/apr-util", 1, [1 0])
+ APR_FIND_APU("", "", 1, [1 0])
if test $apu_found = "no"; then
AC_MSG_WARN([APRUTIL not found])
@@ -46,12 +46,12 @@ AC_DEFUN(SVN_LIB_APRUTIL,
fi
if test $apu_found = "reconfig"; then
- SVN_EXTERNAL_PROJECT([apr-util], [--with-apr=../apr])
+ AC_MSG_ERROR([Unexpected APRUTIL reconfig])
fi
dnl check APRUTIL version number against regex
- AC_MSG_CHECKING([APR-UTIL version])
+ AC_MSG_CHECKING([APRUTIL version])
apu_version="`$apu_config --version`"
if test $? -ne 0; then
# This is a hack as suggested by Ben Collins-Sussman. It can be
@@ -76,7 +76,7 @@ AC_DEFUN(SVN_LIB_APRUTIL,
if test $APU_WANTED_REGEX_MATCH -eq 0; then
echo "wanted regexes are $APRUTIL_WANTED_REGEXES"
- AC_MSG_ERROR([invalid apr-util version found])
+ AC_MSG_ERROR([invalid APRUTIL version found])
fi
dnl Get libraries and thread flags from APRUTIL ---------------------
@@ -121,20 +121,8 @@ dnl no apr-util found, print out a messa
AC_DEFUN(SVN_DOWNLOAD_APRUTIL,
[
echo "The Apache Portable Runtime Utility (APRUTIL) library cannot be found."
- echo "Either install APRUTIL on this system and supply the appropriate"
- echo "--with-apr-util option"
- echo ""
- echo "or"
- echo ""
- echo "get it with SVN and put it in a subdirectory of this source:"
- echo ""
- echo " svn co \\"
- echo " http://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x \\"
- echo " apr-util"
- echo ""
- echo "Run that right here in the top level of the Subversion tree."
- echo "Afterwards, run ./buildconf in that subdirectory and"
- echo "then run configure again here."
+ echo "Install APRUTIL on this system and configure Subversion with the"
+ echo " appropriate --with-apr-util option."
echo ""
AC_MSG_ERROR([no suitable APRUTIL found])
])
Modified: subversion/trunk/build/ac-macros/svn-macros.m4
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/svn-macros.m4?rev=1456924&r1=1456923&r2=1456924&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/svn-macros.m4 (original)
+++ subversion/trunk/build/ac-macros/svn-macros.m4 Fri Mar 15 12:21:46 2013
@@ -46,65 +46,6 @@ EOF
])
-# SVN_EXTERNAL_PROJECT_SETUP()
-# Internal helper for SVN_EXTERNAL_PROJECT.
-AC_DEFUN([SVN_EXTERNAL_PROJECT_SETUP], [
- do_subdir_config="yes"
- AC_ARG_ENABLE([subdir-config],
- AS_HELP_STRING([--disable-subdir-config],
- [do not reconfigure packages in subdirectories]),
- [if test "$enableval" = "no"; then do_subdir_config="no"; fi])
- AC_SUBST([SVN_EXTERNAL_PROJECT_SUBDIRS], [""])
-])
-
-# SVN_EXTERNAL_PROJECT(SUBDIR [, ADDITIONAL-CONFIGURE-ARGS])
-# Setup SUBDIR as an external project. This means:
-# - Execute the configure script immediately at the point of macro invocation.
-# - Add SUBDIR to the substitution variable SVN_EXTERNAL_PROJECT_SUBDIRS,
-# for the Makefile.in to arrange to execute make in the subdir.
-#
-# Derived from APR_SUBDIR_CONFIG
-AC_DEFUN([SVN_EXTERNAL_PROJECT], [
- AC_REQUIRE([SVN_EXTERNAL_PROJECT_SETUP])
- SVN_EXTERNAL_PROJECT_SUBDIRS="$SVN_EXTERNAL_PROJECT_SUBDIRS $1"
- if test "$do_subdir_config" = "yes" ; then
- # save our work to this point; this allows the sub-package to use it
- AC_CACHE_SAVE
-
- AC_MSG_NOTICE([configuring package in $1 now])
- ac_popdir=`pwd`
- ac_abs_srcdir=`(cd $srcdir/$1 && pwd)`
- apr_config_subdirs="$1"
- test -d $1 || $MKDIR $1
- cd $1
-
- # A "../" for each directory in /$config_subdirs.
- ac_dots=[`echo $apr_config_subdirs| $SED -e 's%^\./%%' -e 's%[^/]$%&/%' -e
's%[^/]*/%../%g'`]
-
- # Make the cache file name correct relative to the subdirectory.
- case "$cache_file" in
- /*) ac_sub_cache_file=$cache_file ;;
- *) # Relative path.
- ac_sub_cache_file="$ac_dots$cache_file" ;;
- esac
-
- # The eval makes quoting arguments work.
- if eval $SHELL $ac_abs_srcdir/configure $ac_configure_args
--cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir $2
- then :
- echo "$1 configured properly"
- else
- echo "configure failed for $1"
- exit 1
- fi
- cd $ac_popdir
-
- # grab any updates from the sub-package
- AC_CACHE_LOAD
- else
- AC_MSG_WARN([not running configure in $1])
- fi
-])
-
dnl
dnl SVN_CONFIG_SCRIPT(path)
dnl
