diff options
| author | Benny Prijono <bennylp@teluu.com> | 2010-01-13 13:09:45 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2010-01-13 13:09:45 +0000 |
| commit | 8cc7aef25ecc698b6fdfa620877f72e6b8dd536f (patch) | |
| tree | 40e3c7c8df20a5b26d95543285145348a18009db /aconfigure.ac | |
| parent | d4663d0cbfd495529f7ce486d9f9d36f7969bc50 (diff) | |
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
Diffstat (limited to 'aconfigure.ac')
| -rw-r--r-- | aconfigure.ac | 20 |
1 files changed, 15 insertions, 5 deletions
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 <sys/types.h> + #endif + #if PJ_HAS_NETINET_IN_SYSTM_H # include <netinet/in_systm.h> #endif + #if PJ_HAS_NETINET_IN_H + # include <netinet/in.h> + #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 <sys/types.h> + #endif + #if PJ_HAS_SYS_SOCKET_H + # include <sys/socket.h> #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 <sys/types.h> dnl # Determine if socklen_t is available AC_MSG_CHECKING([if socklen_t is available]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> + #include <sys/socket.h>]], [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 |