From: Ondřej Surý <ondrej@sury.org>
Date: Tue, 21 Sep 2021 08:44:41 +0000 (+0200)
Subject: Add deprecation warning about DLZ drivers
X-Git-Tag: v9.16.22~15^2~1
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=c3b3dd3229893dc0b7e0b378797791781764f31a;p=thirdparty%2Fbind9.git

Add deprecation warning about DLZ drivers

DLZ drivers are going to be removed from the next major BIND 9 release,
this commit adds a deprecation warning to inform the users about the
need to migrate to DLZ modules.
---

diff --git a/configure b/configure
index edd0f9cde86..e3852f3036e 100755
--- a/configure
+++ b/configure
@@ -26381,22 +26381,53 @@ report() {
 	echo "    +--------------------------------------------+"
     )
 
+    dlz_enabled=no
+
     echo "    Dynamically loadable zone (DLZ) drivers:"
-    test "no" = "$use_dlz_bdb" || \
-	echo "        Berkeley DB (--with-dlz-bdb)"
-    test "no" = "$use_dlz_ldap" || \
-	echo "        LDAP (--with-dlz-ldap)"
-    test "no" = "$use_dlz_mysql" || \
-	echo "        MySQL (--with-dlz-mysql)"
-    test "no" = "$use_dlz_odbc" || \
-	echo "        ODBC (--with-dlz-odbc)"
-    test "no" = "$use_dlz_postgres" || \
-	echo "        Postgres (--with-dlz-postgres)"
-    test "no" = "$use_dlz_filesystem" || \
-	echo "        Filesystem (--with-dlz-filesystem)"
-    test "no" = "$use_dlz_stub" || \
-	echo "        Stub (--with-dlz-stub)"
-    test "$use_dlz_bdb $use_dlz_ldap $use_dlz_mysql $use_dlz_odbc $use_dlz_postgres $use_dlz_filesystem $use_dlz_stub" = "no no no no no no no" && echo "        None"
+    if test "$use_dlz_bdb" != "no"; then :
+  $as_echo "        Berkeley DB (--with-dlz-bdb)"
+	   dlz_enabled=yes
+fi
+    if test "$use_dlz_ldap" != "no"; then :
+  $as_echo "        LDAP (--with-dlz-ldap)"
+	   dlz_enabled=yes
+fi
+    if test "$use_dlz_mysql" != "no"; then :
+  $as_echo "        MySQL (--with-dlz-mysql)"
+	   dlz_enabled=yes
+fi
+    if test "$use_dlz_odbc" != "no"; then :
+  $as_echo "        ODBC (--with-dlz-odbc)"
+	   dlz_enabled=yes
+fi
+    if test "$use_dlz_postgres" != "no"; then :
+  $as_echo "        Postgres (--with-dlz-postgres)"
+	   dlz_enabled=yes
+fi
+    if test "$use_dlz_filesystem" != "no"; then :
+  $as_echo "        Filesystem (--with-dlz-filesystem)"
+	   dlz_enabled=yes
+fi
+    if test "$use_dlz_stub" != "no"; then :
+  $as_echo "        Stub (--with-dlz-stub)"
+	   dlz_enabled=yes
+fi
+
+    if test "$dlz_enabled" = "no"; then :
+  $as_echo "        None"
+else
+  $as_echo "    +--------------------------------------------------------+"
+	   $as_echo "    |             ==== DEPRECATION WARNING ====              |"
+	   $as_echo "    +--------------------------------------------------------+"
+	   $as_echo "    | Old-style DLZ drivers has been deprecated in favor of  |"
+	   $as_echo "    | DLZ modules. The DLZ drivers configuration option will |"
+	   $as_echo "    | be removed from the next major BIND 9 release.         |"
+	   $as_echo "    |                                                        |"
+	   $as_echo "    | The option to use the DLZ modules is already available |"
+	   $as_echo "    | in BIND 9; please see the ARM section on DLZ modules.  |"
+	   $as_echo "    +--------------------------------------------------------+"
+
+fi
 
     echo "-------------------------------------------------------------------------------"
 
diff --git a/configure.ac b/configure.ac
index 845c2ea7388..d7952a34175 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3008,22 +3008,44 @@ report() {
 	echo "    +--------------------------------------------+"
     )
 
+    dlz_enabled=no
+
     echo "    Dynamically loadable zone (DLZ) drivers:"
-    test "no" = "$use_dlz_bdb" || \
-	echo "        Berkeley DB (--with-dlz-bdb)"
-    test "no" = "$use_dlz_ldap" || \
-	echo "        LDAP (--with-dlz-ldap)"
-    test "no" = "$use_dlz_mysql" || \
-	echo "        MySQL (--with-dlz-mysql)"
-    test "no" = "$use_dlz_odbc" || \
-	echo "        ODBC (--with-dlz-odbc)"
-    test "no" = "$use_dlz_postgres" || \
-	echo "        Postgres (--with-dlz-postgres)"
-    test "no" = "$use_dlz_filesystem" || \
-	echo "        Filesystem (--with-dlz-filesystem)"
-    test "no" = "$use_dlz_stub" || \
-	echo "        Stub (--with-dlz-stub)"
-    test "$use_dlz_bdb $use_dlz_ldap $use_dlz_mysql $use_dlz_odbc $use_dlz_postgres $use_dlz_filesystem $use_dlz_stub" = "no no no no no no no" && echo "        None"
+    AS_IF([test "$use_dlz_bdb" != "no"],
+	  [AS_ECHO(["        Berkeley DB (--with-dlz-bdb)"])
+	   dlz_enabled=yes])
+    AS_IF([test "$use_dlz_ldap" != "no"],
+	  [AS_ECHO(["        LDAP (--with-dlz-ldap)"])
+	   dlz_enabled=yes])
+    AS_IF([test "$use_dlz_mysql" != "no"],
+	  [AS_ECHO(["        MySQL (--with-dlz-mysql)"])
+	   dlz_enabled=yes])
+    AS_IF([test "$use_dlz_odbc" != "no"],
+	  [AS_ECHO(["        ODBC (--with-dlz-odbc)"])
+	   dlz_enabled=yes])
+    AS_IF([test "$use_dlz_postgres" != "no"],
+	  [AS_ECHO(["        Postgres (--with-dlz-postgres)"])
+	   dlz_enabled=yes])
+    AS_IF([test "$use_dlz_filesystem" != "no"],
+	  [AS_ECHO(["        Filesystem (--with-dlz-filesystem)"])
+	   dlz_enabled=yes])
+    AS_IF([test "$use_dlz_stub" != "no"],
+	  [AS_ECHO(["        Stub (--with-dlz-stub)"])
+	   dlz_enabled=yes])
+
+    AS_IF([test "$dlz_enabled" = "no"],
+	  [AS_ECHO(["        None"])],
+	  [AS_ECHO(["    +--------------------------------------------------------+"])
+	   AS_ECHO(["    |             ==== DEPRECATION WARNING ====              |"])
+	   AS_ECHO(["    +--------------------------------------------------------+"])
+	   AS_ECHO(["    | Old-style DLZ drivers has been deprecated in favor of  |"])
+	   AS_ECHO(["    | DLZ modules. The DLZ drivers configuration option will |"])
+	   AS_ECHO(["    | be removed from the next major BIND 9 release.         |"])
+	   AS_ECHO(["    |                                                        |"])
+	   AS_ECHO(["    | The option to use the DLZ modules is already available |"])
+	   AS_ECHO(["    | in BIND 9; please see the ARM section on DLZ modules.  |"])
+	   AS_ECHO(["    +--------------------------------------------------------+"])
+	  ])
 
     echo "-------------------------------------------------------------------------------"