diff options
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | misc/unix/rand.c | 8 |
2 files changed, 7 insertions, 12 deletions
diff --git a/configure.in b/configure.in index eae3a91a6..ae5fa6e9f 100644 --- a/configure.in +++ b/configure.in @@ -1819,16 +1819,11 @@ osuuid="0" AC_CHECK_HEADERS(uuid/uuid.h uuid.h) -AC_CHECK_FUNCS(uuid_create, [osuuid="1" - AC_DEFINE([HAVE_UUID_CREATE], 1, [Define if libc has uuid_create])], []) +# Check for uuid_generate in libc or libuuid +AC_SEARCH_LIBS(uuid_generate, uuid) -AC_CHECK_FUNCS(uuid_generate, [osuuid="1" - AC_DEFINE([HAVE_UUID_GENERATE], 1, [Define if libc has uuid_generate])], []) +AC_CHECK_FUNCS([uuid_generate uuid_create], [osuuid=1; break]) -AC_CHECK_LIB(uuid, uuid_generate, - [osuuid="1" - APR_ADDTO(LIBS,-luuid) - AC_DEFINE([HAVE_UUID_GENERATE], 1, [Define if libuuid is present])], []) AC_SUBST(osuuid) diff --git a/misc/unix/rand.c b/misc/unix/rand.c index fe9b7b714..4691f08a1 100644 --- a/misc/unix/rand.c +++ b/misc/unix/rand.c @@ -35,10 +35,10 @@ #if APR_HAVE_SYS_UN_H #include <sys/un.h> #endif -#if HAVE_UUID_UUID_H +#ifdef HAVE_UUID_UUID_H #include <uuid/uuid.h> #endif -#if HAVE_UUID_H +#ifdef HAVE_UUID_H #include <uuid.h> #endif @@ -46,7 +46,7 @@ #define SHUT_RDWR 2 #endif -#if HAVE_UUID_CREATE +#if defined(HAVE_UUID_CREATE) APR_DECLARE(apr_status_t) apr_os_uuid_get(unsigned char *uuid_data) { @@ -59,7 +59,7 @@ APR_DECLARE(apr_status_t) apr_os_uuid_get(unsigned char *uuid_data) return APR_SUCCESS; } -#elif HAVE_UUID_GENERATE +#elif defined(HAVE_UUID_GENERATE) APR_DECLARE(apr_status_t) apr_os_uuid_get(unsigned char *uuid_data) { |