--with-dhcp-backend -> --with-backend

diff --git a/ChangeLog b/ChangeLog
index 7b4a6198d4631e972f4218760a0fe0bea879b703..4406ccfcd37e06e35f92ae2a81442ba501c9ba7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2401,7 +2401,7 @@ bind10-1.2.0rc1 released on April 8, 2014
 776.   [func]          tomek
        b10-dhcp4 and b10-dhcp6 now support using PostgreSQL as the backend
        for storing lease data.  This backend is enabled by specifying
-       --with-dhcp-pgsql on the "configure" command line. Without this
+       --with-pgsql on the "configure" command line. Without this
        switch the PostgreSQL backend is not compiled leaving BIND 10 able to
        be built on systems without PostgreSQL installed.  Thanks to David
        Carlier who contributed the initial patches for this work.
@@ -4330,7 +4330,7 @@ bind10-devel-20121115 released on November 15, 2012
        Add initial version of a MySQL backend for the DHCP code.  This
        implements the basic IPv6 lease access functions - add lease, delete
        lease and update lease.  The backend is enabled by specifying
-       --with-dhcp-mysql on the "configure" command line: without this
+       --with-mysql on the "configure" command line: without this
        switch, the MySQL code is not compiled, so leaving BIND 10 able to
        be built on systems without MySQL installed.
        (Trac #2342, git c7defffb89bd0f3fdd7ad2437c78950bcb86ad37)

diff --git a/configure.ac b/configure.ac
index 47d6c16359ea985e2d173d74260a2424cb86d3d3..8ad0fd47e2e416e8b0f91fca0646664b6e32772d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -981,8 +981,8 @@ AC_SUBST(DISTCHECK_CRYPTO_CONFIGURE_FLAG)
 # the --with-mysql-config (default to /usr/bin/mysql-config).  By default,
 # the software is not built with MySQL support enabled.
 mysql_config="no"
-AC_ARG_WITH([dhcp-mysql],
-  AC_HELP_STRING([--with-dhcp-mysql=PATH],
+AC_ARG_WITH([mysql],
+  AC_HELP_STRING([--with-mysql=PATH],
     [path to the MySQL 'mysql_config' script (MySQL is used for the DHCP database)]),
     [mysql_config="$withval"])
 
@@ -994,7 +994,7 @@ fi
 
 if test "$MYSQL_CONFIG" != "" ; then
     if test -d "$MYSQL_CONFIG" -o ! -x "$MYSQL_CONFIG" ; then
-        AC_MSG_ERROR([--with-dhcp-mysql should point to a mysql_config program])
+        AC_MSG_ERROR([--with-mysql should point to a mysql_config program])
     fi
 
     MYSQL_CPPFLAGS=`$MYSQL_CONFIG --cflags`
@@ -1035,8 +1035,8 @@ AC_CHECK_HEADERS(sys/filio.h,,,)
 AM_CONDITIONAL(HAVE_MYSQL, test "$MYSQL_CONFIG" != "")
 
 pg_config="no"
-AC_ARG_WITH([dhcp-pgsql],
-  AC_HELP_STRING([--with-dhcp-pgsql=PATH],
+AC_ARG_WITH([pgsql],
+  AC_HELP_STRING([--with-pgsql=PATH],
     [path to the PostgreSQL 'pg_config' script]),
     [pg_config="$withval"])
 
@@ -1048,7 +1048,7 @@ fi
 
 if test "$PG_CONFIG" != "" ; then
     if test -d "$PG_CONFIG" -o ! -x "$PG_CONFIG" ; then
-        AC_MSG_ERROR([--with-dhcp-pgsql should point to a pg_config program])
+        AC_MSG_ERROR([--with-pgsql should point to a pg_config program])
     fi
 
     PGSQL_CPPFLAGS=`$PG_CONFIG --cppflags`

diff --git a/doc/devel/contribute.dox b/doc/devel/contribute.dox
index 3931953e1ab8dd8564758bcf4734c05457c2e183..6f54526b85c1172810456ea5ec3bdda02bc1f3fa 100644 (file)
--- a/doc/devel/contribute.dox
+++ b/doc/devel/contribute.dox
@@ -101,7 +101,7 @@ hasn't been written yet.
 
 See @ref unitTests for instructions on how to run unit-tests. If you
 happen to touch any database related code, make sure you compile
-your code with @c --with-dhcp-mysql, @c --with-dhcp-pgsql and/or
+your code with @c --with-mysql, @c --with-pgsql and/or
 @c --with-cql as needed. For example, if you change something
 substantial, make sure the other compilation options still work.
 
@@ -122,7 +122,7 @@ documentation, use \c --enable-generate-docs. If you are modifying DHCP
 code, you are likely to be interested in enabling a non-default database
 backends for DHCP. Note that if the backend is not enabled,
 the database-specific unit-tests are skipped. To enable the MySQL backend,
-use the switch \c --with-dhcp-mysql; for PostgreSQL, use \c --with-dhcp-pgsql.
+use the switch \c --with-mysql; for PostgreSQL, use \c --with-pgsql.
 A complete list of all switches can be obtained with the command:
 
 @code

diff --git a/doc/devel/unit-tests.dox b/doc/devel/unit-tests.dox
index ecaa04ffb4b7fa91f3aaee60a29d102270abc9e1..5bf6af9d0c91069b9c1db5c30a23257a6168e73d 100644 (file)
--- a/doc/devel/unit-tests.dox
+++ b/doc/devel/unit-tests.dox
@@ -130,7 +130,7 @@ The following environment variable can affect the unit tests:
   %@endverbatim
 
   The unit tests are run automatically when "make check" is executed (providing
-  that Kea has been build with the \c --with-dhcp-mysql switch (see the installation
+  that Kea has been build with the \c --with-mysql switch (see the installation
   section in the <a href="http://kea.isc.org/docs/kea-guide.html">Kea Administrator
   Reference Manual</a>).
 
@@ -256,7 +256,7 @@ local   all             postgres                                trust
   that runs tests. Use caution!
 
   The unit tests are run automatically when "make check" is executed (providing
-  that Kea has been build with the \c --with-dhcp-pgsql switch (see the installation
+  that Kea has been build with the \c --with-pgsql switch (see the installation
   section in the <a href="http://kea.isc.org/docs/kea-guide.html">Kea Administrator
   Reference Manual</a>).
 

diff --git a/doc/examples/kea4/backends.json b/doc/examples/kea4/backends.json
index 6f1d19cff6097c342b09a2eee1686fd3cb46d684..0e39373674dda1377139da24470ab3bb11d6ca99 100644 (file)
--- a/doc/examples/kea4/backends.json
+++ b/doc/examples/kea4/backends.json
@@ -30,7 +30,7 @@
 # parameters are type and name. If other parameters are not specified,
 # Kea will assume the database is avaiable on localhost, that user and
 # password is not necessary to connect and that timeout is 5 seconds.
-# Kea must be compiled with --with-dhcp-mysql option to use this backend.
+# Kea must be compiled with --with-mysql option to use this backend.
 #  "lease-database": {
 #      "type": "mysql",
 #      "name": "keatest",
@@ -46,7 +46,7 @@
 # parameters are type and name. If other parameters are not specified,
 # Kea will assume the database is avaiable on localhost, that user and
 # password is not necessary to connect and that timeout is 5 seconds.
-# Kea must be compiled with --with-dhcp-pgsql option to use this backend.
+# Kea must be compiled with --with-pgsql option to use this backend.
 #  "lease-database": {
 #      "type": "pgsql",
 #      "name": "keatest",

diff --git a/doc/examples/kea6/backends.json b/doc/examples/kea6/backends.json
index 4841c63c099e136d6188725f83a47cbad4536150..be1d12c43bb2d952d3594ff09a64bca68946be6a 100644 (file)
--- a/doc/examples/kea6/backends.json
+++ b/doc/examples/kea6/backends.json
@@ -30,7 +30,7 @@
 # parameters are type and name. If other parameters are not specified,
 # Kea will assume the database is avaiable on localhost, that user and
 # password is not necessary to connect and that timeout is 5 seconds.
-# Kea must be compiled with --with-dhcp-mysql option to use this backend.
+# Kea must be compiled with --with-mysql option to use this backend.
 #  "lease-database": {
 #      "type": "mysql",
 #      "name": "keatest",
@@ -46,7 +46,7 @@
 # parameters are type and name. If other parameters are not specified,
 # Kea will assume the database is avaiable on localhost, that user and
 # password is not necessary to connect and that timeout is 5 seconds.
-# Kea must be compiled with --with-dhcp-pgsql option to use this backend.
+# Kea must be compiled with --with-pgsql option to use this backend.
 #  "lease-database": {
 #      "type": "pgsql",
 #      "name": "keatest",

diff --git a/doc/guide/install.xml b/doc/guide/install.xml
index 4525f4b58c660b593b9329b81a1ce731a960787e..c0a7e119c0eac011aa9c01f6e165a51309934131 100644 (file)
--- a/doc/guide/install.xml
+++ b/doc/guide/install.xml
@@ -158,7 +158,7 @@ Debian and Ubuntu:
         <listitem>
         <para>
           The MySQL client and the client development libraries, when using
-          the --with-dhcp-mysql configuration flag to build the Kea MySQL
+          the --with-mysql configuration flag to build the Kea MySQL
           database backend. In this case an instance of the MySQL server
           running locally or on a machine reachable over a network
           is required. Note that
@@ -169,7 +169,7 @@ Debian and Ubuntu:
         <listitem>
         <para>
           The PostgreSQL client and the client development libraries, when
-          using the --with-dhcp-pgsql configuration flag to build the Kea
+          using the --with-pgsql configuration flag to build the Kea
           PostgreSQL database backend. In this case an instance of the
           PostgreSQL server running locally or on some other machine,
           reachable over the network from the machine running Kea, is
@@ -322,7 +322,7 @@ Debian and Ubuntu:
           </varlistentry>
 
           <varlistentry>
-            <term>--with-dhcp-mysql</term>
+            <term>--with-mysql</term>
             <listitem>
               <simpara>
                 Build Kea with code to allow it to store leases (and access
@@ -332,7 +332,7 @@ Debian and Ubuntu:
           </varlistentry>
 
           <varlistentry>
-            <term>--with-dhcp-pgsql</term>
+            <term>--with-pgsql</term>
             <listitem>
               <simpara>
                 Build Kea with code to allow it to store leases (and access
@@ -393,7 +393,7 @@ Debian and Ubuntu:
 
           <screen>$ <userinput>./configure \
       --with-boost-include=/usr/pkg/include \
-      --with-dhcp-pgsql=/usr/local/bin/pg_config \
+      --with-pgsql=/usr/local/bin/pg_config \
       --prefix=/opt/kea</userinput></screen>
         </para>
 
@@ -526,12 +526,12 @@ Debian and Ubuntu:
         <para>
           Build and install Kea as described in <xref linkend="installation"/>, with
           the following modification. To enable the MySQL database code, at the
-          "configure" step (see <xref linkend="configure"/>), the --with-dhcp-mysql switch
+          "configure" step (see <xref linkend="configure"/>), the --with-mysql switch
           should be specified:
-          <screen><userinput>./configure [other-options] --with-dhcp-mysql</userinput></screen>
+          <screen><userinput>./configure [other-options] --with-mysql</userinput></screen>
              If MySQL was not installed in the default location, the location of the MySQL
           configuration program "mysql_config" should be included with the switch, i.e.
-          <screen><userinput>./configure [other-options] --with-dhcp-mysql=<replaceable>path-to-mysql_config</replaceable></userinput></screen>
+          <screen><userinput>./configure [other-options] --with-mysql=<replaceable>path-to-mysql_config</replaceable></userinput></screen>
         </para>
         <para>
           See <xref linkend="mysql-database-create"/> for details regarding
@@ -548,12 +548,12 @@ Debian and Ubuntu:
         <para>
           Build and install Kea as described in <xref linkend="installation"/>, with
           the following modification. To enable the PostgreSQL database code, at the
-          "configure" step (see <xref linkend="configure"/>), the --with-dhcp-pgsql switch
+          "configure" step (see <xref linkend="configure"/>), the --with-pgsql switch
           should be specified:
-          <screen><userinput>./configure [other-options] --with-dhcp-pgsql</userinput></screen>
+          <screen><userinput>./configure [other-options] --with-pgsql</userinput></screen>
              If PostgreSQL was not installed in the default location, the location of the PostgreSQL
           configuration program "pg_config" should be included with the switch, i.e.
-          <screen><userinput>./configure [other-options] --with-dhcp-pgsql=<replaceable>path-to-pg_config</replaceable></userinput></screen>
+          <screen><userinput>./configure [other-options] --with-pgsql=<replaceable>path-to-pg_config</replaceable></userinput></screen>
         </para>
         <para>
           See <xref linkend="pgsql-database-create"/> for details regarding

diff --git a/src/bin/dhcp4/tests/dora_unittest.cc b/src/bin/dhcp4/tests/dora_unittest.cc
index 4719629ceba533f1f52c6915dbf1be542f5ef3e1..8c4fbbd2e72f25abf059ccf4b2aa18fb9e06f2ee 100644 (file)
--- a/src/bin/dhcp4/tests/dora_unittest.cc
+++ b/src/bin/dhcp4/tests/dora_unittest.cc
@@ -1543,7 +1543,7 @@ TEST_F(DORATest, multiStageBoot) {
 
 // Starting tests which require MySQL backend availability. Those tests
 // will not be executed if Kea has been compiled without the
-// --with-dhcp-mysql.
+// --with-mysql.
 #ifdef HAVE_MYSQL
 
 /// @brief Test fixture class for the test utilizing MySQL database backend.
@@ -1576,7 +1576,7 @@ TEST_F(DORAMySQLTest, multiStageBoot) {
 
 // Starting tests which require MySQL backend availability. Those tests
 // will not be executed if Kea has been compiled without the
-// --with-dhcp-pgsql.
+// --with-pgsql.
 #ifdef HAVE_PGSQL
 
 /// @brief Test fixture class for the test utilizing PostgreSQL database backend.

diff --git a/src/bin/dhcp4/tests/kea_controller_unittest.cc b/src/bin/dhcp4/tests/kea_controller_unittest.cc
index c42a022c8804b4498e26c697b843e0cb66e3f786..8f5901d572ad38b0b586fb240b88be06045deb80 100644 (file)
--- a/src/bin/dhcp4/tests/kea_controller_unittest.cc
+++ b/src/bin/dhcp4/tests/kea_controller_unittest.cc
@@ -429,7 +429,7 @@ TEST_F(JSONFileBackendTest, defaultLeaseDbBackend) {
 
 // Starting tests which require MySQL backend availability. Those tests
 // will not be executed if Kea has been compiled without the
-// --with-dhcp-mysql.
+// --with-mysql.
 #ifdef HAVE_MYSQL
 
 /// @brief Test fixture class for the tests utilizing MySQL database

diff --git a/src/bin/dhcp6/tests/kea_controller_unittest.cc b/src/bin/dhcp6/tests/kea_controller_unittest.cc
index dc2fc57c9c374e56db7bce81c18f7c035e43b6b1..1af565e73c0a83ea75e367159c78dd1c24a2ebc2 100644 (file)
--- a/src/bin/dhcp6/tests/kea_controller_unittest.cc
+++ b/src/bin/dhcp6/tests/kea_controller_unittest.cc
@@ -604,7 +604,7 @@ TEST_F(JSONFileBackendTest, defaultLeaseDbBackend) {
 
 // Starting tests which require MySQL backend availability. Those tests
 // will not be executed if Kea has been compiled without the
-// --with-dhcp-mysql.
+// --with-mysql.
 #ifdef HAVE_MYSQL
 
 /// @brief Test fixture class for the tests utilizing MySQL database

diff --git a/src/lib/dhcpsrv/database_backends.dox b/src/lib/dhcpsrv/database_backends.dox
index e237666857058547b55ab8e9732de169295ada2f..8b382a0c2c855ded50bf4f1b77590dbd9b475485 100644 (file)
--- a/src/lib/dhcpsrv/database_backends.dox
+++ b/src/lib/dhcpsrv/database_backends.dox
@@ -23,12 +23,12 @@
 
   - The MySQL lease manager uses the freely available MySQL as its backend
   database.  This is not included in Kea DHCP by default:
-  the \--with-dhcp-mysql switch must be supplied to "configure" for support
+  the \--with-mysql switch must be supplied to "configure" for support
   to be compiled into the software.
 
   - The PostgreSQL lease manager uses the freely available PostgreSQL as its
   backend database.  This is not included in Kea DHCP by default:
-  the \--with-dhcp-pgsql switch must be supplied to "configure" for
+  the \--with-pgsql switch must be supplied to "configure" for
   support to be compiled into the software.
 
   @section dhcpdb-instantiation Instantiation of Lease Managers