From 61abcb61e8b8e988dd03cfd4553f29132a8ca38a Mon Sep 17 00:00:00 2001 From: Rob McMahon Date: Tue, 31 Jul 2012 18:21:42 +0200 Subject: 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 --- common/compat.h | 4 ++++ configure.ac | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 +#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 ]) - 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 -- cgit v1.2.1