diff options
| author | Rob McMahon <Rob.McMahon@warwick.ac.uk> | 2012-07-31 18:21:42 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2012-07-31 18:22:12 +0200 |
| commit | 61abcb61e8b8e988dd03cfd4553f29132a8ca38a (patch) | |
| tree | 8d61fae0634970942483be334925c1a9e2ebd5c6 | |
| parent | 76180db6b326f8c87aef5b3eded9463432ce8d82 (diff) | |
| download | p11-kit-61abcb61e8b8e988dd03cfd4553f29132a8ca38a.tar.gz | |
Fix build on solaris
* Conditional inclusion of the errno.h header
* Link librt when appropriate for nanosleep
https://bugs.freedesktop.org/show_bug.cgi?id=52261
| -rw-r--r-- | common/compat.h | 4 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/common/compat.h b/common/compat.h index 6326430..8b3ac21 100644 --- a/common/compat.h +++ b/common/compat.h @@ -76,4 +76,8 @@ void vwarnx (const char *fmt, va_list ap); #endif /* !HAVE_ERR_H */ +#ifdef HAVE_ERRNO_H +#include <errno.h> +#endif /* HAVE_ERRNO_H */ + #endif /* __COMPAT_H__ */ diff --git a/configure.ac b/configure.ac index b6d21d0..a42d205 100644 --- a/configure.ac +++ b/configure.ac @@ -65,8 +65,10 @@ if test "$os_unix" = "yes"; then [AC_MSG_ERROR([could not find pthread_mutex_lock])]) AC_SEARCH_LIBS([dlopen], [dl dld], [], [AC_MSG_ERROR([could not find dlopen])]) + AC_SEARCH_LIBS([nanosleep], [rt], [], + [AC_MSG_ERROR([could not find nanosleep])]) AC_CHECK_MEMBERS([struct dirent.d_type],,,[#include <dirent.h>]) - AC_CHECK_HEADERS([err.h]) + AC_CHECK_HEADERS([err.h errno.h]) AC_CHECK_FUNCS([getprogname getexecname]) # Check if these are declared and/or available to link against |