BIND 10 trac2340, updated. b10b39f8ac7b07f6b429c0e09fcd9d0a3a873492 [2340] corrected the position of closing 'fi' for an 'if GXX = yes'.

[BIND 10 source code commits]

The branch, trac2340 has been updated
       via  b10b39f8ac7b07f6b429c0e09fcd9d0a3a873492 (commit)
       via  28a6c7133b1fa8f5334f91c514f5dc8e0802e4eb (commit)
      from  c629dec43601cd76158bef6aa8b76cea84181fc2 (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 b10b39f8ac7b07f6b429c0e09fcd9d0a3a873492
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Oct 10 11:02:24 2012 -0700

    [2340] corrected the position of closing 'fi' for an 'if GXX = yes'.

commit 28a6c7133b1fa8f5334f91c514f5dc8e0802e4eb
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Oct 9 16:43:16 2012 -0700

    [2340] added comment about why we need to explicitly define empty dtor.

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

Summary of changes:
 configure.ac         |    7 ++++---
 src/lib/util/locks.h |    3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 900ff37..4226816 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,6 +166,8 @@ if test $with_werror = 1; then
    CXXFLAGS="$CXXFLAGS_SAVED"
 fi
 
+fi				dnl GXX = yes
+
 AM_CONDITIONAL(GCC_WERROR_OK, test $werror_ok = 1)
 
 # allow building programs with static link.  we need to make it selective
@@ -354,10 +356,11 @@ fi
 
 # TODO: check for _sqlite3.py module
 
+# (g++ only check)
 # Python 3.2 has an unused parameter in one of its headers. This
 # has been reported, but not fixed as of yet, so we check if we need
 # to set -Wno-unused-parameter.
-if test $werror_ok = 1; then
+if test "X$GXX" = "Xyes" -a test $werror_ok = 1; then
 	CPPFLAGS_SAVED="$CPPFLAGS"
 	CPPFLAGS=${PYTHON_INCLUDES}
 	CXXFLAGS_SAVED="$CXXFLAGS"
@@ -383,8 +386,6 @@ if test $werror_ok = 1; then
 	CPPFLAGS="$CPPFLAGS_SAVED"
 fi
 
-fi				dnl GXX = yes
-
 # produce PIC unless we disable shared libraries. need this for python bindings.
 if test $enable_shared != "no" -a "X$GXX" = "Xyes"; then
    B10_CXXFLAGS="$B10_CXXFLAGS -fPIC"
diff --git a/src/lib/util/locks.h b/src/lib/util/locks.h
index 3b51a5a..f33ff96 100644
--- a/src/lib/util/locks.h
+++ b/src/lib/util/locks.h
@@ -49,6 +49,9 @@ template <typename T>
 class scoped_lock {
 public:
     scoped_lock(T) {}
+
+    // We need to define this explicitly.  Some versions of clang++ would
+    // complain about this otherwise.  See Trac ticket #2340
     ~scoped_lock() {}
 
     void lock() {}