Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,15 @@ AC_ARG_WITH([bash],
[BASHPATH="$withval"],
[AC_PATH_PROG([BASHPATH], [bash])])
AC_CHECK_PROGS([GROFF], [groff])
if test -n "$GROFF"; then
AC_MSG_CHECKING([whether groff supports HTML output])
if echo '.TH test 1' | $GROFF -mandoc -Thtml >/dev/null 2>&1; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
GROFF=""
fi
fi

# Checks for typedefs.
AC_TYPE_UID_T
Expand All @@ -100,6 +109,11 @@ AC_TYPE_SIZE_T
AC_TYPE_SSIZE_T

# Checks for libraries.

# On Solaris/illumos, socket functions live in libsocket and gethostbyname in libnsl
AC_SEARCH_LIBS([socket], [socket])
AC_SEARCH_LIBS([gethostbyname], [nsl])

PKG_CHECK_MODULES([nss],[nss])
PKG_CHECK_MODULES([corosync_common], [libcorosync_common])
PKG_CHECK_MODULES([cmap], [libcmap])
Expand Down
2 changes: 1 addition & 1 deletion qdevices/tlv.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
/*
* 64-bit variant of ntoh is not exactly standard...
*/
#if defined(__linux__)
#if defined(__linux__) || defined(__sun)
#include <endian.h>
#elif defined(__FreeBSD__) || defined(__NetBSD__)
#include <sys/endian.h>
Expand Down
5 changes: 5 additions & 0 deletions qdevices/unix-socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@
#include "unix-socket.h"
#include "utils.h"

/* On Solaris/illumos, GCC predefines "sun" as a numeric macro for platform
* detection, which conflicts with the local variable name "sun" used for
* struct sockaddr_un. */
#undef sun

int
unix_socket_server_create(const char *path, int set_socket_umask, mode_t socket_umask,
gid_t socket_gid, int non_blocking, int backlog)
Expand Down
4 changes: 4 additions & 0 deletions qdevices/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#endif

#include <sys/types.h>
#include <sys/file.h>
#include <arpa/inet.h>
Expand Down