From: Thomas Markwalder <tmark@isc.org>
Date: Tue, 10 Apr 2018 11:23:18 +0000 (-0400)
Subject: [5567] Re-add support for --with-dhcp-mysql and --with-dhcp-pgsql
X-Git-Tag: trac5549_base~15^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=722abaec34997a5799870a0e808ee7025cffa85e;p=thirdparty%2Fkea.git

[5567] Re-add support for --with-dhcp-mysql and --with-dhcp-pgsql

configure.ac
  Re-added support --with-dhcp-mysql and --with-dhcp-pgsql but emit a
  deprecation warning message encouraging their replacement with
  --with-mysql and --with-pgsql.
---

diff --git a/configure.ac b/configure.ac
index ed07da276a..9787560ba6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -646,6 +646,14 @@ AC_ARG_WITH([mysql],
     [path to the MySQL 'mysql_config' script (MySQL is used for the DHCP database)]),
     [mysql_config="$withval"])
 
+deprec_msg="no"
+AC_ARG_WITH([dhcp-mysql],,
+    [mysql_config="$withval";deprec_msg="yes"])
+
+if test "${deprec_msg}" = "yes" ; then
+    AC_MSG_WARN([--with-dhcp-mysql has been deprecated, please use --with-mysql])
+fi
+
 if test "${mysql_config}" = "yes" ; then
     MYSQL_CONFIG="/usr/bin/mysql_config"
 elif test "${mysql_config}" != "no" ; then
@@ -700,6 +708,14 @@ AC_ARG_WITH([pgsql],
     [path to the PostgreSQL 'pg_config' script]),
     [pg_config="$withval"])
 
+deprec_msg="no"
+AC_ARG_WITH([dhcp-pgsql],,
+    [pg_config="$withval";deprec_msg="yes"])
+
+if test "${deprec_msg}" = "yes" ; then
+    AC_MSG_WARN([--with-dhcp-pgsql has been deprecated, please use --with-pgsql])
+fi
+
 if test "${pg_config}" = "yes" ; then
     PG_CONFIG="/usr/bin/pg_config"
 elif test "${pg_config}" != "no" ; then