CVS: winex configure.ac,1.110,1.111

[email protected] 31 Jul 2007 20:05:35 -0000
Newsgroups gmane.comp.emulators.winex.cvs
Message-ID <[email protected]>
Subject: winex configure.ac,1.110,1.111Update of /var/lib/cvsd/cvsroot/winex
In directory agravaine:/tmp/cvs-serv3193

Modified Files:
	configure.ac 
Log Message:
Refactor SHM server to handle both POSIX and SYSV IPC.
Add support for SHM server on Mac OS X.


Index: configure.ac
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/configure.ac,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- configure.ac	31 Jul 2007 20:01:13 -0000	1.110
+++ configure.ac	31 Jul 2007 20:05:33 -0000	1.111
@@ -217,35 +217,42 @@
 	ftok \
         ) 
  
-## Check for POSIX shm
+## Check for POSIX IPC
 AC_CHECK_HEADERS(\
         sys/types.h \
-        sys/mman.h,
+        sys/mman.h \
+        semaphore.h,
         )
  
+POSIX_SHM_LIB_NAME=""
 AC_MSG_CHECKING([if the server should support AIC])
 if test "z$enable_aic" == "zyes"
 then
   AC_MSG_RESULT([yes])
   AC_DEFINE(ENABLE_AIC,1,[Define to enable accelerated interprocess communication between client and server.])
 
-  POSIX_SHM_LIB_NAME=""
-  AC_CHECK_LIB( rt, shm_open, [ POSIX_SHM_LIB_NAME="rt" ] )
+  AC_CHECK_LIB( rt, shm_open, [ POSIX_SHM_LIB_NAME="-lrt" ] )
   if test "z$POSIX_SHM_LIB_NAME" != "z"
   then
     SAVED_LIBS="$LIBS"
-    LIBS="$LIBS -l$POSIX_SHM_LIB_NAME"
+    LIBS="$LIBS $POSIX_SHM_LIB_NAME"
     AC_CHECK_FUNCS( \
       shm_open \
       shm_unlink,
       [ AC_DEFINE( HAVE_POSIX_SHM_FUNCS, [1], [Are the POSIX shared memory functions available] ) ]
     )
     LIBS="$SAVED_LIBS"
+  else
+    AC_CHECK_FUNCS( \
+      shm_open \
+      shm_unlink,
+      [ AC_DEFINE( HAVE_POSIX_SHM_FUNCS, [1], [Are the POSIX shared memory functions available] ) ]
+    )
   fi
 else
   AC_MSG_RESULT([no])
 fi
-
+AC_SUBST(POSIX_SHM_LIB_NAME)
 
 dnl Check for lint
 AC_CHECK_PROGS(LINT, lclint lint)