Changeset 3057 for pjproject/trunk/aconfigure.ac

Timestamp:

Jan 13, 2010 1:09:45 PM (14 years ago)

Author:

bennylp

Message:

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

File:

• pjproject/trunk/aconfigure.ac (modified) (4 diffs)

pjproject/trunk/aconfigure.ac

@@ -147 +147 @@
 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
                  ])
@@ -181 +187 @@
 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"])
@@ -257 +266 @@
 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)
@@ -755 +765 @@
                 AC_SUBST(libcrypto_present)
                 AC_CHECK_HEADER(openssl/ssl.h,[openssl_h_present=1])
+                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"])
-                AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && LIBS="$LIBS -lcrypto"])
                 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])