diff options
| author | Steve Huston <shuston@riverace.com> | 2007-08-15 15:08:51 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2007-08-15 15:08:51 +0000 |
| commit | 963e29b79351de47ac0b963bee4b8fc9843ea38a (patch) | |
| tree | bdabc726b75338746f0502e76759d1f26f0ff6b1 | |
| parent | 7b5dcdf8cca0a7b753993c14340c61ac2f0ff019 (diff) | |
| download | ATCD-963e29b79351de47ac0b963bee4b8fc9843ea38a.tar.gz | |
ChangeLogTag:Wed Aug 15 14:57:06 UTC 2007 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/m4/platform.m4 | 5 | ||||
| -rw-r--r-- | ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am | 2 |
3 files changed, 14 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index ba863c1fbbd..6354aeecd46 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Wed Aug 15 14:57:06 UTC 2007 Steve Huston <shuston@riverace.com> + + * m4/platform.m4: Check for NPTL on Linux. Fixes Bugzilla 3044. + + * protocols/tests/HTBP/Send_Recv_Tests/Makefile.am: Corrected + multi-test syntax. + Wed Aug 15 14:55:36 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com> * tests/ACE_Init_Test.h: diff --git a/ACE/m4/platform.m4 b/ACE/m4/platform.m4 index 3c7839e4d5d..12cc0248470 100644 --- a/ACE/m4/platform.m4 +++ b/ACE/m4/platform.m4 @@ -167,6 +167,11 @@ dnl FIXME: "FSU" isn't a platform! We need to move this somewhere. AC_DEFINE([ACE_DEFAULT_BASE_ADDR], [((char *) 0x80000000)]) AC_DEFINE([ACE_HAS_BIG_FD_SET]) dnl FIXME: We need a test for this! AC_DEFINE([ACE_TIMER_SKEW], [(1000 * 10)]) + dnl Does this box have NPTL? + NPTL=`getconf GNU_LIBPTHREAD_VERSION | $AWK '{print [$][1]}' -` + if test "$NPTL" = NPTL; then + ACE_CPPFLAGS="$ACE_CPPFLAGS -DACE_HAS_LINUX_NPTL" + fi ;; *lynxos*) ACE_CPPFLAGS="$ACE_CPPFLAGS -D_POSIX_THREADS_CALLS" diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am b/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am index 17c1b324f0a..cd211acf455 100644 --- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am +++ b/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am @@ -11,6 +11,8 @@ ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.SendRecv_Test_Client.am if BUILD_ACE_UUID |