apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@apache.org
Subject cvs commit: apr configure.in
Date Tue, 29 Jun 2004 23:02:05 GMT
dreid       2004/06/29 16:02:05

  Modified:    .        configure.in
  Log:
  Get the correct setting for which locking mechanism to use.
  This gets the headers to agree with the actual code - which is
  usually a good thing :-)
  
  Revision  Changes    Path
  1.591     +11 -2     apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.590
  retrieving revision 1.591
  diff -u -r1.590 -r1.591
  --- configure.in	29 Jun 2004 14:10:48 -0000	1.590
  +++ configure.in	29 Jun 2004 23:02:05 -0000	1.591
  @@ -1479,8 +1479,8 @@
   echo "${nl}Checking for Locking..."
   
   AC_CHECK_FUNCS(semget semctl flock)
  -AC_CHECK_HEADERS(semaphore.h)
  -AC_CHECK_FUNCS(sem_close sem_unlink sem_post sem_wait)
  +AC_CHECK_HEADERS(semaphore.h OS.h)
  +AC_CHECK_FUNCS(sem_close sem_unlink sem_post sem_wait create_sem)
   
   # Some systems return ENOSYS from sem_open.
   AC_CACHE_CHECK(for working sem_open,ac_cv_func_sem_open,[
  @@ -1595,6 +1595,7 @@
                func:pthread_mutexattr_setpshared dnl
                file:/dev/zero,
                hasprocpthreadser="1", hasprocpthreadser="0")
  +APR_IFALLYES(header:OS.h func:create_sem, hasbeossem="1", hasbeossem="0")
   
   # See which lock mechanism we'll select by default on this system.
   # The last APR_DECIDE to execute sets the default.
  @@ -1603,6 +1604,9 @@
   # POSIX semaphores and cross-process pthread mutexes are not
   # used by default since they have less desirable behaviour when
   # e.g. a process holding the mutex segfaults.
  +# The BEOSSEM decision doesn't require any substitutions but is
  +# included here to prevent the fcntl() branch being selected
  +# from the decision making.
   APR_BEGIN_DECISION([apr_lock implementation method])
   APR_IFALLYES(func:flock define:LOCK_EX,
               APR_DECIDE(USE_FLOCK_SERIALIZE, [4.2BSD-style flock()]))
  @@ -1610,6 +1614,8 @@
               APR_DECIDE(USE_FCNTL_SERIALIZE, [SVR4-style fcntl()]))
   APR_IFALLYES(func:semget func:semctl define:SEM_UNDO,
               APR_DECIDE(USE_SYSVSEM_SERIALIZE, [SysV IPC semget()]))
  +APR_IFALLYES(header:OS.h func:create_sem, 
  +            APR_DECIDE(USE_BEOSSEM, [BeOS Semaphores])) 
   if test "x$apr_lock_method" != "x"; then
       APR_DECISION_FORCE($apr_lock_method)
   fi
  @@ -1636,6 +1642,9 @@
           ;;
       USE_PROC_PTHREAD_SERIALIZE )
           procpthreadser="1"
  +        ;;
  +    USE_BEOSSEM )
  +        beossem="1"
           ;;
   esac
   
  
  
  

Mime
View raw message