[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-commits
Subject:    svn commit: r1829344 - in /subversion/trunk/build/ac-macros: lz4.m4 utf8proc.m4
From:       philip () apache ! org
Date:       2018-04-17 8:48:58
Message-ID: 20180417084859.452A93A0057 () svn01-us-west ! apache ! org
[Download RAW message or body]

Author: philip
Date: Tue Apr 17 08:48:57 2018
New Revision: 1829344

URL: http://svn.apache.org/viewvc?rev=1829344&view=rev
Log:
LZ4 and UTF8PROC are build requirements and so attempts to disable them
via configure options such as --without-lz4 should result in an error.

* build/ac-macros/lz4.m4
  (SVN_LZ4): Produce an error if disabled.

* build/ac-macros/utf8proc.m4:
  (SVN_UTF8PROC): Produce an error if disabled.

Modified:
    subversion/trunk/build/ac-macros/lz4.m4
    subversion/trunk/build/ac-macros/utf8proc.m4

Modified: subversion/trunk/build/ac-macros/lz4.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/lz4.m4?rev=1829344&r1=1829343&r2=1829344&view=diff
 ==============================================================================
--- subversion/trunk/build/ac-macros/lz4.m4 (original)
+++ subversion/trunk/build/ac-macros/lz4.m4 Tue Apr 17 08:48:57 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/trunk/build/ac-macros/utf8proc.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/utf8proc.m4?rev=1829344&r1=1829343&r2=1829344&view=diff
 ==============================================================================
--- subversion/trunk/build/ac-macros/utf8proc.m4 (original)
+++ subversion/trunk/build/ac-macros/utf8proc.m4 Tue Apr 17 08:48:57 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],


[prev in list] [next in list] [prev in thread] [next in thread]