diff options
| -rw-r--r-- | ACE/ChangeLog | 10 | ||||
| -rw-r--r-- | ACE/configure.ac | 24 | ||||
| -rw-r--r-- | ACE/m4/config_h.m4 | 9 |
3 files changed, 30 insertions, 13 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index e202f623b36..ec7c8eac457 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,13 @@ +Thu Sep 25 00:28:52 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com> + + * configure.ac: + * m4/config_h.m4: + + Replace use of ACE_CHECK_STRUCT with AC_CHECK_TYPE, and the use + of AH_TEMPLATE with AC_DEFINE with a third argument for the + ACE_LACKS_STRUCT_DIR, ACE_LACKS_FILELOCKS, ACE_LACKS_RWLOCK_T, + and ACE_HAS_STRBUF_T feature tests. + Wed Sep 24 17:43:22 UTC 2008 Rich Seibel <seibel_r@ociweb.com> * bin/tao_other_tests.lst: diff --git a/ACE/configure.ac b/ACE/configure.ac index d84260f7936..6d8f65c202f 100644 --- a/ACE/configure.ac +++ b/ACE/configure.ac @@ -1254,10 +1254,26 @@ dnl SECTION 7: checks for structures dnl TODO: Check whether these structures can be defined somewhere else. -ACE_CHECK_STRUCT([dirent],[dirent.h],,[AC_DEFINE([ACE_LACKS_STRUCT_DIR])]) -ACE_CHECK_STRUCT([flock],[fcntl.h],,[AC_DEFINE([ACE_LACKS_FILELOCKS])]) -ACE_CHECK_STRUCT([rwlock_t],[synch.h],,[AC_DEFINE([ACE_LACKS_RWLOCK_T])]) -ACE_CHECK_STRUCT([strbuf],[stropts.h],[AC_DEFINE([ACE_HAS_STRBUF_T])],) +AC_CHECK_TYPE([struct dirent], + [], + [AC_DEFINE([ACE_LACKS_STRUCT_DIR], 1, + [Define to 1 if the system lacks the type `struct dirent'.])], + [#include <dirent.h>]) +AC_CHECK_TYPE([struct flock], + [], + [AC_DEFINE([ACE_LACKS_FILELOCKS], 1, + [Define to 1 if the system lacks the type `struct flock'.])], + [#include <fcntl.h>]) +AC_CHECK_TYPE([rwlock_t], + [], + [AC_DEFINE([ACE_LACKS_RWLOCK_T], 1, + [Define to 1 if the system lacks the type `rwlock_t'.])], + [#include <synch.h>]) +AC_CHECK_TYPE([struct strbuf], + [AC_DEFINE([ACE_HAS_STRBUF_T], 1, + [Define to 1 if the system has the type `struct strbuf'.])], + [], + [#include <stropts.h>]) case "$host" in *irix*) dnl IRIX prusage fields don't match what ACE currently supports. diff --git a/ACE/m4/config_h.m4 b/ACE/m4/config_h.m4 index c3bc66569a6..868a253e0c5 100644 --- a/ACE/m4/config_h.m4 +++ b/ACE/m4/config_h.m4 @@ -568,8 +568,6 @@ AH_TEMPLATE([ACE_HAS_THR_YIELD],[Platform has thr_yield()]) AH_TEMPLATE([ACE_HAS_STANDARD_CPP_LIBRARY], [Platform/compiler supports Standard C++ Library]) -AH_TEMPLATE([ACE_HAS_STRBUF_T],[Compiler/platform supports struct strbuf]) - AH_TEMPLATE([ACE_HAS_STREAMS],[Platform supports STREAMS]) AH_TEMPLATE([ACE_HAS_STREAM_PIPES],[Platform supports STREAM pipes]) @@ -729,8 +727,6 @@ AH_TEMPLATE([ACE_LACKS_EXEC], [Platform lacks the exec() family of system calls (e.g., Win32, VxWorks, Chorus)]) -AH_TEMPLATE([ACE_LACKS_FILELOCKS],[Platform lacks file locking mechanism]) - AH_TEMPLATE([ACE_LACKS_GETSERVBYNAME], [Platforms lacks getservbyname() (e.g., VxWorks and Chorus).]) @@ -794,8 +790,6 @@ AH_TEMPLATE([ACE_LACKS_PWD_FUNCTIONS], AH_TEMPLATE([ACE_LACKS_PWD_REENTRANT_FUNCTIONS], [Platform lacks getpwnam_r() methods (e.g., SGI 6.2).]) -AH_TEMPLATE([ACE_LACKS_RWLOCK_T],[Platform lacks readers/writer locks.]) - AH_TEMPLATE([ACE_LACKS_SEMBUF_T], [Platform lacks struct sembuf (e.g., Win32 and VxWorks)]) @@ -814,9 +808,6 @@ AH_TEMPLATE([ACE_LACKS_SIGNED_CHAR], AH_TEMPLATE([ACE_LACKS_SIGSET], [Platform lacks signal sets (e.g., Chorus and Win32)]) -AH_TEMPLATE([ACE_LACKS_STRUCT_DIR], -[Platform lacks dirent structure.]) - AH_TEMPLATE([ACE_LACKS_SYS_MSG_H], [Platform lacks sys/msg.h (e.g., Chorus and VxWorks)]) |