diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-04-10 01:39:02 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-04-10 01:39:02 +0200 |
| commit | 039300a1ebee116082d50d61e6b3aeafc8a741ec (patch) | |
| tree | a2fc45bf38993b7979c33c2d30ea0c9a7e5ce03b | |
| parent | cfeb9130bb5d1b512279bbdce0e9211f85d359f6 (diff) | |
| download | guile-039300a1ebee116082d50d61e6b3aeafc8a741ec.tar.gz | |
build: Tell `gen-scmconfig' whether the system has `struct timespec'.
* configure.ac: Reinstate `struct timespec' check removed in commit
7e7c6f6a937005b08fffd5aeccdf992459b07137, but define
`HAVE_SYSTEM_STRUCT_TIMESPEC' instead of `HAVE_STRUCT_TIMESPEC'.
* libguile/gen-scmconfig.c (main): Change `HAVE_STRUCT_TIMESPEC' to
`HAVE_SYSTEM_STRUCT_TIMESPEC'.
| -rw-r--r-- | configure.ac | 23 | ||||
| -rw-r--r-- | libguile/gen-scmconfig.c | 2 |
2 files changed, 24 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index d6cc2eb9a..e5f3a4c84 100644 --- a/configure.ac +++ b/configure.ac @@ -1300,6 +1300,29 @@ if test $scm_cv_struct_linger = yes; then getsockopt and setsockopt system calls.]) fi + +dnl Check for `struct timespec', for the sake of `gen-scmconfig'. When +dnl building Guile, we always have it, thanks to Gnulib; but scmconfig.h +dnl must tell whether the system has it. +dnl +dnl On MinGW, struct timespec is in <pthread.h>. +AC_MSG_CHECKING(for struct timespec) +AC_CACHE_VAL(scm_cv_struct_timespec, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include <time.h> +#if HAVE_PTHREAD_H +#include <pthread.h> +#endif]], [[struct timespec t; t.tv_nsec = 100]])], + [scm_cv_struct_timespec="yes"], + [scm_cv_struct_timespec="no"])) +AC_MSG_RESULT($scm_cv_struct_timespec) +if test $scm_cv_struct_timespec = yes; then + dnl Don't call it `HAVE_STRUCT_TIMESPEC' because pthread-win32's + dnl <pthread.h> checks whether that macro is defined. + AC_DEFINE([HAVE_SYSTEM_STRUCT_TIMESPEC], 1, + [Define this if your system defines struct timespec via either <time.h> or <pthread.h>.]) +fi + #-------------------------------------------------------------------- # # Flags for thread support diff --git a/libguile/gen-scmconfig.c b/libguile/gen-scmconfig.c index 9e15c622d..2f6fa6e6a 100644 --- a/libguile/gen-scmconfig.c +++ b/libguile/gen-scmconfig.c @@ -301,7 +301,7 @@ main (int argc, char *argv[]) pf ("\n"); pf ("/* same as POSIX \"struct timespec\" -- always defined */\n"); -#ifdef HAVE_STRUCT_TIMESPEC +#ifdef HAVE_SYSTEM_STRUCT_TIMESPEC pf ("typedef struct timespec scm_t_timespec;\n"); #else pf ("/* POSIX.4 structure for a time value. This is like a `struct timeval'" |