summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ACE/ChangeLog22
-rw-r--r--ACE/configure.ac17
-rw-r--r--ACE/m4/acinclude.m416
-rw-r--r--ACE/m4/config_h.m433
4 files changed, 55 insertions, 33 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index d4092f4908e..752071110b2 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,25 @@
+Thu Sep 25 17:37:19 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * m4/config_h.m4:
+
+ Add comment explaining why I'm bothering replacing autoheader
+ templates in this file.
+
+ * m4/acinclude.m4:
+ * m4/config_h.m4:
+
+ Move ACE_HAS_LLSEEK, ACE_HAS_LSEEK64,
+ ACE_LACKS_LLSEEK_PROTOTYPE, and ACE_LACKS_LSEEK64_PROTOTYPE
+ autoheader templates to ACE_CHECK_LSEEK64 feature test macro.
+
+ * configure.ac:
+ * m4/config_h.m4:
+
+ Replace use of autoheader templates with AC_DEFINE macro's third
+ argument for ACE_LACKS_CONDATTR_PSHARED,
+ ACE_LACKS_MUTEXATTR_PSHARED, and ACE_LACKS_RWLOCKATTR_PSHARED
+ feature tests.
+
Thu Sep 25 16:45:16 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com>
* configure.ac:
diff --git a/ACE/configure.ac b/ACE/configure.ac
index 2d2376f0f17..83e9b208c52 100644
--- a/ACE/configure.ac
+++ b/ACE/configure.ac
@@ -4075,8 +4075,9 @@ dnl name.
dnl Can't use ACE_CHECK_LACKS_FUNCS because the macro doesn't match the
dnl tested function name.
AC_CHECK_FUNC([pthread_condattr_setpshared],
- ,
- [AC_DEFINE([ACE_LACKS_CONDATTR_PSHARED])])
+ [],
+ [AC_DEFINE([ACE_LACKS_CONDATTR_PSHARED], 1,
+ [Define to 1 if system lacks pthread_condattr_setpshared()])])
dnl ACE_CHECK_LACKS_FUNCS(pthread_attr_setstack)
dnl Can't use ACE_CHECK_LACKS_FUNCS because the lower-down AC macros build
@@ -4153,12 +4154,13 @@ dnl name.
])
AC_CHECK_FUNC([pthread_attr_setscope],
- ,
+ [],
[AC_DEFINE([ACE_LACKS_THREAD_PROCESS_SCOPING])])
AC_CHECK_FUNC([pthread_mutexattr_setpshared],
- ,
- [AC_DEFINE([ACE_LACKS_MUTEXATTR_PSHARED])])
+ [],
+ [AC_DEFINE([ACE_LACKS_MUTEXATTR_PSHARED], 1,
+ [Define to 1 if system lacks pthread_mutexattr_setpshared().])])
dnl Check for POSIX Threads Draft 4 functions
AC_CHECK_FUNC([pthread_mutexattr_create],,)
@@ -4328,8 +4330,9 @@ fi dnl test "$ac_cv_type_cpu_set_t" = yes
AC_CHECK_FUNC([pthread_rwlockattr_init],,)
AC_CHECK_FUNC([pthread_rwlockattr_destroy],,)
AC_CHECK_FUNC([pthread_rwlockattr_setpshared],
- ,
- [AC_DEFINE([ACE_LACKS_RWLOCKATTR_PSHARED])])
+ [],
+ [AC_DEFINE([ACE_LACKS_RWLOCKATTR_PSHARED], 1,
+ [Define to 1 if system lacks pthread_rwlockattr_setpshared().])])
if test "$ac_cv_type_pthread_rwlock_t" = yes &&
test "$ac_cv_type_pthread_rwlockattr_t" = yes &&
diff --git a/ACE/m4/acinclude.m4 b/ACE/m4/acinclude.m4
index dd48e29f686..fed088549bf 100644
--- a/ACE/m4/acinclude.m4
+++ b/ACE/m4/acinclude.m4
@@ -399,6 +399,22 @@ dnl Check for 64 bit llseek() or lseek64()
dnl Usage: ACE_CHECK_LSEEK64
AC_DEFUN([ACE_CHECK_LSEEK64],
[
+ AH_TEMPLATE([ACE_HAS_LSEEK64],
+ [Platform supports lseek64(). This should not be defined if
+ ACE_HAS_LLSEEK is defined.])
+
+ AH_TEMPLATE([ACE_LACKS_LSEEK64_PROTOTYPE],
+ [Platform/compiler lacks the lseek64() prototype. This should not
+ be defined if ACE_LACKS_LLSEEK_PROTOTYPE is defined.])
+
+ AH_TEMPLATE([ACE_HAS_LLSEEK],
+ [Platform supports llseek(). This should not be defined if
+ ACE_HAS_LSEEK64 is defined.])
+
+ AH_TEMPLATE([ACE_LACKS_LLSEEK_PROTOTYPE],
+ [Platform/compiler lacks the llseek() prototype. This should not
+ be defined if ACE_LACKS_LSEEK64_PROTOTYPE is defined.])
+
AC_CHECK_FUNC([lseek64],
[
AC_DEFINE([ACE_HAS_LSEEK64])
diff --git a/ACE/m4/config_h.m4 b/ACE/m4/config_h.m4
index 9d51e789620..e5f1b4a9812 100644
--- a/ACE/m4/config_h.m4
+++ b/ACE/m4/config_h.m4
@@ -7,6 +7,13 @@ dnl ACE M4 include file which contains preprocessor constants
dnl and other items to be place in the generated ace/config.h
dnl header.
dnl
+dnl Please try to avoid adding new autoheader templates to this
+dnl file, as they get included in both ACE and TAO config.h.in
+dnl files, even though the cooresponding feature tests are only
+dnl included in the ACE configure script. Put the autoheader
+dnl template in a AC_DEFUN used for the feature test, or use the
+dnl AC_DEFINE macro's third argument.
+dnl
dnl -------------------------------------------------------------------------
dnl Copyright (C) 2002, 2003 Ossama Othman
@@ -335,14 +342,6 @@ AH_TEMPLATE([ACE_HAS_GPERF],
AH_TEMPLATE([ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT],
[Optimize ACE_Handle_Set::count_bits for select() operations (common case)])
-AH_TEMPLATE([ACE_HAS_LSEEK64],
-[Platform supports lseek64(). This should not be defined if
- ACE_HAS_LLSEEK is defined.])
-
-AH_TEMPLATE([ACE_HAS_LLSEEK],
-[Platform supports llseek(). This should not be defined if
- ACE_HAS_LSEEK64 is defined.])
-
AH_TEMPLATE([ACE_HAS_INLINED_OSCALLS],[
Inline all the static class OS methods to remove call overhead
Note: This gets defined by OS.h if __ACE_INLINE__ is defined])
@@ -707,10 +706,6 @@ AH_TEMPLATE([ACE_LACKS_COND_TIMEDWAIT_RESET],
[pthread_cond_timedwait does *not* reset the time argument when
the lock is acquired.])
-AH_TEMPLATE([ACE_LACKS_CONDATTR_PSHARED],
-[Platform has no implementation of pthread_condattr_setpshared(), even
- though it supports pthreads!])
-
AH_TEMPLATE([ACE_LACKS_CONST_STRBUF_PTR],
[Platform uses struct strbuf * rather than const struct strbuf *
(e.g., HP/UX 10.x)])
@@ -746,9 +741,6 @@ AH_TEMPLATE([ACE_LACKS_MODE_MASKS],
AH_TEMPLATE([ACE_LACKS_MSG_ACCRIGHTS],
[Platform defines ACE_HAS_MSG, but lacks msg_accrights{len}.])
-AH_TEMPLATE([ACE_LACKS_MUTEXATTR_PSHARED],
-[Platform lacks pthread_mutexattr_setpshared().])
-
AH_TEMPLATE([ACE_LACKS_NULL_PTHREAD_STATUS],
[OS requires non-null status pointer for pthread_join ()])
@@ -765,9 +757,6 @@ AH_TEMPLATE([ACE_LACKS_RLIMIT],
[Platform/compiler lacks {get,set}rlimit() function (e.g., VxWorks,
Chorus, and SCO UNIX)])
-AH_TEMPLATE([ACE_LACKS_RWLOCKATTR_PSHARED],
-[Platform lacks pthread_rwlockattr_setpshared().])
-
AH_TEMPLATE([ACE_LACKS_PLACEMENT_OPERATOR_DELETE],
[Compiler doesn't support placement operator delete(void *, void *).])
@@ -823,14 +812,6 @@ AH_TEMPLATE([ACE_LACKS_TIMESPEC_T],
AH_TEMPLATE([ACE_LACKS_STRTOK_R_PROTOTYPE],
[Platform/compiler lacks the strtok_r() prototype])
-AH_TEMPLATE([ACE_LACKS_LSEEK64_PROTOTYPE],
-[Platform/compiler lacks the lseek64() prototype. This should not
- be defined if ACE_LACKS_LLSEEK_PROTOTYPE is defined.])
-
-AH_TEMPLATE([ACE_LACKS_LLSEEK_PROTOTYPE],
-[Platform/compiler lacks the llseek() prototype. This should not
- be defined if ACE_LACKS_LSEEK64_PROTOTYPE is defined.])
-
AH_TEMPLATE([ACE_LACKS_PREAD_PROTOTYPE],
[Platform/compiler lacks the pread() and pwrite() prototypes])
View Lorry Controller Status