diff options
| author | Daniel Shahaf <danielsh@apache.org> | 2020-01-03 20:08:42 +0000 |
|---|---|---|
| committer | Daniel Shahaf <danielsh@apache.org> | 2020-01-06 02:29:30 +0000 |
| commit | 2dac9c5d204a98a1cc512a4397901b8b9727fc80 (patch) | |
| tree | d8b601fd8d0ffeb2b809d18d3e7a009f7cf9fc26 | |
| parent | d9dd1b63e510057d16123a6deb4e4782884883d7 (diff) | |
| download | zsh-2dac9c5d204a98a1cc512a4397901b8b9727fc80.tar.gz zsh-2dac9c5d204a98a1cc512a4397901b8b9727fc80.tar.xz zsh-2dac9c5d204a98a1cc512a4397901b8b9727fc80.zip | |
45213: Make --enable-gdbm default to false, rather than default to true with an unavoidable warning.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | configure.ac | 14 |
3 files changed, 12 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index c6504d882..399623a10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2020-01-06 Daniel Shahaf <danielsh@apache.org> + + * 45213: README, configure.ac: Make --enable-gdbm default to + false, rather than default to true with an unavoidable warning. + 2019-12-26 Daniel Shahaf <danielsh@apache.org> * unposted (follow-up to 45131): Test/E02xtrace.ztst: Extra diff --git a/README b/README index a3701abe5..bcec3def1 100644 --- a/README +++ b/README @@ -33,6 +33,10 @@ details, see the documentation. Incompatibilities since 5.7.1 ----------------------------- +Build-time change: The default value of the --enable-gdbm configure +argument has changed from "yes" to "no". Thus, the zsh/db/gdbm module will +not be built unless --enable-gdbm is passed explicitly. + The history expansion !:1:t2 used to be interpreted such that the 2 was a separate character added after the history expansion. Now it is an argument to the :t modifier. diff --git a/configure.ac b/configure.ac index 8fd4d452f..256584538 100644 --- a/configure.ac +++ b/configure.ac @@ -444,9 +444,10 @@ dnl Do you want to look for capability support? AC_ARG_ENABLE(cap, AS_HELP_STRING([--enable-cap],[enable the search for POSIX capabilities (may require additional headers to be added by hand)])) +# Default off for licensing reasons AC_ARG_ENABLE(gdbm, -AS_HELP_STRING([--disable-gdbm],[turn off search for gdbm library]), -[gdbm="$enableval"], [gdbm=yes]) +AS_HELP_STRING([--enable-gdbm],[enable the search for the GDBM library (see the zsh/db/gdbm module)]), +[gdbm="$enableval"], [gdbm=no]) dnl ------------------ dnl CHECK THE COMPILER @@ -3298,13 +3299,4 @@ fi echo "See config.modules for installed modules and functions. " -case x$LIBS in - *-lgdbm*) - echo "WARNING: zsh will be linked against libgdbm. -This means the binary is covered by the GNU General Public License. -This does not affect the source code. -Run configure with --disable-gdbm if required." - ;; -esac - exit 0 |