Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Message-ID: <20060209042630.7417.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r376181 - in /apr/apr-util/branches/0.9.x: CHANGES
 build/dbm.m4
Date: Thu, 09 Feb 2006 04:26:30 -0000
To: commits@apr.apache.org
From: rooneg@apache.org

Author: rooneg
Date: Wed Feb  8 20:26:28 2006
New Revision: 376181

URL: http://svn.apache.org/viewcvs?rev=376181&view=rev
Log:
Merge r376177 and r376178 into 0.9.x.

Original log messages:

Stop trying to link against Berkeley DB by default due to license issues,
if users want to use it they will now have to pass --with-berkeley-db to
configure.

* build/dbm.m4
  (AC_CHECK_DBM): Remove the default search for BDB, and add a comment as
   to why we don't search for it by default.

* CHANGES: Note change.

* build/dbm.m4: Oops, fix a typo in the last commit.

Modified:
    apr/apr-util/branches/0.9.x/CHANGES
    apr/apr-util/branches/0.9.x/build/dbm.m4

Modified: apr/apr-util/branches/0.9.x/CHANGES
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/CHANGES?rev=376181&r1=376180&r2=376181&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/CHANGES (original)
+++ apr/apr-util/branches/0.9.x/CHANGES Wed Feb  8 20:26:28 2006
@@ -1,5 +1,11 @@
 Changes with APR-util 0.9.9
 
+  *) Stop trying to link against Berkeley DB by default.  To enable use
+     of Berkeley DB users must now explicitly pass --with-berkeley-db to
+     configure, since Berkeley DB is released under a viral license that
+     requires distribution of source code for any program that uses it.
+     [Garrett Rooney]
+
   *) Stop trying to link against GDBM by default.  To enable use of GDBM
      users must now explicitly pass --with-gdbm to configure, since GDBM
      is licensed under the GPL.

Modified: apr/apr-util/branches/0.9.x/build/dbm.m4
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/build/dbm.m4?rev=376181&r1=376180&r2=376181&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/build/dbm.m4 (original)
+++ apr/apr-util/branches/0.9.x/build/dbm.m4 Wed Feb  8 20:26:28 2006
@@ -683,6 +683,10 @@
   fi
 
   dnl We're going to try to find the highest version of Berkeley DB supported.
+  dnl
+  dnl Note that we only do this if the user requested it, since the Sleepycat
+  dnl license is viral and requires distribution of source along with programs
+  dnl that use it.
   AC_ARG_WITH([berkeley-db], [
     --with-berkeley-db=PATH
       Find the Berkeley DB header and library in \`PATH/include' and
@@ -707,8 +711,6 @@
         AC_ERROR(Berkeley DB not found.)
       fi
     fi 
-  ],[
-    APU_CHECK_DB($requested, "")
   ])
 
   if test -n "$apu_db_xtra_libs"; then