]> git.ipfire.org Git - thirdparty/openldap.git/commitdiff
ITS#9307 --enable-<option>=mod requires --enable-modules
authorRyan Tandy <ryan@nardis.ca>
Tue, 4 Aug 2020 01:10:49 +0000 (01:10 +0000)
committerQuanah Gibson-Mount <quanah@openldap.org>
Wed, 5 Aug 2020 03:29:42 +0000 (03:29 +0000)
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.

configure.in

index 6bd5dcdeddbd0829f56163ec90fab10daef296e0..204912307d975dd96fc94006f128dbcfbf63167b 100644 (file)
@@ -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 ----------------------------------------------------------------