trawick 01/07/02 11:54:07
Modified: . acconfig.h configure.in
Log:
tighten up the checking for sysV semaphore support...
Darwin didn't have full support but it did have semget() and
semctl(), resulting in a build error...
Revision Changes Path
1.46 +1 -0 apr/acconfig.h
Index: acconfig.h
===================================================================
RCS file: /home/cvs/apr/acconfig.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- acconfig.h 2001/06/06 18:10:55 1.45
+++ acconfig.h 2001/07/02 18:54:05 1.46
@@ -6,6 +6,7 @@
/* Various #defines we need to know about */
#undef HAVE_LOCK_EX
#undef HAVE_F_SETLK
+#undef HAVE_SEM_UNDO
#undef HAVE_CODESET
#undef HAVE_PTHREAD_PROCESS_SHARED
#undef DEV_RANDOM
1.326 +3 -2 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- configure.in 2001/07/02 16:52:27 1.325
+++ configure.in 2001/07/02 18:54:05 1.326
@@ -928,6 +928,7 @@
dnl Checks for libraries.
APR_CHECK_DEFINE(LOCK_EX, sys/file.h)
APR_CHECK_DEFINE(F_SETLK, fcntl.h)
+APR_CHECK_DEFINE(SEM_UNDO, sys/sem.h)
APR_CHECK_DEFINE(CODESET, langinfo.h)
# We are assuming that if the platform doesn't have POLLIN, it doesn't have
@@ -965,7 +966,7 @@
fi
# See which lock mechanisms we can support on this system.
-APR_IFALLYES(func:semget func:semctl, hassysvser="1", hassysvser="0")
+APR_IFALLYES(func:semget func:semctl define:SEM_UNDO, hassysvser="1",
hassysvser="0")
APR_IFALLYES(func:flock define:LOCK_EX, hasflockser="1", hasflockser="0")
APR_IFALLYES(header:fcntl.h define:F_SETLK, hasfcntlser="1", hasfcntlser="0")
APR_IFALLYES(header:pthread.h define:PTHREAD_PROCESS_SHARED
func:pthread_mutexattr_setpshared, hasprocpthreadser="1", hasprocpthreadser="0")
@@ -974,7 +975,7 @@
# See which lock mechanism we'll select by default on this system.
# The last APR_DECIDE to execute sets the default
APR_BEGIN_DECISION([apr_lock implementation method])
-APR_IFALLYES(func:semget func:semctl,
+APR_IFALLYES(func:semget func:semctl define:SEM_UNDO,
APR_DECIDE(USE_SYSVSEM_SERIALIZE, [SysV IPC semget()]))
APR_IFALLYES(func:flock define:LOCK_EX,
APR_DECIDE(USE_FLOCK_SERIALIZE, [4.2BSD-style flock()]))
