ITS#9307 -- regenerate configure

Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5

configure

 #! /bin/sh
-# From configure.in Id: 2be771ec1344e27572373a47a83ed4116a3363a5 .
+# From configure.in Id: 75ab097eec39e97bbfa7d4c8c504962072f2acc1 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -4399,6 +4399,14 @@ $as_echo "$as_me: WARNING: slapd disabled, ignoring --enable-$i argument" >&2;}
 else
 	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
+				as_fn_error $? "--enable-$i=mod requires --enable-modules" "$LINENO" 5
+			fi
+		done
+
 		ol_any_backend=no
 		for i in $Backends; do
 			eval "ol_tmp=\$ol_enable_$i"
@@ -14907,24 +14915,6 @@ fi
 	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
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: building static $i backend" >&5
-$as_echo "$as_me: WARNING: building static $i backend" >&2;}
-			eval "ol_enable_$i=yes"
-		fi
-	done
-	for i in $Overlays; do
-		eval "ol_tmp=\$ol_enable_$i"
-		if test $ol_tmp = mod ; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: building static $i overlay" >&5
-$as_echo "$as_me: WARNING: building static $i overlay" >&2;}
-			eval "ol_enable_$i=yes"
-		fi
-	done
 fi
 # test for EBCDIC

configure.in

@@ -444,6 +444,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"
@@ -751,22 +759,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 ----------------------------------------------------------------