Changeset 1783 for pjproject/trunk/aconfigure.ac

Timestamp:

Feb 7, 2008 1:11:39 PM (16 years ago)

Author:

bennylp

Message:

Ticket #470, #471, and #472: Compile error when semaphore.h is not present, Compilation error if pthread_mutexattr_set_type() is not present, and Problem with setting up FD_SETSIZE

File:

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

pjproject/trunk/aconfigure.ac

@@ -1 @@
-AC_INIT(pjproject,0.7)
+AC_INIT(pjproject,0.8)
 
 host_orig="$host"
@@ -147 +147 @@
 AC_CHECK_HEADER(net/if.h,[AC_DEFINE(PJ_HAS_NET_IF_H,1)])
 AC_CHECK_HEADER(ifaddrs.h,[AC_DEFINE(PJ_HAS_IFADDRS_H,1)])
+AC_CHECK_HEADER(semaphore.h,[AC_DEFINE(PJ_HAS_SEMAPHORE_H,1)])
 AC_CHECK_HEADER(setjmp.h,[AC_DEFINE(PJ_HAS_SETJMP_H,1)])
 AC_CHECK_HEADER(stdarg.h,[AC_DEFINE(PJ_HAS_STDARG_H,1)])
@@ -269 +270 @@
                                    [pthread_rwlock_t *x;])],
                   [AC_DEFINE(PJ_EMULATE_RWMUTEX,0)
+                   ac_rwmutex="yes"
                    AC_MSG_RESULT(yes)],
                   [AC_DEFINE(PJ_EMULATE_RWMUTEX,1)
+                   ac_rwmutex="no"
                    AC_MSG_RESULT(no)])
+
+dnl # If rwmutex is not detected, check again but this time
+dnl # with _POSIX_READER_WRITER_LOCKS defined (newlib needs this)
+if test "$ac_rwmutex" = "no"; then
+    AC_MSG_CHECKING([if pthread_rwlock_t is available with _POSIX_READER_WRITER_LOCKS])
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _POSIX_READER_WRITER_LOCKS
+                                         #include <pthread.h>]],
+                                       [pthread_rwlock_t *x;])],
+                      [AC_DEFINE(PJ_EMULATE_RWMUTEX,0)
+                       CFLAGS="$CFLAGS -D_POSIX_THREADS -D_POSIX_READER_WRITER_LOCKS"
+                       AC_MSG_RESULT(yes)],
+                      [AC_DEFINE(PJ_EMULATE_RWMUTEX,1)
+                       AC_MSG_RESULT(no)])
+fi
+
+dnl # Do we have pthread_mutexattr_settype()?
+AC_MSG_CHECKING([if pthread_mutexattr_settype() is available])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
+                                   [pthread_mutexattr_settype(0,PTHREAD_MUTEX_FAST_NP);])],
+                  [AC_DEFINE(PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE,1)
+                   AC_MSG_RESULT(yes)],
+                  [AC_MSG_RESULT(no)])
+
+dnl # Does pthread_mutexattr_t has "recursive" member?
+AC_MSG_CHECKING([if pthread_mutexattr_t has recursive member])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
+                                   [[pthread_mutexattr_t attr;
+                                     attr.recursive=1;]])],
+                  [AC_DEFINE(PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE,1)
+                   AC_MSG_RESULT(yes)],
+                  [AC_MSG_RESULT(no)])
 
 AC_SUBST(ac_os_objs)