From 8cc7aef25ecc698b6fdfa620877f72e6b8dd536f Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Wed, 13 Jan 2010 13:09:45 +0000 Subject: Initial OpenBSD fixes (#994): pjlib: - Autoconf fixes in detecting header availability - Undefined sched_get_priority_max() and sched_get_priority_min() - protect with #ifdef _POSIX_PRIORITY_SCHEDULING, and - return hardcoded (0, 31) if __OpenBSD__ macro is declared - Better GUID generation pjlib-test: - Reduce the loop in PJILB activesock test - Fixed bug in ioqueue unregistration test which caused assertion error in destroying mutex pjlib-util-test: - Fixed bug in pjlib-util resolver test git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3057 74dad513-b988-da41-8d7b-12977e46ad98 --- aconfigure.ac | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'aconfigure.ac') diff --git a/aconfigure.ac b/aconfigure.ac index 7f579e7f..0eedcfc6 100644 --- a/aconfigure.ac +++ b/aconfigure.ac @@ -146,9 +146,15 @@ AC_CHECK_HEADER(netdb.h,[AC_DEFINE(PJ_HAS_NETDB_H,1)]) AC_CHECK_HEADER(netinet/in_systm.h,[AC_DEFINE(PJ_HAS_NETINET_IN_SYSTM_H,1)]) AC_CHECK_HEADER(netinet/in.h,[AC_DEFINE(PJ_HAS_NETINET_IN_H,1)]) AC_CHECK_HEADER(netinet/ip.h,[AC_DEFINE(PJ_HAS_NETINET_IP_H,1)],[], - [#if PJ_HAS_NETINET_IN_SYSTM_H + [#if PJ_HAS_SYS_TYPES_H + # include + #endif + #if PJ_HAS_NETINET_IN_SYSTM_H # include #endif + #if PJ_HAS_NETINET_IN_H + # include + #endif ]) AC_CHECK_HEADER(netinet/tcp.h,[AC_DEFINE(PJ_HAS_NETINET_TCP_H,1)]) AC_CHECK_HEADER(ifaddrs.h,[AC_DEFINE(PJ_HAS_IFADDRS_H,1)]) @@ -180,11 +186,14 @@ AC_CHECK_HEADER(mswsock.h,[AC_DEFINE(PJ_HAS_MSWSOCK_H,1)],[], AC_CHECK_HEADER(ws2tcpip.h,[AC_DEFINE(PJ_HAS_WS2TCPIP_H,1)]) AC_CHECK_HEADER(uuid/uuid.h,[ac_has_uuid_h=1]) AC_CHECK_HEADER(net/if.h,[AC_DEFINE(PJ_HAS_NET_IF_H,1)],[], - [#if PJ_HAS_SYS_SOCKET_H + [#if PJ_HAS_SYS_TYPES_H + # include + #endif + #if PJ_HAS_SYS_SOCKET_H + # include #endif ]) - AC_MSG_RESULT([Setting PJ_OS_NAME to $target]) AC_DEFINE_UNQUOTED(PJ_OS_NAME,["$target"]) @@ -256,7 +265,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include dnl # Determine if socklen_t is available AC_MSG_CHECKING([if socklen_t is available]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include + #include ]], [socklen_t xxx = 0;])], [AC_DEFINE(PJ_HAS_SOCKLEN_T,1) AC_MSG_RESULT(yes)], @@ -754,8 +764,8 @@ AC_ARG_ENABLE(ssl, AC_SUBST(libssl_present) AC_SUBST(libcrypto_present) AC_CHECK_HEADER(openssl/ssl.h,[openssl_h_present=1]) - AC_CHECK_LIB(ssl,SSL_library_init,[libssl_present=1 && LIBS="$LIBS -lssl"]) AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && LIBS="$LIBS -lcrypto"]) + AC_CHECK_LIB(ssl,SSL_library_init,[libssl_present=1 && LIBS="$LIBS -lssl"]) if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then AC_MSG_RESULT([OpenSSL library found, SSL support enabled]) # PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK -- cgit v1.2.3