You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ar...@apache.org on 2011/07/17 09:04:54 UTC
svn commit: r1147540 - in /subversion/trunk: Makefile.in
build/ac-macros/apr.m4 build/ac-macros/apr_memcache.m4
build/ac-macros/aprutil.m4 build/ac-macros/serf.m4 build/ac-macros/zlib.m4
configure.ac
Author: arfrever
Date: Sun Jul 17 07:04:53 2011
New Revision: 1147540
URL: http://svn.apache.org/viewvc?rev=1147540&view=rev
Log:
Remove unused variables in build system.
* build/ac-macros/apr.m4
(SVN_LIB_APR): Don't set SVN_APR_PREFIX.
* build/ac-macros/aprutil.m4
(SVN_LIB_APRUTIL): Don't set SVN_APRUTIL_PREFIX.
* build/ac-macros/apr_memcache.m4
(SVN_LIB_APR_MEMCACHE): Don't set SVN_APR_MEMCACHE_PREFIX.
* build/ac-macros/serf.m4
(SVN_LIB_SERF): Don't set SVN_SERF_PREFIX.
* build/ac-macros/zlib.m4
(SVN_LIB_Z): Don't set SVN_ZLIB_PREFIX.
* configure.ac: Don't mark SVN_APRUTIL_PREFIX for substitution.
* Makefile.in: Don't set SVN_APR_INCLUDES, SVN_APR_PREFIX,
SVN_APRUTIL_INCLUDES, SVN_APRUTIL_PREFIX, SVN_APR_MEMCACHE_PREFIX,
SVN_APR_MEMCACHE_INCLUDES, SVN_SERF_INCLUDES, SVN_SERF_PREFIX,
SVN_ZLIB_PREFIX and SVN_ZLIB_INCLUDES variables.
Modified:
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/serf.m4
subversion/trunk/build/ac-macros/zlib.m4
subversion/trunk/configure.ac
Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1147540&r1=1147539&r2=1147540&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Sun Jul 17 07:04:53 2011
@@ -152,22 +152,9 @@ CTYPES_PYTHON_SRC_DIR = $(abs_srcdir)/su
JAVAHL_JAR=subversion/bindings/javahl/svn-javahl.jar
JAVAHL_INCLUDES= @JNI_INCLUDES@ -I$(abs_builddir)/subversion/bindings/javahl/include
-SVN_APR_INCLUDES = @SVN_APR_INCLUDES@
-SVN_APR_PREFIX = @SVN_APR_PREFIX@
SVN_APR_CONFIG = @SVN_APR_CONFIG@
-SVN_APRUTIL_INCLUDES = @SVN_APRUTIL_INCLUDES@
-SVN_APRUTIL_PREFIX = @SVN_APRUTIL_PREFIX@
SVN_APRUTIL_CONFIG = @SVN_APRUTIL_CONFIG@
-SVN_APR_MEMCACHE_PREFIX = @SVN_APR_MEMCACHE_PREFIX@
-SVN_APR_MEMCACHE_INCLUDES = @SVN_APR_MEMCACHE_INCLUDES@
-
-SVN_SERF_INCLUDES = @SVN_SERF_INCLUDES@
-SVN_SERF_PREFIX = @SVN_SERF_PREFIX@
-
-SVN_ZLIB_PREFIX = @SVN_ZLIB_PREFIX@
-SVN_ZLIB_INCLUDES = @SVN_ZLIB_INCLUDES@
-
MKDIR = @MKDIR@
DOXYGEN = @DOXYGEN@
Modified: subversion/trunk/build/ac-macros/apr.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/apr.m4?rev=1147540&r1=1147539&r2=1147540&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/apr.m4 (original)
+++ subversion/trunk/build/ac-macros/apr.m4 Sun Jul 17 07:04:53 2011
@@ -88,11 +88,6 @@ AC_DEFUN(SVN_LIB_APR,
AC_MSG_ERROR([apr-config --includes failed])
fi
- SVN_APR_PREFIX="`$apr_config --prefix`"
- if test $? -ne 0; then
- AC_MSG_ERROR([apr-config --prefix failed])
- fi
-
if test "$enable_all_static" = "yes"; then
SVN_APR_LIBS="`$apr_config --link-ld --libs`"
if test $? -ne 0; then
@@ -111,7 +106,6 @@ AC_DEFUN(SVN_LIB_APR,
AC_MSG_ERROR([apr-config --shlib-path-var failed])
fi
- AC_SUBST(SVN_APR_PREFIX)
AC_SUBST(SVN_APR_CONFIG, ["$apr_config"])
AC_SUBST(SVN_APR_INCLUDES)
AC_SUBST(SVN_APR_LIBS)
Modified: subversion/trunk/build/ac-macros/apr_memcache.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/apr_memcache.m4?rev=1147540&r1=1147539&r2=1147540&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/apr_memcache.m4 (original)
+++ subversion/trunk/build/ac-macros/apr_memcache.m4 Sun Jul 17 07:04:53 2011
@@ -70,19 +70,16 @@ dnl Try just looking in apr-util (>= 1
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_PREFIX="$apr_memcache_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_PREFIX="$apr_memcache_prefix"
SVN_APR_MEMCACHE_INCLUDES="-I$apr_memcache_prefix/include/apr_memcache-0"
SVN_APR_MEMCACHE_LIBS="$apr_memcache_prefix/lib/libapr_memcache.la"
svn_lib_apr_memcache=yes
elif test $apr_memcache_found = "aprutil"; then
dnl We are already linking apr-util everywhere, so no special treatement needed.
- SVN_APR_MEMCACHE_PREFIX=""
SVN_APR_MEMCACHE_INCLUDES=""
SVN_APR_MEMCACHE_LIBS=""
svn_lib_apr_memcache=yes
@@ -92,7 +89,6 @@ dnl We are already linking apr-util ever
svn_lib_apr_memcache=no
fi
- AC_SUBST(SVN_APR_MEMCACHE_PREFIX)
AC_SUBST(SVN_APR_MEMCACHE_INCLUDES)
AC_SUBST(SVN_APR_MEMCACHE_LIBS)
])
Modified: subversion/trunk/build/ac-macros/aprutil.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/aprutil.m4?rev=1147540&r1=1147539&r2=1147540&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/aprutil.m4 (original)
+++ subversion/trunk/build/ac-macros/aprutil.m4 Sun Jul 17 07:04:53 2011
@@ -92,11 +92,6 @@ AC_DEFUN(SVN_LIB_APRUTIL,
AC_MSG_ERROR([apu-config --includes failed])
fi
- SVN_APRUTIL_PREFIX="`$apu_config --prefix`"
- if test $? -ne 0; then
- AC_MSG_ERROR([apu-config --prefix failed])
- fi
-
if test "$enable_all_static" = "yes"; then
SVN_APRUTIL_LIBS="`$apu_config --link-ld --libs`"
if test $? -ne 0; then
@@ -113,7 +108,6 @@ AC_DEFUN(SVN_LIB_APRUTIL,
AC_SUBST(SVN_APRUTIL_INCLUDES)
AC_SUBST(SVN_APRUTIL_CONFIG, ["$apu_config"])
AC_SUBST(SVN_APRUTIL_LIBS)
- AC_SUBST(SVN_APRUTIL_PREFIX)
dnl What version of Expat are we using? -----------------
SVN_HAVE_OLD_EXPAT="`$apu_config --old-expat`"
Modified: subversion/trunk/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/serf.m4?rev=1147540&r1=1147539&r2=1147540&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/serf.m4 (original)
+++ subversion/trunk/build/ac-macros/serf.m4 Sun Jul 17 07:04:53 2011
@@ -73,13 +73,11 @@ AC_DEFUN(SVN_LIB_SERF,
SVN_EXTERNAL_PROJECT([serf], [--with-apr=$apr_config --with-apr-util=$apu_config])
serf_major=serf-`$srcdir/serf/build/get-version.sh major $srcdir/serf/serf.h SERF`
serf_prefix=$prefix
- SVN_SERF_PREFIX="$serf_prefix"
SVN_SERF_INCLUDES="-I$srcdir/serf"
SVN_SERF_LIBS="$abs_builddir/serf/lib$serf_major.la"
fi
if test $serf_found = "yes"; then
- SVN_SERF_PREFIX="$serf_prefix"
SVN_SERF_INCLUDES="-I$serf_prefix/include/$serf_major"
if test -e "$serf_prefix/lib/lib$serf_major.la"; then
SVN_SERF_LIBS="$serf_prefix/lib/lib$serf_major.la"
@@ -93,7 +91,6 @@ AC_DEFUN(SVN_LIB_SERF,
svn_lib_serf=$serf_found
- AC_SUBST(SVN_SERF_PREFIX)
AC_SUBST(SVN_SERF_INCLUDES)
AC_SUBST(SVN_SERF_LIBS)
])
Modified: subversion/trunk/build/ac-macros/zlib.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/zlib.m4?rev=1147540&r1=1147539&r2=1147540&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/zlib.m4 (original)
+++ subversion/trunk/build/ac-macros/zlib.m4 Sun Jul 17 07:04:53 2011
@@ -57,14 +57,12 @@ AC_DEFUN(SVN_LIB_Z,
fi
if test "$zlib_found" = "yes"; then
- SVN_ZLIB_PREFIX="$zlib_prefix"
SVN_ZLIB_INCLUDES="-I$zlib_prefix/include"
LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS(-L$zlib_prefix/lib)`"
fi
SVN_ZLIB_LIBS="-lz"
- AC_SUBST(SVN_ZLIB_PREFIX)
AC_SUBST(SVN_ZLIB_INCLUDES)
AC_SUBST(SVN_ZLIB_LIBS)
])
Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1147540&r1=1147539&r2=1147540&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Sun Jul 17 07:04:53 2011
@@ -105,7 +105,6 @@ if test `expr $apr_version : 2` -ne 0; t
AC_SUBST(SVN_APRUTIL_INCLUDES)
AC_SUBST(SVN_APRUTIL_CONFIG, ["$apu_config"])
AC_SUBST(SVN_APRUTIL_LIBS)
- AC_SUBST(SVN_APRUTIL_PREFIX)
else
SVN_LT_SOVERSION="-version-info 0"
APU_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\."]