[svn] commit: r2990 - in /branches/trac345: configure.ac src/lib/cc/tests/Makefile.am src/lib/config/tests/Makefile.am

Tue Sep 21 04:04:49 UTC 2010

Author: jinmei
Date: Tue Sep 21 04:04:49 2010
New Revision: 2990

Log:
disable threads for ASIO (trac #345)

Modified:
    branches/trac345/configure.ac
    branches/trac345/src/lib/cc/tests/Makefile.am
    branches/trac345/src/lib/config/tests/Makefile.am

Modified: branches/trac345/configure.ac
==============================================================================

--- branches/trac345/configure.ac (original)
+++ branches/trac345/configure.ac Tue Sep 21 04:04:49 2010
@@ -358,6 +358,9 @@
 # Use local ASIO headers from ext
 #
 CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/ext/asio"
+#
+# Disable threads: Currently we don't use them.
+CPPFLAGS="$CPPFLAGS -DASIO_DISABLE_THREADS=1"
 #
 # kqueue portability: ASIO uses kqueue by default if it's available (it's
 # generally available in BSD variants).  Unfortunately, some public

Modified: branches/trac345/src/lib/cc/tests/Makefile.am
==============================================================================
--- branches/trac345/src/lib/cc/tests/Makefile.am (original)
+++ branches/trac345/src/lib/cc/tests/Makefile.am Tue Sep 21 04:04:49 2010
@@ -18,8 +18,7 @@
 # (TODO: these need to be completed and moved to tests/)
 run_unittests_SOURCES = data_unittests.cc session_unittests.cc run_unittests.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-# TODO: remove PTHREAD_LDFLAGS (and from configure too)
-run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) $(PTHREAD_LDFLAGS)
+run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 
 run_unittests_LDADD = $(GTEST_LDADD)
 run_unittests_LDADD +=  $(top_builddir)/src/lib/cc/libcc.la

Modified: branches/trac345/src/lib/config/tests/Makefile.am
==============================================================================
--- branches/trac345/src/lib/config/tests/Makefile.am (original)
+++ branches/trac345/src/lib/config/tests/Makefile.am Tue Sep 21 04:04:49 2010
@@ -21,8 +21,7 @@
 run_unittests_SOURCES = ccsession_unittests.cc module_spec_unittests.cc config_data_unittests.cc run_unittests.cc
 
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-# TODO: remove PTHREAD_LDFLAGS (and from configure too)
-run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) $(PTHREAD_LDFLAGS)
+run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 run_unittests_LDADD =  $(GTEST_LDADD)
 run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
 run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la


