Menu
▾
▴
[Emc-commit] rcslib Makefile.am,1.7.2.5,1.7.2.6 Makefile.in,1.7.2.5,1.7.2.6 configure,1.3.2.2,1.3.2.3 configure.ac,1.3.2.1,1.3.2.2 rcs_config.h.in,1.1.2.2,1.1.2.3
|
From: <wsh...@us...> - 2003-08-18 23:19:55
|
Update of /cvsroot/emc/rcslib
In directory sc8-pr-cvs1:/tmp/cvs-serv9848
Modified Files:
Tag: wps_multiplat_dev_branch
Makefile.am Makefile.in configure configure.ac rcs_config.h.in
Log Message:
.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/emc/rcslib/Makefile.am,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -C2 -d -r1.7.2.5 -r1.7.2.6
*** Makefile.am 10 Aug 2003 12:49:47 -0000 1.7.2.5
--- Makefile.am 18 Aug 2003 23:19:51 -0000 1.7.2.6
***************
*** 654,657 ****
--- 654,659 ----
src/os_intf/fileops.h\
src/os_intf/inifile.h\
+ src/os_intf/timer_no_config.h \
+ src/os_intf/_timer_no_config.h \
src/posemath/mathprnt.h\
src/posemath/posemath.h\
Index: Makefile.in
===================================================================
RCS file: /cvsroot/emc/rcslib/Makefile.in,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -C2 -d -r1.7.2.5 -r1.7.2.6
*** Makefile.in 10 Aug 2003 12:49:47 -0000 1.7.2.5
--- Makefile.in 18 Aug 2003 23:19:51 -0000 1.7.2.6
***************
*** 747,750 ****
--- 747,752 ----
src/os_intf/fileops.h\
src/os_intf/inifile.h\
+ src/os_intf/timer_no_config.h \
+ src/os_intf/_timer_no_config.h \
src/posemath/mathprnt.h\
src/posemath/posemath.h\
Index: configure
===================================================================
RCS file: /cvsroot/emc/rcslib/configure,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -d -r1.3.2.2 -r1.3.2.3
*** configure 8 Aug 2003 16:38:59 -0000 1.3.2.2
--- configure 18 Aug 2003 23:19:51 -0000 1.3.2.3
***************
*** 2262,2266 ****
if test "x${enable_shmem}" = "xyes" ; then
! LTLIBOBJS="${LTLIBOBJS} shmem.lo _shm.lo shm.lo unix_sem.lo sem.lo memsem.lo autokey.lo"
{ echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
--- 2262,2266 ----
if test "x${enable_shmem}" = "xyes" ; then
! LTLIBOBJS="${LTLIBOBJS} shmem.lo _shm.lo shm.lo sem.lo memsem.lo autokey.lo"
{ echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
[...1197 lines suppressed...]
{ (exit 1); exit 1; }; }
fi
+ if test -z "${WINDOWS_SHAREDMEM_AVAILABLE_TRUE}" && test -z "${WINDOWS_SHAREDMEM_AVAILABLE_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"WINDOWS_SHAREDMEM_AVAILABLE\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ echo "$as_me: error: conditional \"WINDOWS_SHAREDMEM_AVAILABLE\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
if test -z "${POSIX_SHAREDMEM_AVAILABLE_TRUE}" && test -z "${POSIX_SHAREDMEM_AVAILABLE_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"POSIX_SHAREDMEM_AVAILABLE\" was never defined.
***************
*** 14885,14888 ****
--- 16004,16009 ----
s,@HAVE_RTAI_FALSE@,$HAVE_RTAI_FALSE,;t t
s,@CXXCPP@,$CXXCPP,;t t
+ s,@WINDOWS_SHAREDMEM_AVAILABLE_TRUE@,$WINDOWS_SHAREDMEM_AVAILABLE_TRUE,;t t
+ s,@WINDOWS_SHAREDMEM_AVAILABLE_FALSE@,$WINDOWS_SHAREDMEM_AVAILABLE_FALSE,;t t
s,@POSIX_SHAREDMEM_AVAILABLE_TRUE@,$POSIX_SHAREDMEM_AVAILABLE_TRUE,;t t
s,@POSIX_SHAREDMEM_AVAILABLE_FALSE@,$POSIX_SHAREDMEM_AVAILABLE_FALSE,;t t
Index: configure.ac
===================================================================
RCS file: /cvsroot/emc/rcslib/configure.ac,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -d -r1.3.2.1 -r1.3.2.2
*** configure.ac 8 Aug 2003 14:21:06 -0000 1.3.2.1
--- configure.ac 18 Aug 2003 23:19:51 -0000 1.3.2.2
***************
*** 304,308 ****
if test "x${enable_shmem}" = "xyes" ; then
! LTLIBOBJS="${LTLIBOBJS} shmem.lo _shm.lo shm.lo unix_sem.lo sem.lo memsem.lo autokey.lo"
AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_SHMEM"
--- 304,308 ----
if test "x${enable_shmem}" = "xyes" ; then
! LTLIBOBJS="${LTLIBOBJS} shmem.lo _shm.lo shm.lo sem.lo memsem.lo autokey.lo"
AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_SHMEM"
***************
*** 499,502 ****
--- 499,506 ----
AC_PROG_LIBTOOL
+ check_for_windows_stuff=no
+
+ AC_CHECK_HEADER([windows.h],check_for_windows_stuff=yes)
+
if test "x${enable_nml_codegen}" = "xyes" ; then
AM_PROG_GCJ
***************
*** 584,587 ****
--- 588,737 ----
])
+ if test "x${check_for_windows_stuff}" = "xyes" ; then
+
+ {
+ ORIG_LDFLAGS=${LDFLAGS}
+ AC_CACHE_CHECK([for winsock2.h],
+ ac_cv_have_winsock2,
+ AC_CHECK_HEADER([winsock2.h],
+ [
+ LDFLAGS="${LDFLAGS} -lws2_32"
+ AC_TRY_LINK(
+ [
+ #include <winsock2.h>
+ #include <windows.h>
+ ],
+ [
+ short winsock_version;
+ WSADATA startup_data;
+
+ winsock_version = MAKEWORD (2, 0);
+ WSAStartup(winsock_version, &startup_data);
+ WSAGetLastError()
+ socket (AF_INET, SOCK_STREAM, 0);
+ ],
+ [
+ AC_DEFINE(HAVE_WINSOCK2,1,[Define to 1 you have a working winsock2.h system.])
+ ac_cv_have_winsock2=yes
+ ],
+ [
+ ac_cv_have_winsock2=no
+ LDFLAGS=${ORIG_LDFLAGS}
+ ]
+ )
+ ],
+ [ac_cv_have_winsock2=no]
+ )
+ )
+
+ if test "x${ac_cv_have_winsock}" = "xno" ; then
+ AC_CACHE_CHECK([for winsock.h],
+ ac_cv_have_winsock,
+ AC_CHECK_HEADER([winsock.h],
+ [
+ LDFLAGS="${LDFLAGS} -lwsock32"
+ AC_TRY_LINK(
+ [
+ #include <winsock.h>
+ #include <windows.h>
+ ],
+ [
+ short winsock_version;
+ WSADATA startup_data;
+
+ winsock_version = MAKEWORD (2, 0);
+ WSAStartup(winsock_version, &startup_data);
+ WSAGetLastError()
+ socket (AF_INET, SOCK_STREAM, 0);
+ ],
+ [
+ AC_DEFINE(HAVE_WINSOCK,1, [Define to 1 you have a working winsock.h system.])
+ ac_cv_have_winsock=yes
+ ],
+ [
+ ac_cv_have_winsock=no
+ LDFLAGS=${ORIG_LDFLAGS}
+ ]
+ )
+ ],
+ [ac_cv_have_winsock=no]
+ )
+ )
+ fi
+
+ AC_CHECK_HEADERS([winver.h toolhelp.h dos.h])
+ AC_CACHE_CHECK([for GetTickCount],
+ ac_cv_have_gettickcount,
+ AC_TRY_LINK([
+ #include <windows.h>
+ #include <winbase.h>
+ ],
+ [
+ GetTickCount();
+ ],
+ [
+ AC_DEFINE(HAVE_GETTICKCOUNT,1,[Define to 1 if you have the GetTickCount function.])
+ ac_cv_have_gettickcount=yes
+ ],
+ [ac_cv_have_gettickcount=no])
+ )
+ AC_CACHE_CHECK([for QueryPerformanceCounter],
+ ac_cv_have_queryperformancecounter,
+ AC_TRY_LINK([
+ #include <windows.h>
+ #include <winbase.h>
+ ],
+ [
+ BOOL frequency_ok = 0;
+ BOOL counter_ok = 0;
+ LARGE_INTEGER frequency;
+ LARGE_INTEGER counter;
+
+ frequency_ok = QueryPerformanceFrequency (&frequency);
+ counter_ok = QueryPerformanceCounter (&counter);
+ ],
+ [
+ AC_DEFINE(HAVE_QUERYPERFORMANCEFREQUENCY,1, [Define to 1 if you have the QueryPerformanceFrequency function.])
+ AC_DEFINE(HAVE_QUERYPERFORMANCECOUNTER,1,[Define to 1 if you have the QueryPerformanceCounter function.])
+ ac_cv_have_queryperformancecounter=yes
+ ],
+ [ac_cv_have_queryperformancecounter=no]
+ )
+ )
+ AC_CACHE_CHECK([for SleepEx],
+ ac_cv_have_sleepex,
+ AC_TRY_LINK([
+ #include <windows.h>
+ #include <winbase.h>
+ ],
+ [
+ SleepEx(1000,FALSE);
+ ],
+ [
+ AC_DEFINE(HAVE_SLEEPEX,1,[Define to 1 if you have the SleepEx function.])
+ ac_cv_have_sleepex=yes
+ ],
+ [ac_cv_have_sleepex=no]
+ )
+ )
+ AC_CACHE_CHECK([for Yield],
+ ac_cv_have_yield,
+ AC_TRY_LINK([
+ #include <windows.h>
+ #include <winbase.h>
+ ],
+ [
+ Yield();
+ ],
+ [
+ AC_DEFINE(HAVE_YIELD,1,[Define to 1 if you have the Yield function.])
+ ac_cv_have_yield=yes
+ ],
+ [ac_cv_have_yield=no]
+ )
+ )
+
+ }
+ fi
***************
*** 672,675 ****
--- 822,828 ----
fi
+ if test "x${enable_shmem}" = "xyes" ; then
+
+ windows_shared_memory_available=no
sys_v_shared_memory_available=no
***************
*** 978,982 ****
AC_DEFINE(SYS_V_SHARED_MEMORY,1,[Should we use POSIX Shared_Memory])
else
! AC_MSG_ERROR([Neither POSIX nor System V shared memory seem to be useable])
fi
fi
--- 1131,1183 ----
AC_DEFINE(SYS_V_SHARED_MEMORY,1,[Should we use POSIX Shared_Memory])
else
! AC_MSG_NOTICE([Neither POSIX nor System V shared memory seem to be useable])
! AC_MSG_NOTICE([Checking for windows shared memory.])
! windows_check_failed=false;
! if test "x${check_for_widows_stuff}" != "xyes" ;then
! windows_check_failed=true
! fi
! if test "x${windows_check_failed}" != "xtrue" ; then
! AC_CHECK_HEADER([winbase.h],,windows_check_failed=true,[#include<windows.h>])
! fi
! if test "x${windows_check_failed}" != "xtrue" ; then
! AC_TRY_LINK([
! #include <windows.h>
! #include <winbase.h>
! ],
! [
! SECURITY_ATTRIBUTES sa;
! SECURITY_DESCRIPTOR sd;
! size_t size=0x1000;
! HANDLE hFileMap;
! const char *name="config_test_shm";
! void *addr;
!
! InitializeSecurityDescriptor (&sd, SECURITY_DESCRIPTOR_REVISION);
! sa.nLength = sizeof (SECURITY_ATTRIBUTES);
! sa.lpSecurityDescriptor = &sd;
! sa.bInheritHandle = TRUE;
!
! hFileMap = CreateFileMapping ((HANDLE) (0xFFFFFFFF), &sa, PAGE_READWRITE, 0,size, name);
! addr=MapViewOfFile (hFileMap, FILE_MAP_ALL_ACCESS, 0, 0, size);
! UnmapViewOfFile(addr);
! CloseHandle(hFileMap);
! ],
! [
! AC_DEFINE(HAVE_INITIALIZESECURITYDESCRIPTOR,1,[Define to 1 if you have the InitializeSecurityDescriptor function.])
! AC_DEFINE(HAVE_CREATEFILEMAPPING,1,[Define to 1 if you have the CreateFileMapping function.])
! AC_DEFINE(HAVE_MAPVEIWOFFILE,1,[Define to 1 if you have the MapViewOfFile function.])
! AC_DEFINE(HAVE_UNMAPVEIWOFFILE,1,[Define to 1 if you have the UnmapViewOfFile function.])
! AC_DEFINE(HAVE_CLOSEHANDLE,1,[Define to 1 if you have the CloseHandle function.])
! ]
! ,[windows_check_failed=true])
! fi
! if test "x${windows_check_failed}" != "xtrue" ; then
! AC_MSG_NOTICE([Using windows shared memory.])
! windows_shared_memory_available=yes;
! CPPFLAGS="${CPPFLAGS} -DWIN32"
! AC_MSG_NOTICE([CPPFLAGS=${CPPFLAGS}])
! else
! AC_MSG_ERROR([NO Shared Memory seems go be available. Consider --disable-shmem])
! fi
fi
fi
***************
*** 984,987 ****
--- 1185,1189 ----
fi
+ AM_CONDITIONAL(WINDOWS_SHAREDMEM_AVAILABLE,[test "x${windows_shared_memory_available}" = "xyes"])
AM_CONDITIONAL(POSIX_SHAREDMEM_AVAILABLE,[test x$posix_shared_memory_available = xyes])
***************
*** 1003,1006 ****
--- 1205,1210 ----
#semget
+ windows_semaphores_available=no
+
AC_MSG_NOTICE([checking POSIX semaphores])
***************
*** 1092,1102 ****
AC_DEFINE(SYS_V_SEMAPHORES,1,[Should we use POSIX Semaphores])
else
! AC_MSG_ERROR([Neither POSIX nor System V semaphores seem to be useable])
fi
fi
-
fi
AC_CXX_NAMESPACES
--- 1296,1361 ----
AC_DEFINE(SYS_V_SEMAPHORES,1,[Should we use POSIX Semaphores])
else
! AC_MSG_NOTICE([Neither POSIX nor System V semaphores seem to be useable])
! if test "x${windows_shared_memory_available}" = "xyes" ; then
! AC_MSG_NOTICE([Checking for windows semaphores/mutexes.])
! windows_check_failed=false;
! if test "x${windows_check_failed}" != "xtrue" ; then
! AC_TRY_LINK([
! #include <windows.h>
! #include <winbase.h>
! ],
! [
! HANDLE handle;
! HANDLE handle2;
! SECURITY_ATTRIBUTES sa;
! SECURITY_DESCRIPTOR sd;
!
! InitializeSecurityDescriptor (&sd, SECURITY_DESCRIPTOR_REVISION);
! sa.nLength = sizeof (SECURITY_ATTRIBUTES);
! sa.lpSecurityDescriptor = &sd;
! sa.bInheritHandle = TRUE;
!
! handle=CreateMutex (&sa, FALSE,"config_test_mutex");
!
! WaitForSingleObject (handle,1000);
! ReleaseMutex (handle);
!
! handle2=OpenMutex (MUTEX_ALL_ACCESS, TRUE,"config_test_mutex");
!
! CloseHandle(handle);
! CloseHandle(handle2);
! ],
! [
! # AC_DEFINE(HAVE_INITIALIZESECURITYDESCRIPTOR,[Define if you have the InitializeSecurityDescriptor function.])
! AC_DEFINE(HAVE_CREATEMUTEX,1,[Define to 1 if you have the CreateMutex function.])
! AC_DEFINE(HAVE_WAITFORSINGLEOBJECT,1,[Define to 1 if you have the WaitForSingleObject function.])
! AC_DEFINE(HAVE_RELEASEMUTEX,1,[Define to 1 if you have the ReleaseMutex function.])
! AC_DEFINE(HAVE_OPENMUTEX,1,[Define to 1 if you have the OpenMutex function.])
! ],[windows_check_failed=true])
! fi
! if test "x${windows_check_failed}" != "xtrue" ; then
! AC_MSG_NOTICE([Using windows shared memory.])
! windows_semaphores_available=yes;
! else
! AC_MSG_ERROR([NO Semaphore/mutex seems go be available.Consider --disable-shmem])
! fi
! else
! AC_MSG_ERROR([NO Semaphore/mutex seems go be available. Consider --disable-shmem])
! fi
fi
fi
fi
+ fi
+ # end of if shmem enabled.
+ if test "x${enable_shmem}" = "xyes" ; then
+ if test "x${windows_semaphores_available}" = "xyes" ; then
+ LTLIBOBJS="${LTLIBOBJS} win32_sem.lo"
+ else
+ LTLIBOBJS="${LTLIBOBJS} unix_sem.lo"
+ fi
+ AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
+ fi
AC_CXX_NAMESPACES
Index: rcs_config.h.in
===================================================================
RCS file: /cvsroot/emc/rcslib/rcs_config.h.in,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** rcs_config.h.in 8 Aug 2003 16:38:59 -0000 1.1.2.2
--- rcs_config.h.in 18 Aug 2003 23:19:51 -0000 1.1.2.3
***************
*** 16,19 ****
--- 16,28 ----
#undef HAVE_CLOCK_GETTIME
+ /* Define to 1 if you have the CloseHandle function. */
+ #undef HAVE_CLOSEHANDLE
+
+ /* Define to 1 if you have the CreateFileMapping function. */
+ #undef HAVE_CREATEFILEMAPPING
+
+ /* Define to 1 if you have the CreateMutex function. */
+ #undef HAVE_CREATEMUTEX
+
/* Define to 1 if you have the <ctype.h> header file. */
#undef HAVE_CTYPE_H
***************
*** 25,28 ****
--- 34,40 ----
#undef HAVE_DLFCN_H
+ /* Define to 1 if you have the <dos.h> header file. */
+ #undef HAVE_DOS_H
+
/* Define to 1 if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H
***************
*** 52,55 ****
--- 64,70 ----
#undef HAVE_GETPASS
+ /* Define to 1 if you have the GetTickCount function. */
+ #undef HAVE_GETTICKCOUNT
+
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
***************
*** 61,64 ****
--- 76,82 ----
#undef HAVE_INET_NTOA
+ /* Define to 1 if you have the InitializeSecurityDescriptor function. */
+ #undef HAVE_INITIALIZESECURITYDESCRIPTOR
+
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
***************
*** 76,79 ****
--- 94,100 ----
#undef HAVE_LOCALTIME_R
+ /* Define to 1 if you have the MapViewOfFile function. */
+ #undef HAVE_MAPVEIWOFFILE
+
/* Define to 1 if you have the <math.h> header file. */
#undef HAVE_MATH_H
***************
*** 109,118 ****
--- 130,151 ----
#undef HAVE_OPENDIR
+ /* Define to 1 if you have the OpenMutex function. */
+ #undef HAVE_OPENMUTEX
+
/* Define to 1 if you have the <pthread.h> header file. */
#undef HAVE_PTHREAD_H
+ /* Define to 1 if you have the QueryPerformanceCounter function. */
+ #undef HAVE_QUERYPERFORMANCECOUNTER
+
+ /* Define to 1 if you have the QueryPerformanceFrequency function. */
+ #undef HAVE_QUERYPERFORMANCEFREQUENCY
+
/* Define to 1 if you have the `readdir' function. */
#undef HAVE_READDIR
+ /* Define to 1 if you have the ReleaseMutex function. */
+ #undef HAVE_RELEASEMUTEX
+
/* Is this platfrom running a linux kernel with the rtai patch */
#undef HAVE_RTAI
***************
*** 139,142 ****
--- 172,178 ----
#undef HAVE_SLEEP
+ /* Define to 1 if you have the SleepEx function. */
+ #undef HAVE_SLEEPEX
+
/* Define to 1 if you have the `socket' function. */
#undef HAVE_SOCKET
***************
*** 264,267 ****
--- 300,306 ----
#undef HAVE_TERMIOS_H
+ /* Define to 1 if you have the <toolhelp.h> header file. */
+ #undef HAVE_TOOLHELP_H
+
/* Define to 1 if you have the `toupper' function. */
#undef HAVE_TOUPPER
***************
*** 276,281 ****
--- 315,338 ----
#undef HAVE_UNISTD_H
+ /* Define to 1 if you have the UnmapViewOfFile function. */
+ #undef HAVE_UNMAPVEIWOFFILE
+
/* Define to 1 if you have the `usleep' function. */
#undef HAVE_USLEEP
+
+ /* Define to 1 if you have the WaitForSingleObject function. */
+ #undef HAVE_WAITFORSINGLEOBJECT
+
+ /* Define to 1 you have a working winsock.h system. */
+ #undef HAVE_WINSOCK
+
+ /* Define to 1 you have a working winsock2.h system. */
+ #undef HAVE_WINSOCK2
+
+ /* Define to 1 if you have the <winver.h> header file. */
+ #undef HAVE_WINVER_H
+
+ /* Define to 1 if you have the Yield function. */
+ #undef HAVE_YIELD
/* if no thread system is available */
|
