diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-04 15:38:41 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-04 15:38:41 +0000 |
| commit | da2fb0a552bfd7c914c2aba33f9f1f41654f8d7a (patch) | |
| tree | 260caf1ee1ca01ef42b37a59c628b604d826385c | |
| parent | bcdee51b2a22e6c6ceaefd9c48f3f02d3044924d (diff) | |
| download | ATCD-da2fb0a552bfd7c914c2aba33f9f1f41654f8d7a.tar.gz | |
ChangeLogTag: Thu Jan 4 15:33:08 UTC 2007 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/configure.ac | 52 |
2 files changed, 30 insertions, 30 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index d2bb2d0ff5a..09f97907d67 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Thu Jan 4 15:33:08 UTC 2007 J.T. Conklin <jtc@acorntoolworks.com> + + * configure.ac: + + Check <sys/time.h> instead of <time.h> for gettimeofday() + prototype. Also use AC_CHECK_DECL instead of AC_EGREP_CPP. + This fixes bugzilla bug 2764. + Thu Jan 4 13:53:33 UTC 2007 J.T. Conklin <jtc@acorntoolworks.com> * ACEXML/tests/Makefile.am: diff --git a/ACE/configure.ac b/ACE/configure.ac index c5b69dd18c5..3d61783c164 100644 --- a/ACE/configure.ac +++ b/ACE/configure.ac @@ -6279,36 +6279,28 @@ fi dnl test "$ace_cv_lib_voidptr_gettimeofday" = no dnl Check for gettimeofday() protoype if test "$ace_cv_lib_voidptr_gettimeofday" = yes || test "$ace_cv_lib_timezone_gettimeofday" = yes; then - ACE_CACHE_CHECK([for gettimeofday() protoype], - [ace_cv_lib_has_gettimeofday_prototype], - [ - AC_EGREP_CPP([gettimeofday], - [ -#include <time.h> - ], - [ -dnl We have a gettimeofday prototype - ace_cv_lib_has_gettimeofday_prototype=yes - ], - [ -dnl We don't have a gettimeofday prototype - ace_cv_lib_has_gettimeofday_prototype=no - ]) - ], - [ - if test "$ace_cv_lib_voidptr_gettimeofday" = yes; then - AC_DEFINE([ACE_HAS_VOIDPTR_GETTIMEOFDAY]) - else - AC_DEFINE([ACE_HAS_TIMEZONE_GETTIMEOFDAY]) - fi - ], - [ - if test "$ace_cv_lib_voidptr_gettimeofday" = yes; then - AC_DEFINE([ACE_HAS_SVR4_GETTIMEOFDAY]) - else - AC_DEFINE([ACE_HAS_OSF1_GETTIMEOFDAY]) - fi - ]) + +AC_CHECK_DECL([gettimeofday], + [ +if test "$ace_cv_lib_voidptr_gettimeofday" = yes; then + AC_DEFINE([ACE_HAS_VOIDPTR_GETTIMEOFDAY]) +else + AC_DEFINE([ACE_HAS_TIMEZONE_GETTIMEOFDAY]) +fi + ],[ +if test "$ace_cv_lib_voidptr_gettimeofday" = yes; then + AC_DEFINE([ACE_HAS_SVR4_GETTIMEOFDAY]) +else + AC_DEFINE([ACE_HAS_OSF1_GETTIMEOFDAY]) +fi + ], + [ +#include <sys/time.h> +#ifndef ACE_LACKS_UNISTD_H +# include <unistd.h> +#endif + ]) + fi dnl Check for gettimeofday() protoype |