* [PATCH] Make --enable-gdbm default to false, rather than default to true with an unavoidable warning.
@ 2020-01-03 20:08 Daniel Shahaf
0 siblings, 0 replies; only message in thread
From: Daniel Shahaf @ 2020-01-03 20:08 UTC (permalink / raw)
To: zsh-workers
---
As the subject says. If it's something the user might not want to do,
make it opt-in.
Also, there was no way for a user who understood the implications to
turn off the warning.
Cheers,
Daniel
README | 4 ++++
configure.ac | 14 +++-----------
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/README b/README
index 5d9d9073a..5ae6087a2 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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-01-03 21:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-03 20:08 [PATCH] Make --enable-gdbm default to false, rather than default to true with an unavoidable warning Daniel Shahaf
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).