From 2dac9c5d204a98a1cc512a4397901b8b9727fc80 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <danielsh@apache.org>
Date: Fri, 3 Jan 2020 20:08:42 +0000
Subject: 45213: Make --enable-gdbm default to false, rather than default to
 true with an unavoidable warning.

---
 configure.ac | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'configure.ac')

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
-- 
cgit 1.4.1