Menu
▾
▴
[Emc-commit] rcslib Makefile.am,1.7.2.8,1.7.2.9 Makefile.in,1.7.2.8,1.7.2.9 configure,1.3.2.5,1.3.2.6 configure.ac,1.3.2.4,1.3.2.5
|
From: <wsh...@us...> - 2003-08-22 20:06:39
|
Update of /cvsroot/emc/rcslib
In directory sc8-pr-cvs1:/tmp/cvs-serv3769
Modified Files:
Tag: wps_multiplat_dev_branch
Makefile.am Makefile.in configure configure.ac
Log Message:
.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/emc/rcslib/Makefile.am,v
retrieving revision 1.7.2.8
retrieving revision 1.7.2.9
diff -C2 -d -r1.7.2.8 -r1.7.2.9
*** Makefile.am 22 Aug 2003 03:34:26 -0000 1.7.2.8
--- Makefile.am 22 Aug 2003 20:06:35 -0000 1.7.2.9
***************
*** 118,122 ****
TESTS=etc/testnml.sh
! librcs_la_LDFLAGS=-release 5.2
librcs_la_LIBADD= @LTLIBOBJS@
--- 118,122 ----
TESTS=etc/testnml.sh
! librcs_la_LDFLAGS=-release 2003.8
librcs_la_LIBADD= @LTLIBOBJS@
***************
*** 193,197 ****
! include_HEADERS=src/rcs.hh src/rcs_defs.hh \
src/print/rcs_prnt.hh src/stg_clss/linklist.hh src/cms/nmlmsg.hh \
src/cms/nml.hh src/cms/cms_user.hh src/cms/cms.hh src/cms/cms_cfg.hh \
--- 193,197 ----
! include_HEADERS=src/rcs.hh \
src/print/rcs_prnt.hh src/stg_clss/linklist.hh src/cms/nmlmsg.hh \
src/cms/nml.hh src/cms/cms_user.hh src/cms/cms.hh src/cms/cms_cfg.hh \
***************
*** 199,206 ****
src/node/stat_msg.hh src/node/wm_msg.hh src/node/nml_oi.hh \
src/cms/cmsdiag.hh src/cms/nmldiag.hh src/cms/cms_srv.hh \
! src/cms/sokintrf.h src/cms/rem_msg.hh src/cms/nml_srv.hh \
! src/os_intf/timer.hh src/os_intf/rcs_exit.hh src/os_intf/inetfile.hh \
src/os_intf/inifile.h src/node/nml_mod.hh src/cms/nmlqr.hh \
! src/rcsvers.hh src/os_intf/_shm.h src/os_intf/_timer.h \
src/cms/ttyintf.h
--- 199,206 ----
src/node/stat_msg.hh src/node/wm_msg.hh src/node/nml_oi.hh \
src/cms/cmsdiag.hh src/cms/nmldiag.hh src/cms/cms_srv.hh \
! src/cms/rem_msg.hh src/cms/nml_srv.hh \
! src/os_intf/timer.hh src/os_intf/rcs_exit.hh \
src/os_intf/inifile.h src/node/nml_mod.hh src/cms/nmlqr.hh \
! src/rcsvers.hh src/os_intf/_timer.h \
src/cms/ttyintf.h
Index: Makefile.in
===================================================================
RCS file: /cvsroot/emc/rcslib/Makefile.in,v
retrieving revision 1.7.2.8
retrieving revision 1.7.2.9
diff -C2 -d -r1.7.2.8 -r1.7.2.9
*** Makefile.in 22 Aug 2003 03:34:26 -0000 1.7.2.8
--- Makefile.in 22 Aug 2003 20:06:35 -0000 1.7.2.9
***************
*** 212,216 ****
TESTS = etc/testnml.sh
! librcs_la_LDFLAGS = -release 5.2
librcs_la_LIBADD = @LTLIBOBJS@
--- 212,216 ----
TESTS = etc/testnml.sh
! librcs_la_LDFLAGS = -release 2003.8
librcs_la_LIBADD = @LTLIBOBJS@
***************
*** 283,287 ****
! include_HEADERS = src/rcs.hh src/rcs_defs.hh \
src/print/rcs_prnt.hh src/stg_clss/linklist.hh src/cms/nmlmsg.hh \
src/cms/nml.hh src/cms/cms_user.hh src/cms/cms.hh src/cms/cms_cfg.hh \
--- 283,287 ----
! include_HEADERS = src/rcs.hh \
src/print/rcs_prnt.hh src/stg_clss/linklist.hh src/cms/nmlmsg.hh \
src/cms/nml.hh src/cms/cms_user.hh src/cms/cms.hh src/cms/cms_cfg.hh \
***************
*** 289,296 ****
src/node/stat_msg.hh src/node/wm_msg.hh src/node/nml_oi.hh \
src/cms/cmsdiag.hh src/cms/nmldiag.hh src/cms/cms_srv.hh \
! src/cms/sokintrf.h src/cms/rem_msg.hh src/cms/nml_srv.hh \
! src/os_intf/timer.hh src/os_intf/rcs_exit.hh src/os_intf/inetfile.hh \
src/os_intf/inifile.h src/node/nml_mod.hh src/cms/nmlqr.hh \
! src/rcsvers.hh src/os_intf/_shm.h src/os_intf/_timer.h \
src/cms/ttyintf.h
--- 289,296 ----
src/node/stat_msg.hh src/node/wm_msg.hh src/node/nml_oi.hh \
src/cms/cmsdiag.hh src/cms/nmldiag.hh src/cms/cms_srv.hh \
! src/cms/rem_msg.hh src/cms/nml_srv.hh \
! src/os_intf/timer.hh src/os_intf/rcs_exit.hh \
src/os_intf/inifile.h src/node/nml_mod.hh src/cms/nmlqr.hh \
! src/rcsvers.hh src/os_intf/_timer.h \
src/cms/ttyintf.h
Index: configure
===================================================================
RCS file: /cvsroot/emc/rcslib/configure,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -C2 -d -r1.3.2.5 -r1.3.2.6
*** configure 22 Aug 2003 03:34:26 -0000 1.3.2.5
--- configure 22 Aug 2003 20:06:35 -0000 1.3.2.6
***************
*** 1,5 ****
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.53 for Real-Time Control System Library 2003.6 .
#
# Report bugs to <sh...@cm...>.
--- 1,5 ----
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.53 for Real-Time Control System Library 2003.8 .
#
# Report bugs to <sh...@cm...>.
***************
*** 416,421 ****
PACKAGE_NAME='Real-Time Control System Library'
PACKAGE_TARNAME='rcslib'
! PACKAGE_VERSION='2003.6 '
! PACKAGE_STRING='Real-Time Control System Library 2003.6 '
PACKAGE_BUGREPORT='sh...@cm...'
--- 416,421 ----
PACKAGE_NAME='Real-Time Control System Library'
PACKAGE_TARNAME='rcslib'
! PACKAGE_VERSION='2003.8 '
! PACKAGE_STRING='Real-Time Control System Library 2003.8 '
PACKAGE_BUGREPORT='sh...@cm...'
***************
*** 934,938 ****
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
! \`configure' configures Real-Time Control System Library 2003.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
--- 934,938 ----
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
! \`configure' configures Real-Time Control System Library 2003.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
***************
*** 1000,1004 ****
if test -n "$ac_init_help"; then
case $ac_init_help in
! short | recursive ) echo "Configuration of Real-Time Control System Library 2003.6 :";;
esac
cat <<\_ACEOF
--- 1000,1004 ----
if test -n "$ac_init_help"; then
case $ac_init_help in
! short | recursive ) echo "Configuration of Real-Time Control System Library 2003.8 :";;
esac
cat <<\_ACEOF
***************
*** 1009,1012 ****
--- 1009,1014 ----
--enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer
+ --enable-ALL Enable/Disable all of the above in one command.
+ (default=no)
--enable-nml-codegen Build the nml_codegen tool also enables
librcsforgcj. It requires GCJ.(default=no)
***************
*** 1055,1060 ****
compatibility and simpler linking. (default=yes)
--enable-xsd2nmlh Build the xsd2nmlh program. (default=yes)
- --enable-ALL Enable/Disable all of the above in one command.
- (default=no)
--disable-dependency-tracking Speeds up one-time builds
--enable-dependency-tracking Do not reject slow dependency extractors
--- 1057,1060 ----
***************
*** 1073,1077 ****
--with-rtl-rtai Check for rtl or rtai and provide support if found.
(default=no)
! --with-librt Check for librt and use if found. (default=yes)
--with-posix_threads Check for POSIX threads and use if found.
(default=yes)
--- 1073,1079 ----
--with-rtl-rtai Check for rtl or rtai and provide support if found.
(default=no)
! --with-librt Check for librt and use if found. On some systems it
! provides clock_gettime() which may be more accurate
! than gettimeofday(). (default=yes)
--with-posix_threads Check for POSIX threads and use if found.
(default=yes)
***************
*** 1157,1161 ****
if $ac_init_version; then
cat <<\_ACEOF
! Real-Time Control System Library configure 2003.6
generated by GNU Autoconf 2.53
--- 1159,1163 ----
if $ac_init_version; then
cat <<\_ACEOF
! Real-Time Control System Library configure 2003.8
generated by GNU Autoconf 2.53
***************
*** 1172,1176 ****
running configure, to aid debugging if configure makes a mistake.
! It was created by Real-Time Control System Library $as_me 2003.6 , which was
generated by GNU Autoconf 2.53. Invocation command line was
--- 1174,1178 ----
running configure, to aid debugging if configure makes a mistake.
! It was created by Real-Time Control System Library $as_me 2003.8 , which was
generated by GNU Autoconf 2.53. Invocation command line was
***************
*** 1704,1708 ****
# Define the identity of the package.
PACKAGE=rcslib
! VERSION=2003.6
--- 1706,1710 ----
# Define the identity of the package.
PACKAGE=rcslib
! VERSION=2003.8
***************
*** 1935,1938 ****
--- 1937,1947 ----
+ # Check whether --enable-ALL or --disable-ALL was given.
+ if test "${enable_ALL+set}" = set; then
+ enableval="$enable_ALL"
+ enable_nml_codegen=${enableval};enable_rcs_jar=${enableval};enable_codegen_jar=${enableval};enable_diagapplet_jar=${enableval};enable_filemem=${enableval};enable_xml=${enableval};enable_xdr=${enableval};enable_disp=${enableval};enable_diag=${enableval};enable_print=${enableval};enable_nmlqr=${enableval};enable_xsd2nmlh=${enableval};enable_locmem=${enableval};enable_phantom=${enableval};enable_shmem=${enableval};enable_stcp=${enableval};enable_tcp=${enableval};enable_udp=${enableval};enable_tty=${enableval};enable_crypt=${enableval};enable_http=${enableval};enable_posemath_in_rcslib=${enableval};enable_nmlmod_in_rcslib=${enableval};enable_server=${enableval};enable_sokintrf=${enable_val};enable_rtlmem=${enableval}
+ fi;
+
+
# Check whether --enable-nml_codegen or --disable-nml_codegen was given.
if test "${enable_nml_codegen+set}" = set; then
***************
*** 2233,2244 ****
- # Check whether --enable-ALL or --disable-ALL was given.
- if test "${enable_ALL+set}" = set; then
- enableval="$enable_ALL"
- enable_nml_codegen=${enableval};enable_rcs_jar=${enableval};enable_codegen_jar=${enableval};enable_diagapplet_jar=${enableval};enable_filemem=${enableval};enable_xml=${enableval};enable_xdr=${enableval};enable_disp=${enableval};enable_diag=${enableval};enable_print=${enableval};enable_nmlqr=${enableval};enable_xsd2nmlh=${enableval};enable_locmem=${enableval};enable_phantom=${enableval};enable_shmem=${enableval};enable_stcp=${enableval};enable_tcp=${enableval};enable_udp=${enableval};enable_tty=${enableval};enable_crypt=${enableval};enable_http=${enableval};enable_posemath_in_rcslib=${enableval};enable_nmlmod_in_rcslib=${enableval};enable_server=${enableval};enable_sokintrf=${enable_val};enable_rtlmem=${enableval}
- fi;
if test "x${enable_xsd2nmlh}" = "xyes" ; then
! CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} 'xsd2nmlh$(EXEEXT)'"
## AC_MSG_NOTICE([CONFIGURED_PROGRAMS=${CONFIGURED_PROGRAMS}])
fi
--- 2242,2248 ----
if test "x${enable_xsd2nmlh}" = "xyes" ; then
! CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} "'xsd2nmlh$(EXEEXT)'
## AC_MSG_NOTICE([CONFIGURED_PROGRAMS=${CONFIGURED_PROGRAMS}])
fi
***************
*** 5168,5172 ****
*-*-irix6*)
# Find out which ABI we are using.
! echo '#line 5170 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
--- 5172,5176 ----
*-*-irix6*)
# Find out which ABI we are using.
! echo '#line 5174 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
***************
*** 5704,5708 ****
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
! if { (eval echo configure:5706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
--- 5708,5712 ----
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
! if { (eval echo configure:5710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
***************
*** 7497,7501 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 7499 "configure"
#include "confdefs.h"
--- 7501,7505 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 7503 "configure"
#include "confdefs.h"
***************
*** 7595,7599 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 7597 "configure"
#include "confdefs.h"
--- 7599,7603 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 7601 "configure"
#include "confdefs.h"
***************
*** 9047,9051 ****
## AC_MSG_NOTICE([GCJ : ${GCJ}])
## AC_MSG_NOTICE([GCJFLAGS : ${GCJFLAGS}])
! CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} 'nml_codegen$(EXEEXT)'";
## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
--- 9051,9055 ----
## AC_MSG_NOTICE([GCJ : ${GCJ}])
## AC_MSG_NOTICE([GCJFLAGS : ${GCJFLAGS}])
! CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} "'nml_codegen$(EXEEXT)';
## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
***************
*** 17522,17526 ****
cat >&5 <<_CSEOF
! This file was extended by Real-Time Control System Library $as_me 2003.6 , which was
generated by GNU Autoconf 2.53. Invocation command line was
--- 17526,17530 ----
cat >&5 <<_CSEOF
! This file was extended by Real-Time Control System Library $as_me 2003.8 , which was
generated by GNU Autoconf 2.53. Invocation command line was
***************
*** 17584,17588 ****
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
! Real-Time Control System Library config.status 2003.6
configured by $0, generated by GNU Autoconf 2.53,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
--- 17588,17592 ----
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
! Real-Time Control System Library config.status 2003.8
configured by $0, generated by GNU Autoconf 2.53,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Index: configure.ac
===================================================================
RCS file: /cvsroot/emc/rcslib/configure.ac,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -C2 -d -r1.3.2.4 -r1.3.2.5
*** configure.ac 22 Aug 2003 03:34:26 -0000 1.3.2.4
--- configure.ac 22 Aug 2003 20:06:36 -0000 1.3.2.5
***************
*** 1,4 ****
# Process this file with autoconf to produce a configure script.
! AC_INIT(Real-Time Control System Library, 2003.6 , sh...@cm..., rcslib)
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([src/rcs.hh])
--- 1,4 ----
# Process this file with autoconf to produce a configure script.
! AC_INIT(Real-Time Control System Library, 2003.8 , sh...@cm..., rcslib)
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([src/rcs.hh])
***************
*** 43,47 ****
AC_ARG_WITH(librt,
[AC_HELP_STRING([--with-librt],
! [Check for librt and use if found. (default=yes)])],
[with_librt=$withval;
AC_MSG_NOTICE([with_librt=${with_librt}])],
--- 43,47 ----
AC_ARG_WITH(librt,
[AC_HELP_STRING([--with-librt],
! [Check for librt and use if found. On some systems it provides clock_gettime() which may be more accurate than gettimeofday(). (default=yes)])],
[with_librt=$withval;
AC_MSG_NOTICE([with_librt=${with_librt}])],
***************
*** 58,61 ****
--- 58,67 ----
+ AC_ARG_ENABLE(ALL,
+ [AC_HELP_STRING([--enable-ALL],
+ [Enable/Disable all of the above in one command. (default=no)])],
+ [enable_nml_codegen=${enableval};enable_rcs_jar=${enableval};enable_codegen_jar=${enableval};enable_diagapplet_jar=${enableval};enable_filemem=${enableval};enable_xml=${enableval};enable_xdr=${enableval};enable_disp=${enableval};enable_diag=${enableval};enable_print=${enableval};enable_nmlqr=${enableval};enable_xsd2nmlh=${enableval};enable_locmem=${enableval};enable_phantom=${enableval};enable_shmem=${enableval};enable_stcp=${enableval};enable_tcp=${enableval};enable_udp=${enableval};enable_tty=${enableval};enable_crypt=${enableval};enable_http=${enableval};enable_posemath_in_rcslib=${enableval};enable_nmlmod_in_rcslib=${enableval};enable_server=${enableval};enable_sokintrf=${enable_val};enable_rtlmem=${enableval}])
+
+
AC_ARG_ENABLE(nml_codegen,
[AC_HELP_STRING([--enable-nml-codegen],
***************
*** 278,288 ****
- AC_ARG_ENABLE(ALL,
- [AC_HELP_STRING([--enable-ALL],
- [Enable/Disable all of the above in one command. (default=no)])],
- [enable_nml_codegen=${enableval};enable_rcs_jar=${enableval};enable_codegen_jar=${enableval};enable_diagapplet_jar=${enableval};enable_filemem=${enableval};enable_xml=${enableval};enable_xdr=${enableval};enable_disp=${enableval};enable_diag=${enableval};enable_print=${enableval};enable_nmlqr=${enableval};enable_xsd2nmlh=${enableval};enable_locmem=${enableval};enable_phantom=${enableval};enable_shmem=${enableval};enable_stcp=${enableval};enable_tcp=${enableval};enable_udp=${enableval};enable_tty=${enableval};enable_crypt=${enableval};enable_http=${enableval};enable_posemath_in_rcslib=${enableval};enable_nmlmod_in_rcslib=${enableval};enable_server=${enableval};enable_sokintrf=${enable_val};enable_rtlmem=${enableval}])
if test "x${enable_xsd2nmlh}" = "xyes" ; then
! CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} 'xsd2nmlh$(EXEEXT)'"
## AC_MSG_NOTICE([CONFIGURED_PROGRAMS=${CONFIGURED_PROGRAMS}])
fi
--- 284,290 ----
if test "x${enable_xsd2nmlh}" = "xyes" ; then
! CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} "'xsd2nmlh$(EXEEXT)'
## AC_MSG_NOTICE([CONFIGURED_PROGRAMS=${CONFIGURED_PROGRAMS}])
fi
***************
*** 555,559 ****
## AC_MSG_NOTICE([GCJ : ${GCJ}])
## AC_MSG_NOTICE([GCJFLAGS : ${GCJFLAGS}])
! CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} 'nml_codegen$(EXEEXT)'";
## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
--- 557,561 ----
## AC_MSG_NOTICE([GCJ : ${GCJ}])
## AC_MSG_NOTICE([GCJFLAGS : ${GCJFLAGS}])
! CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} "'nml_codegen$(EXEEXT)';
## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
|
