diff options
| -rw-r--r-- | ACE/ChangeLog | 12 | ||||
| -rw-r--r-- | ACE/configure.ac | 46 | ||||
| -rw-r--r-- | ACE/m4/config_h.m4 | 3 |
3 files changed, 20 insertions, 41 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 79906a3602c..dcc879bf4b8 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,15 @@ +Thu Sep 25 16:23:26 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com> + + * configure.ac: + * m4/config_h.m4: + + Replace ~50 lines of open code with simple call to AC_CHECK_TYPE + with ACE_DEFINE with a third argument for the ACE_LACKS_SEMBUF_T + feature test. + + Move feature test for ACE_HAS_BYTESEX_H so it's adjacent to the + test for ACE_HAS_BYTESWAP_H. + Thu Sep 25 13:58:48 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com> * m4/acinclude.m4: diff --git a/ACE/configure.ac b/ACE/configure.ac index 850a277380c..b5f1516c5be 100644 --- a/ACE/configure.ac +++ b/ACE/configure.ac @@ -505,8 +505,6 @@ AC_CHECK_HEADER([dlfcn.h], ACE_CHECK_LACKS_HEADERS(inttypes.h malloc.h memory.h stdint.h) -ACE_CHECK_HAS_HEADERS(bytesex.h) - AC_CHECK_HEADER([sys/msg.h], [ ACE_CACHE_CHECK([if _KERNEL is needed for msg prototypes], @@ -592,6 +590,8 @@ AC_CHECK_HEADER([sys/procfs.h], ACE_CHECK_LACKS_HEADERS(arpa/inet.h) +ACE_CHECK_HAS_HEADERS(bytesex.h) + ACE_CHECK_HAS_HEADERS(byteswap.h) ACE_CHECK_LACKS_HEADERS(dirent.h) @@ -1309,46 +1309,16 @@ AC_CHECK_TYPE([struct utsname], [AC_DEFINE([ACE_LACKS_UTSNAME_T], 1, [Define to 1 if the system lacks the type `struct utsname'.])], [#include <sys/utsname.h>]) - -ACE_CACHE_CHECK([for struct sembuf],[ace_cv_struct_sembuf], - [ - dnl Some platforms may need to include some headers before <sys/sem.h>. - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#ifndef ACE_LACKS_SYS_TYPES_H -# include <sys/types.h> -#endif -#include <sys/ipc.h> -#include <sys/sem.h> - ]],[[ - struct sembuf ace_sembuf; - ]])],[ - ace_cv_struct_sembuf=yes - ],[ -dnl Some compilers don't like the "struct" but we need the struct for -dnl some platforms to resolve ambiguities between functions and -dnl structures with with the same name. So, we try the same test but -dnl without "struct" if the above test with "struct" fails. If both -dnl tests fail, then we can be reasonably sure that we don't have the -dnl structure we are testing for. - AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [[ +AC_CHECK_TYPE([struct sembuf], + [], + [AC_DEFINE([ACE_LACKS_SEMBUF_T], 1, + [Define to 1 if the system lacks the type `struct sembuf'.])], + [ #ifndef ACE_LACKS_SYS_TYPES_H # include <sys/types.h> #endif #include <sys/ipc.h> -#include <sys/sem.h> - ]], - [[ - sembuf ace_sembuf; - ]])], - [ - ace_cv_struct_sembuf=yes - ], - [ - ace_cv_struct_sembuf=no - ]) - ]) - ],,[AC_DEFINE([ACE_LACKS_SEMBUF_T])]) +#include <sys/sem.h>]) dnl Thanks to Konstantinos Margaritis <kmargar@cc.uoa.gr> for pointing out dnl that struct siginfo_t may also be defined in signal.h diff --git a/ACE/m4/config_h.m4 b/ACE/m4/config_h.m4 index 3ba72da6ac0..bc7d4e74a2a 100644 --- a/ACE/m4/config_h.m4 +++ b/ACE/m4/config_h.m4 @@ -785,9 +785,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_SEMBUF_T], -[Platform lacks struct sembuf (e.g., Win32 and VxWorks)]) - AH_TEMPLATE([ACE_LACKS_SETDETACH], [Platform lacks pthread_attr_setdetachstate() (e.g., HP/UX 10.x)]) |