subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1831604 - in /subversion/branches/1.10.x: ./ STATUS build/ac-macros/lz4.m4 build/ac-macros/utf8proc.m4
Date Tue, 15 May 2018 04:00:06 GMT
Author: svn-role
Date: Tue May 15 04:00:06 2018
New Revision: 1831604

URL: http://svn.apache.org/viewvc?rev=1831604&view=rev
Log:
Merge r1829344 from trunk:

 * r1829344
   Make configure --without-lz4 or --without-utf8proc into explicit errors.
   Justification:
     LZ4 and UTF8PROC are not optional and configure should produce an error.
   Votes:
     +1: philip, stsp, rhuijben

Modified:
    subversion/branches/1.10.x/   (props changed)
    subversion/branches/1.10.x/STATUS
    subversion/branches/1.10.x/build/ac-macros/lz4.m4
    subversion/branches/1.10.x/build/ac-macros/utf8proc.m4

Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 15 04:00:06 2018
@@ -101,4 +101,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015,1831110,1831112
+/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015,1829344,1831110,1831112

Modified: subversion/branches/1.10.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1831604&r1=1831603&r2=1831604&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue May 15 04:00:06 2018
@@ -60,10 +60,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1829344
-   Make configure --without-lz4 or --without-utf8proc into explicit errors.
-   Justification:
-     LZ4 and UTF8PROC are not optional and configure should produce an error.
-   Votes:
-     +1: philip, stsp, rhuijben

Modified: subversion/branches/1.10.x/build/ac-macros/lz4.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/build/ac-macros/lz4.m4?rev=1831604&r1=1831603&r2=1831604&view=diff
==============================================================================
--- subversion/branches/1.10.x/build/ac-macros/lz4.m4 (original)
+++ subversion/branches/1.10.x/build/ac-macros/lz4.m4 Tue May 15 04:00:06 2018
@@ -39,6 +39,10 @@ AC_DEFUN(SVN_LZ4,
     ],
     [lz4_prefix=std])
 
+  if test "$lz4_prefix" = "no"; then
+    dnl The user has tried to disable LZ4
+    AC_MSG_ERROR([Subversion requires LZ4])
+  fi
   if test "$lz4_prefix" = "internal"; then
     AC_MSG_NOTICE([using internal lz4])
     AC_DEFINE([SVN_INTERNAL_LZ4], [1],

Modified: subversion/branches/1.10.x/build/ac-macros/utf8proc.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/build/ac-macros/utf8proc.m4?rev=1831604&r1=1831603&r2=1831604&view=diff
==============================================================================
--- subversion/branches/1.10.x/build/ac-macros/utf8proc.m4 (original)
+++ subversion/branches/1.10.x/build/ac-macros/utf8proc.m4 Tue May 15 04:00:06 2018
@@ -39,6 +39,10 @@ AC_DEFUN(SVN_UTF8PROC,
     ],
     [utf8proc_prefix=std])
 
+  if test "$utf8proc_prefix" = "no"; then
+    dnl The user has tried to disable UTF8PROC
+    AC_MSG_ERROR([Subversion requires UTF8PROC])
+  fi
   if test "$utf8proc_prefix" = "internal"; then
     AC_MSG_NOTICE([using internal utf8proc])
     AC_DEFINE([SVN_INTERNAL_UTF8PROC], [1],



Mime
View raw message