subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1131437 - in /subversion/trunk: configure.ac notes/knobs
Date Sat, 04 Jun 2011 16:56:33 GMT
Author: danielsh
Date: Sat Jun  4 16:56:32 2011
New Revision: 1131437

URL: http://svn.apache.org/viewvc?rev=1131437&view=rev
Log:
* configure.ac (--with-libmagic):
    Error out when libmagic is not found when --with-libmagic was provided,
    either with or without an argument.

Modified:
    subversion/trunk/configure.ac
    subversion/trunk/notes/knobs

Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1131437&r1=1131436&r2=1131437&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Sat Jun  4 16:56:32 2011
@@ -697,9 +697,7 @@ AC_ARG_WITH(libmagic,AS_HELP_STRING([--w
     AC_CHECK_HEADER(magic.h, [
       AC_CHECK_LIB(magic, magic_open, [libmagic_found="builtin"])
     ])
-    if test "$libmagic_found" = "no"; then
-      AC_MSG_ERROR([[--with-libmagic requested, but libmagic not found]])
-    fi
+    libmagic_prefix="the default locations"
   else
     libmagic_prefix=$withval
     save_cppflags="$CPPFLAGS"
@@ -712,6 +710,9 @@ AC_ARG_WITH(libmagic,AS_HELP_STRING([--w
     ])
     CPPFLAGS="$save_cppflags"
   fi
+  if test "$withval" != "no" && test "$libmagic_found" = "no"; then
+    AC_MSG_ERROR([[--with-libmagic requested, but libmagic not found at $libmagic_prefix]])
+  fi
 ],
 [
   AC_CHECK_HEADER(magic.h, [

Modified: subversion/trunk/notes/knobs
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/knobs?rev=1131437&r1=1131436&r2=1131437&view=diff
==============================================================================
--- subversion/trunk/notes/knobs (original)
+++ subversion/trunk/notes/knobs Sat Jun  4 16:56:32 2011
@@ -59,6 +59,7 @@ SERF_VERBOSE
 SSL_VERBOSE
 SVN_DEPRECATED
 SVN_FS__TRAIL_DEBUG
+SVN_STREAM__QUADRIPLEGIC
 
 2.4 Test-only
 
@@ -318,6 +319,15 @@ SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2
   Default:   not defined
   Suggested: defined, not defined
 
+5.13 SVN_STREAM__QUADRIPLEGIC
+
+  Scope:     libsvn_subr/stream.c, svn_stream_*()
+  Purpose:   Disable optional features of streams: mark/seek/skip/buffered.
+  Range:     definedness
+  Default:   not defined
+  Suggested: defined, not defined
+
+ 
 6 Defines that affect unit tests
 ================================
 



Mime
View raw message