Author: jamessan
Date: Thu Dec 21 02:40:43 2017
New Revision: 1818868
URL: http://svn.apache.org/viewvc?rev=1818868&view=rev
Log:
Bump minimum lz4 version to r129 for LZ4_compress_default
* INSTALL
(C.22.LZ4): Bump minimum version to r129
* build/ac-macros/lz4.m4
(SVN_LZ4, SVN_LZ4_STD): Bump minimum version to r129
(SVN_LZ4_STD, SVN_LZ4_PREFIX): Check for LZ4_compress_default symbol
Modified:
subversion/trunk/INSTALL
subversion/trunk/build/ac-macros/lz4.m4
Modified: subversion/trunk/INSTALL
URL:
http://svn.apache.org/viewvc/subversion/trunk/INSTALL?rev=1818868&r1=1818867&r2=1818868&view=diff
==============================================================================
--- subversion/trunk/INSTALL (original)
+++ subversion/trunk/INSTALL Thu Dec 21 02:40:43 2017
@@ -529,7 +529,7 @@ I. INTRODUCTION
22. LZ4 (OPTIONAL)
- Subversion uses LZ4 compression libary version r120 or above. Configure
+ Subversion uses LZ4 compression libary version r129 or above. Configure
will attempt to locate the system library by default using pkg-config
and known paths.
Modified: subversion/trunk/build/ac-macros/lz4.m4
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/lz4.m4?rev=1818868&r1=1818867&r2=1818868&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/lz4.m4 (original)
+++ subversion/trunk/build/ac-macros/lz4.m4 Thu Dec 21 02:40:43 2017
@@ -42,7 +42,7 @@ AC_DEFUN(SVN_LZ4,
SVN_LZ4_PREFIX
fi
if test "$lz4_found" != "yes"; then
- AC_MSG_ERROR([Subversion requires LZ4 >= r120, or use
--with-lz4=internal])
+ AC_MSG_ERROR([Subversion requires LZ4 >= r129, or use
--with-lz4=internal])
fi
fi
AC_SUBST(SVN_LZ4_INCLUDES)
@@ -59,7 +59,7 @@ AC_DEFUN(SVN_LZ4_STD,
[
if test -n "$PKG_CONFIG"; then
AC_MSG_CHECKING([for lz4 library via pkg-config])
- if $PKG_CONFIG liblz4 --atleast-version=120 || $PKG_CONFIG liblz4
--max-version=3; then
+ if $PKG_CONFIG liblz4 --atleast-version=129 || $PKG_CONFIG liblz4
--max-version=3; then
AC_MSG_RESULT([yes])
lz4_found=yes
SVN_LZ4_INCLUDES=`$PKG_CONFIG liblz4 --cflags`
@@ -71,7 +71,7 @@ AC_DEFUN(SVN_LZ4_STD,
fi
if test "$lz4_found" != "yes"; then
AC_MSG_NOTICE([lz4 configuration without pkg-config])
- AC_CHECK_LIB(lz4, LZ4_versionNumber, [
+ AC_CHECK_LIB(lz4, LZ4_compress_default, [
lz4_found=yes
SVN_LZ4_LIBS="-llz4"
])
@@ -85,8 +85,7 @@ AC_DEFUN(SVN_LZ4_PREFIX,
CPPFLAGS="$CPPFLAGS -I$lz4_prefix/include"
save_ldflags="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$lz4_prefix/lib"
- AC_CHECK_LIB(lz4, LZ4_versionNumber, [
- AC_MSG_RESULT([yes])
+ AC_CHECK_LIB(lz4, LZ4_compress_default, [
lz4_found=yes
SVN_LZ4_INCLUDES="-I$lz4_prefix/include"
SVN_LZ4_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS(-L$lz4_prefix/lib)` -llz4"
