BIND 10 trac2367_3, updated. c3722f4556ae67562c97d8e2bd21fcaf4da02f6a [2367] Check if --with-dhcp-mysql is used when DHCP components are disabled

[BIND 10 source code commits]

The branch, trac2367_3 has been updated
       via  c3722f4556ae67562c97d8e2bd21fcaf4da02f6a (commit)
       via  59f865028be0c1f93a0a62011c9ce5c15a7d7213 (commit)
       via  a43bb9babad753a036520a6b9549699b762cc149 (commit)
      from  e2c53dd2384abed7a23d19bb9b30f10a8b70a0c3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c3722f4556ae67562c97d8e2bd21fcaf4da02f6a
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Feb 28 05:05:46 2014 +0530

    [2367] Check if --with-dhcp-mysql is used when DHCP components are disabled

commit 59f865028be0c1f93a0a62011c9ce5c15a7d7213
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Feb 28 04:59:12 2014 +0530

    [2367] Disable shared memory checks when DNS components are disabled

commit a43bb9babad753a036520a6b9549699b762cc149
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Feb 28 04:54:59 2014 +0530

    [2367] Update help strings

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index bbc17bc..7177d72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ AC_PROG_CXX
 
 want_dns=yes
 AC_ARG_ENABLE(dns,
-  [AC_HELP_STRING([--enable-dns],
-  [enable DNS components [default=yes]])],
+  [AC_HELP_STRING([--disable-dns],
+  [disable DNS components])],
   [want_dns=$enableval])
 AM_CONDITIONAL([WANT_DNS], [test "$want_dns" = "yes"])
 if test "$want_dns" = "yes"; then
@@ -39,8 +39,8 @@ AC_SUBST(WANT_DNS)
 
 want_dhcp=yes
 AC_ARG_ENABLE(dhcp,
-  [AC_HELP_STRING([--enable-dhcp],
-  [enable DHCP components [default=yes]])],
+  [AC_HELP_STRING([--disable-dhcp],
+  [disable DHCP components])],
   [want_dhcp=$enableval])
 AM_CONDITIONAL([WANT_DHCP], [test "$want_dhcp" = "yes"])
 if test "$want_dhcp" = "yes"; then
@@ -924,6 +924,10 @@ elif test "${mysql_config}" != "no" ; then
 fi
 
 if test "$MYSQL_CONFIG" != "" ; then
+    if test "$want_dhcp" != "yes"; then
+        AC_MSG_ERROR([--with-dhcp-mysql should not be used when DHCP components are disabled])
+    fi
+
     if test -d "$MYSQL_CONFIG" -o ! -x "$MYSQL_CONFIG" ; then
         AC_MSG_ERROR([--with-dhcp-mysql should point to a mysql_config program])
     fi
@@ -1055,7 +1059,7 @@ AC_ARG_WITH(shared-memory,
     AC_HELP_STRING([--with-shared-memory],
     [Build with Boost shared memory support; for large scale authoritative DNS servers]),
     [use_shared_memory=$withval])
-if test X$use_shared_memory = Xyes -a "$BOOST_MAPPED_FILE_WOULDFAIL" = "yes"; then
+if test X$use_shared_memory = Xyes -a "$BOOST_MAPPED_FILE_WOULDFAIL" = "yes" -a "$want_dns" = "yes"; then
     AC_MSG_ERROR([Boost shared memory does not compile on this system.  If you don't need it (most normal users won't) build without it by rerunning this script with --without-shared-memory; using a different compiler or a different version of Boost may also help.])
 fi
 AM_CONDITIONAL([USE_SHARED_MEMORY], [test x$use_shared_memory = xyes])
@@ -1064,7 +1068,7 @@ if test "x$use_shared_memory" = "xyes"; then
 fi
 AC_SUBST(BOOST_MAPPED_FILE_CXXFLAG)
 
-if test "$BOOST_OFFSET_PTR_OLD" = "yes" -a "$use_shared_memory" = "yes" ; then
+if test "$BOOST_OFFSET_PTR_OLD" = "yes" -a "$use_shared_memory" = "yes" -a "$want_dns" = "yes"; then
     AC_MSG_ERROR([You're trying to compile against boost older than 1.48 with
 shared memory. Older versions of boost have a bug which causes segfaults in
 offset_ptr implementation when compiled by GCC with optimisations enabled.