diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | configure.ac | 43 | ||||
| -rw-r--r-- | m4/config_h.m4 | 2 |
3 files changed, 33 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog index 14e64b9aa1b..718cd23c380 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Sun Jan 16 23:26:58 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * m4/config_h.m4: + + Removed autoheader template for ACE_HAS_SIGINFO_T. + + * configure.ac: + + Simplified check for ACE_HAS_SIGINFO_T. + Added check for ACE_LACKS_SI_ADDR. + Added check for ACE_HAS_PTHREAD_NP_H. + Sun Jan 16 22:14:25 2005 J.T. Conklin <jtc@acorntoolworks.com> * ace/os_include/os_pthread.h: diff --git a/configure.ac b/configure.ac index 7c049a3de83..3780ffd204f 100644 --- a/configure.ac +++ b/configure.ac @@ -539,6 +539,8 @@ ACE_CHECK_LACKS_HEADERS(errno.h) ACE_CHECK_LACKS_HEADERS(fcntl.h) +ACE_CHECK_HAS_HEADERS(pthread_np.h) + ACE_CHECK_LACKS_HEADERS(search.h) ACE_CHECK_HAS_HEADERS(select.h) @@ -1266,28 +1268,25 @@ dnl structure we are testing for. dnl Thanks to Konstantinos Margaritis <kmargar@cc.uoa.gr> for pointing out dnl that struct siginfo_t may also be defined in signal.h -ACE_CACHE_CHECK([for struct siginfo_t],[ace_cv_struct_siginfo_t], - [ - dnl Since we are checking for siginfo_t in more than one header - dnl we can't use the ACE_CHECK_STRUCT macro so we have to do things - dnl manually. - ACE_TRY_COMPILE_STRUCT([siginfo_t],[siginfo.h], - [ - ace_cv_struct_siginfo_t=yes - ], - [ - ACE_TRY_COMPILE_STRUCT([siginfo_t],[signal.h], - [ - ace_cv_struct_siginfo_t=yes - ], - [ - ace_cv_struct_siginfo_t=no - ]) - ]) - ], - [ - AC_DEFINE([ACE_HAS_SIGINFO_T]) - ],) +AC_CHECK_TYPE([siginfo_t], + [AC_DEFINE([ACE_HAS_SIGINFO_T], 1, + [Define to 1 if the system has the type `siginfo_t'.])], + [], + [#include <signal.h> +#ifndef ACE_LACKS_SIGINFO_H +#include <siginfo.h> +#endif]) + +if test "$ac_cv_type_siginfo_t" = yes; then + AC_CHECK_MEMBER([siginfo_t.si_addr], + [], + [AC_DEFINE([ACE_LACKS_SI_ADDR], 1, + [Define to 1 if `si_addr' is not a member of `siginfo_t'.])], + [#include <signal.h> +#ifndef ACE_LACKS_SIGINFO_H +#include <siginfo.h> +#endif]) +fi dnl Some platforms need to include sys/types.h before sys/socket.h dnl in order for struct msghdr to work. diff --git a/m4/config_h.m4 b/m4/config_h.m4 index c99ed098bf3..9da6fe54fb4 100644 --- a/m4/config_h.m4 +++ b/m4/config_h.m4 @@ -650,8 +650,6 @@ AH_TEMPLATE([ACE_HAS_SET_T_ERRNO], AH_TEMPLATE([ACE_HAS_SHM_OPEN],[Platform has shm_open()]) -AH_TEMPLATE([ACE_HAS_SIGINFO_T],[Platform supports SVR4 extended signals]) - AH_TEMPLATE([ACE_HAS_SIGISMEMBER_BUG], [Platform has bug with sigismember() (HP/UX 11).]) |