From: Ryan Tandy <ryan@nardis.ca>
Date: Tue, 4 Aug 2020 01:10:49 +0000 (+0000)
Subject: ITS#9307 --enable-<option>=mod requires --enable-modules
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~21^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=daf3bd27a828204d7f3db728de95295a551059bd;p=thirdparty%2Fopenldap.git

ITS#9307 --enable-<option>=mod requires --enable-modules

Provide a more specific diagnostic when configuring with
--enable-<option>=mod but not --enable-modules. Make this an error for
both backends and overlays, and remove the automatic fallback to static.
---

diff --git a/configure.in b/configure.in
index 6bd5dcdedd..204912307d 100644
--- a/configure.in
+++ b/configure.in
@@ -447,6 +447,14 @@ else
 	dnl then require at least one built-in backend
 
 	if test $ol_enable_modules = no; then
+
+		for i in backends overlays $Backends $Overlays; do
+			eval "ol_tmp=\$ol_enable_$i"
+			if test -n "$ol_tmp" && test "$ol_tmp" = mod ; then
+				AC_MSG_ERROR([--enable-$i=mod requires --enable-modules])
+			fi
+		done
+
 		ol_any_backend=no
 		for i in $Backends; do
 			eval "ol_tmp=\$ol_enable_$i"
@@ -754,22 +762,6 @@ if test $ol_enable_modules != no ; then
 	fi
 	ol_link_modules=yes
 	WITH_MODULES_ENABLED=yes
-
-else
-	for i in $Backends; do
-		eval "ol_tmp=\$ol_enable_$i"
-		if test $ol_tmp = mod ; then
-			AC_MSG_WARN([building static $i backend])
-			eval "ol_enable_$i=yes"
-		fi
-	done
-	for i in $Overlays; do
-		eval "ol_tmp=\$ol_enable_$i"
-		if test $ol_tmp = mod ; then
-			AC_MSG_WARN([building static $i overlay])
-			eval "ol_enable_$i=yes"
-		fi
-	done
 fi
 
 dnl ----------------------------------------------------------------