Author: rooneg
Date: Sat Feb 4 12:04:09 2006
New Revision: 374917
URL: http://svn.apache.org/viewcvs?rev=374917&view=rev
Log:
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/trunk/CHANGES
apr/apr-util/trunk/build/dbm.m4
Modified: apr/apr-util/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/CHANGES?rev=374917&r1=374916&r2=374917&view=diff
==============================================================================
--- apr/apr-util/trunk/CHANGES (original)
+++ apr/apr-util/trunk/CHANGES Sat Feb 4 12:04:09 2006
@@ -1,5 +1,10 @@
Changes with APR-util 1.3.0
+ *) 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
Modified: apr/apr-util/trunk/build/dbm.m4
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/build/dbm.m4?rev=374917&r1=374916&r2=374917&view=diff
==============================================================================
--- apr/apr-util/trunk/build/dbm.m4 (original)
+++ apr/apr-util/trunk/build/dbm.m4 Sat Feb 4 12:04:09 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], [
|