[svn] commit: r1951 - in /branches/trac168: configure.ac ext/asio/detail/epoll_reactor.hpp

[BIND 10 source code commits]

Author: each
Date: Thu May 27 18:24:10 2010
New Revision: 1951

Log:
checkpoint: reverted convigure.ac change, removed UNUSED_PARAM from asio code

Modified:
    branches/trac168/configure.ac
    branches/trac168/ext/asio/detail/epoll_reactor.hpp

Modified: branches/trac168/configure.ac
==============================================================================
--- branches/trac168/configure.ac (original)
+++ branches/trac168/configure.ac Thu May 27 18:24:10 2010
@@ -174,6 +174,70 @@
 	AC_SUBST(GENHTML)
 fi
 AC_SUBST(USE_LCOV)
+
+AC_ARG_WITH([boost-include],
+  AC_HELP_STRING([--with-boost-include=PATH],
+    [specify exact directory for Boost headers]),
+    [boost_include_path="$withval"])
+if test "${boost_include_path}" ; then
+	BOOST_INCLUDES="-I${boost_include_path}"
+	CPPFLAGS="$CPPFLAGS $BOOST_INCLUDES"
+fi
+AC_SUBST(BOOST_INCLUDES)
+
+AC_ARG_WITH([boost-lib],
+AC_HELP_STRING([--with-boost-lib=PATH],
+  [specify exact directory for Boost libraries]),
+  [if test "$withval" != "yes" -a "$withval" != "no"; then
+   BOOST_LDFLAGS="-L$withval"
+   fi])
+AC_SUBST(BOOST_LDFLAGS)
+
+# Check availability of the Boost System library
+
+AC_MSG_CHECKING([for boost::system library])
+AC_ARG_WITH([boost-system],
+AC_HELP_STRING([--with-boost-system],
+  [specify whether to use the boost system library]),
+  [with_boost_system="$withval"], [with_boost_system="auto"])
+
+if test "$with_boost_system" != "no"; then
+	LDFLAGS_SAVED="$LDFLAGS"
+	LIBS_SAVED="$LIBS"
+	CPPFLAGS_SAVED="$CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS -Iext"
+
+	for BOOST_TRY_LIB in boost_system boost_system-mt; do
+		LDFLAGS="$LDFLAGS_SAVED ${BOOST_LDFLAGS}"
+		LIBS="$LIBS_SAVED -l${BOOST_TRY_LIB}"
+		AC_TRY_LINK([#include <boost/system/error_code.hpp>],
+			[ boost::system::error_code error_code;
+			std::string message(error_code.message());
+			return 0; ],
+			[ AC_MSG_RESULT(yes)
+			BOOST_SYSTEM_LIB="-l${BOOST_TRY_LIB}"
+			],[])
+		if test "X${BOOST_SYSTEM_LIB}" != X; then
+        		break
+		fi
+	done
+
+	LDFLAGS="$LDFLAGS_SAVED"
+	CPPFLAGS="$CPPFLAGS_SAVED"
+	LIBS="$LIBS_SAVED"
+fi
+
+if test "X${BOOST_SYSTEM_LIB}" = X; then
+	AC_MSG_RESULT(no)
+	if test "$with_boost_system" = "yes"; then
+	   AC_MSG_ERROR([boost system library is requested but not found])
+	fi
+else
+	AC_DEFINE(HAVE_BOOST_SYSTEM, 1, Define to 1 if boost system library is available)
+fi
+
+AM_CONDITIONAL(HAVE_BOOST_SYSTEM, test "X${BOOST_SYSTEM_LIB}" != X)
+AC_SUBST(BOOST_SYSTEM_LIB)
 
 # Check availability of the Boost Python library
 
@@ -411,6 +475,7 @@
   CXXFLAGS:      $CXXFLAGS
 dnl includes too
   Boost Python:  $BOOST_PYTHON_LIB
+  Boost System:  $BOOST_SYSTEM_LIB
   SQLite:	 $SQLITE_CFLAGS
                  $SQLITE_LIBS
 

Modified: branches/trac168/ext/asio/detail/epoll_reactor.hpp
==============================================================================
--- branches/trac168/ext/asio/detail/epoll_reactor.hpp (original)
+++ branches/trac168/ext/asio/detail/epoll_reactor.hpp Thu May 27 18:24:10 2010
@@ -207,7 +207,7 @@
   // Cancel all operations associated with the given descriptor. The
   // handlers associated with the descriptor will be invoked with the
   // operation_aborted error.
-  void cancel_ops(socket_type descriptor UNUSED_PARAM, per_descriptor_data& descriptor_data)
+  void cancel_ops(socket_type descriptor, per_descriptor_data& descriptor_data)
   {
     mutex::scoped_lock descriptor_lock(descriptor_data->mutex_);