svn commit: r374918 - in /apr/apr-util/branches/1.2.x: CHANGES build/dbm.m4

[ro...@apache.org]

Author: rooneg
Date: Sat Feb  4 12:07:34 2006
New Revision: 374918

URL: http://svn.apache.org/viewcvs?rev=374918&view=rev
Log:
Merge r374917 from trunk.

Original log message:

Stop trying to link against GDBM by default due to concerns about license.

Reviewed by: wrowe

* build/dbm.m4
  (APU_CHECK_DBM): Don't try to search for and link against GDBM unless
   the user asks us to by passing --with-gdbm.

* CHANGES: Note this change.

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

Modified: apr/apr-util/branches/1.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/1.2.x/CHANGES?rev=374918&r1=374917&r2=374918&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/CHANGES (original)
+++ apr/apr-util/branches/1.2.x/CHANGES Sat Feb  4 12:07:34 2006
@@ -1,6 +1,11 @@
 Changes with APR-util 1.2.4
 
-  *) Fix VPATH builds, and symlink builds where apr and apr-util 
+  *) 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.
+     [Garrett Rooney]
+
+  *) Fix VPATH builds, and symlink builds where apr and apr-util
      reside in parallel as symlinks to directories with more explicit
      names, e.g. apr-1.x and apr-util-1.x.  This solves various breakage
      on Solaris in particular with ./buildconf and ./configure.  Also

Modified: apr/apr-util/branches/1.2.x/build/dbm.m4
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/1.2.x/build/dbm.m4?rev=374918&r1=374917&r2=374918&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/build/dbm.m4 (original)
+++ apr/apr-util/branches/1.2.x/build/dbm.m4 Sat Feb  4 12:07:34 2006
@@ -607,6 +607,7 @@
     requested=default
   ])
 
+  dnl We don't pull in GDBM unless the user asks for it, since it's GPL
   AC_ARG_WITH([gdbm], [
     --with-gdbm=DIR          specify GDBM location
   ], [
@@ -626,9 +627,6 @@
         APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
       fi
     fi
-  ], [
-    apu_have_gdbm=0
-    AC_CHECK_HEADER(gdbm.h, AC_CHECK_LIB(gdbm, gdbm_open, [apu_have_gdbm=1]))
   ])
 
   AC_ARG_WITH([ndbm], [