From caae86e6f8b8150ad8663c3173fcd6df3c2e260a Mon Sep 17 00:00:00 2001 From: Milind Changire Date: Thu, 5 Nov 2015 19:57:51 +0530 Subject: build: fix ecdh.h and dh.h deps openssl.ecdh.h and openssl/dh.h are not available on all platforms. This patch adds check to autoconf and updates relevant source files. Add missing #include "config.h" to socket.c to make HAVE_OPENSSL_DH_H and HAVE_OPENSSL_ECDH_H macros available. Definitions for UTIME_OMIT and UTIME_NOW in contrib/qemu/util/oslib-posix.c have been selected from /usr/include/bits/stat.h on Fedora 22 SSL context options SSL_OP_NO_TICKET and SSL_OP_NO_COMPRESSION are now conditionally set by testing their presence. glusterfs.spec.in file now adds CFLAGS=-DUSE_INSECURE_OPENSSL for RHEL < 6 in the %build section. Change-Id: Ie32a950dad77bb0f09b4ba53edb3e1f3147056f3 BUG: 1258883 Signed-off-by: Milind Changire Reviewed-on: http://review.gluster.org/12517 Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY Reviewed-by: Jeff Darcy --- contrib/qemu/util/oslib-posix.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'contrib') diff --git a/contrib/qemu/util/oslib-posix.c b/contrib/qemu/util/oslib-posix.c index bac4c1a158e..45f9ca5a156 100644 --- a/contrib/qemu/util/oslib-posix.c +++ b/contrib/qemu/util/oslib-posix.c @@ -191,6 +191,13 @@ int qemu_pipe(int pipefd[2]) return ret; } +#ifndef UTIME_OMIT +#define UTIME_OMIT ((1l << 30) - 2l) +#endif +#ifndef UTIME_NOW +#define UTIME_NOW ((1l << 30) - 1l) +#endif + int qemu_utimens(const char *path, const struct timespec *times) { struct timeval tv[2], tv_now; -- cgit