Menu
▾
▴
[Emc-commit] rcslib Makefile.am,1.7.2.7,1.7.2.8 Makefile.in,1.7.2.7,1.7.2.8 configure,1.3.2.4,1.3.2.5 configure.ac,1.3.2.3,1.3.2.4 rcs_config.h.in,1.1.2.4,1.1.2.5
|
From: <wsh...@us...> - 2003-08-22 03:34:34
|
Update of /cvsroot/emc/rcslib
In directory sc8-pr-cvs1:/tmp/cvs-serv13430
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.7
retrieving revision 1.7.2.8
diff -C2 -d -r1.7.2.7 -r1.7.2.8
*** Makefile.am 21 Aug 2003 20:24:13 -0000 1.7.2.7
--- Makefile.am 22 Aug 2003 03:34:26 -0000 1.7.2.8
***************
*** 131,134 ****
--- 131,136 ----
src/os_intf/_shm.c \
src/os_intf/unix_sem.c \
+ src/os_intf/vxworks_sem.c \
+ src/os_intf/win32_sem.c \
src/cms/memsem.cc\
src/cms/shmem.cc \
Index: Makefile.in
===================================================================
RCS file: /cvsroot/emc/rcslib/Makefile.in,v
retrieving revision 1.7.2.7
retrieving revision 1.7.2.8
diff -C2 -d -r1.7.2.7 -r1.7.2.8
*** Makefile.in 21 Aug 2003 20:24:13 -0000 1.7.2.7
--- Makefile.in 22 Aug 2003 03:34:26 -0000 1.7.2.8
***************
*** 224,227 ****
--- 224,229 ----
src/os_intf/_shm.c \
src/os_intf/unix_sem.c \
+ src/os_intf/vxworks_sem.c \
+ src/os_intf/win32_sem.c \
src/cms/memsem.cc\
src/cms/shmem.cc \
***************
*** 1112,1119 ****
@AMDEP_TRUE@ ./$(DEPDIR)/udp_opts.Plo ./$(DEPDIR)/udp_srv.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/udpmem.Plo ./$(DEPDIR)/unix_sem.Plo \
! @AMDEP_TRUE@ ./$(DEPDIR)/xdr.Plo ./$(DEPDIR)/xdr_arra.Plo \
! @AMDEP_TRUE@ ./$(DEPDIR)/xdr_floa.Plo ./$(DEPDIR)/xdr_mem.Plo \
! @AMDEP_TRUE@ ./$(DEPDIR)/xdr_msg.Plo ./$(DEPDIR)/xdr_rec.Plo \
! @AMDEP_TRUE@ ./$(DEPDIR)/xdr_refe.Plo ./$(DEPDIR)/xdr_stdi.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/xsd2nmlh-_timer.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/xsd2nmlh-cms_xml_up.Po \
--- 1114,1123 ----
@AMDEP_TRUE@ ./$(DEPDIR)/udp_opts.Plo ./$(DEPDIR)/udp_srv.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/udpmem.Plo ./$(DEPDIR)/unix_sem.Plo \
! @AMDEP_TRUE@ ./$(DEPDIR)/vxworks_sem.Plo \
! @AMDEP_TRUE@ ./$(DEPDIR)/win32_sem.Plo ./$(DEPDIR)/xdr.Plo \
! @AMDEP_TRUE@ ./$(DEPDIR)/xdr_arra.Plo ./$(DEPDIR)/xdr_floa.Plo \
! @AMDEP_TRUE@ ./$(DEPDIR)/xdr_mem.Plo ./$(DEPDIR)/xdr_msg.Plo \
! @AMDEP_TRUE@ ./$(DEPDIR)/xdr_rec.Plo ./$(DEPDIR)/xdr_refe.Plo \
! @AMDEP_TRUE@ ./$(DEPDIR)/xdr_stdi.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/xsd2nmlh-_timer.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/xsd2nmlh-cms_xml_up.Po \
***************
*** 1411,1414 ****
--- 1415,1420 ----
_shm.lo: src/os_intf/_shm.c
unix_sem.lo: src/os_intf/unix_sem.c
+ vxworks_sem.lo: src/os_intf/vxworks_sem.c
+ win32_sem.lo: src/os_intf/win32_sem.c
memsem.lo: src/cms/memsem.cc
shmem.lo: src/cms/shmem.cc
***************
*** 2107,2110 ****
--- 2113,2118 ----
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/udpmem.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unix_sem.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vxworks_sem.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32_sem.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr_arra.Plo@am__quote@
***************
*** 2536,2539 ****
--- 2544,2583 ----
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unix_sem.lo `test -f 'src/os_intf/unix_sem.c' || echo '$(srcdir)/'`src/os_intf/unix_sem.c
+
+ vxworks_sem.o: src/os_intf/vxworks_sem.c
+ @AMDEP_TRUE@ source='src/os_intf/vxworks_sem.c' object='vxworks_sem.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@ depfile='$(DEPDIR)/vxworks_sem.Po' tmpdepfile='$(DEPDIR)/vxworks_sem.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vxworks_sem.o `test -f 'src/os_intf/vxworks_sem.c' || echo '$(srcdir)/'`src/os_intf/vxworks_sem.c
+
+ vxworks_sem.obj: src/os_intf/vxworks_sem.c
+ @AMDEP_TRUE@ source='src/os_intf/vxworks_sem.c' object='vxworks_sem.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@ depfile='$(DEPDIR)/vxworks_sem.Po' tmpdepfile='$(DEPDIR)/vxworks_sem.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vxworks_sem.obj `cygpath -w src/os_intf/vxworks_sem.c`
+
+ vxworks_sem.lo: src/os_intf/vxworks_sem.c
+ @AMDEP_TRUE@ source='src/os_intf/vxworks_sem.c' object='vxworks_sem.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@ depfile='$(DEPDIR)/vxworks_sem.Plo' tmpdepfile='$(DEPDIR)/vxworks_sem.TPlo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vxworks_sem.lo `test -f 'src/os_intf/vxworks_sem.c' || echo '$(srcdir)/'`src/os_intf/vxworks_sem.c
+
+ win32_sem.o: src/os_intf/win32_sem.c
+ @AMDEP_TRUE@ source='src/os_intf/win32_sem.c' object='win32_sem.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@ depfile='$(DEPDIR)/win32_sem.Po' tmpdepfile='$(DEPDIR)/win32_sem.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o win32_sem.o `test -f 'src/os_intf/win32_sem.c' || echo '$(srcdir)/'`src/os_intf/win32_sem.c
+
+ win32_sem.obj: src/os_intf/win32_sem.c
+ @AMDEP_TRUE@ source='src/os_intf/win32_sem.c' object='win32_sem.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@ depfile='$(DEPDIR)/win32_sem.Po' tmpdepfile='$(DEPDIR)/win32_sem.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o win32_sem.obj `cygpath -w src/os_intf/win32_sem.c`
+
+ win32_sem.lo: src/os_intf/win32_sem.c
+ @AMDEP_TRUE@ source='src/os_intf/win32_sem.c' object='win32_sem.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@ depfile='$(DEPDIR)/win32_sem.Plo' tmpdepfile='$(DEPDIR)/win32_sem.TPlo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o win32_sem.lo `test -f 'src/os_intf/win32_sem.c' || echo '$(srcdir)/'`src/os_intf/win32_sem.c
sendn.o: src/cms/sendn.c
Index: configure
===================================================================
RCS file: /cvsroot/emc/rcslib/configure,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 21 Aug 2003 20:24:13 -0000 1.3.2.4
--- configure 22 Aug 2003 03:34:26 -0000 1.3.2.5
***************
*** 1074,1080 ****
(default=no)
--with-librt Check for librt and use if found. (default=yes)
! --with-libpthread Check for libpthread and use if found. (default=yes)
! --with-posix_threads Check for POSIX threads and use if found. (You may
! need to seperately enable libpthread.) (default=yes)
--with-gnu-ld assume the C compiler uses GNU ld default=no
--with-pic try to use only PIC/non-PIC objects default=use both
--- 1074,1079 ----
(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)
--with-gnu-ld assume the C compiler uses GNU ld default=no
--with-pic try to use only PIC/non-PIC objects default=use both
***************
*** 1866,1870 ****
echo "$as_me: PLEASE READ THE INSTALL FILE" >&6;}
! CONFIGURED_PROGRAMS="nmltest nmlcfg nmlclean";
CONFIGURED_STATIC_LIBRARIES=""
CONFIGURED_SUBDIRS=
--- 1865,1869 ----
echo "$as_me: PLEASE READ THE INSTALL FILE" >&6;}
! CONFIGURED_PROGRAMS='nmltest$(EXEEXT) nmlcfg$(EXEEXT) nmlclean$(EXEEXT)'
CONFIGURED_STATIC_LIBRARIES=""
CONFIGURED_SUBDIRS=
***************
*** 1924,1940 ****
- # Check whether --with-libpthread or --without-libpthread was given.
- if test "${with_libpthread+set}" = set; then
- withval="$with_libpthread"
- with_libpthread=$withval;
- { echo "$as_me:$LINENO: with_libpthread=${with_libpthread}" >&5
- echo "$as_me: with_libpthread=${with_libpthread}" >&6;}
- else
- with_libpthread=no
-
- fi;
-
-
-
# Check whether --with-posix_threads or --without-posix_threads was given.
if test "${with_posix_threads+set}" = set; then
--- 1923,1926 ----
***************
*** 2254,2269 ****
if test "x${enable_xsd2nmlh}" = "xyes" ; then
! CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} xsd2nmlh"
! { echo "$as_me:$LINENO: CONFIGURED_PROGRAMS=${CONFIGURED_PROGRAMS}" >&5
! echo "$as_me: CONFIGURED_PROGRAMS=${CONFIGURED_PROGRAMS}" >&6;}
fi
if test "x${enable_filemem}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} filemem.lo"
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
CPPFLAGS="${CPPFLAGS} -DCMS_USE_FILEMEM"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
fi
--- 2240,2252 ----
if test "x${enable_xsd2nmlh}" = "xyes" ; then
! CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} 'xsd2nmlh$(EXEEXT)'"
! ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS=${CONFIGURED_PROGRAMS}])
fi
if test "x${enable_filemem}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} filemem.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_FILEMEM"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 2271,2279 ****
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
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
CPPFLAGS="${CPPFLAGS} -DCMS_USE_SHMEM"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
fi
--- 2254,2260 ----
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"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 2283,2288 ****
if test "x${enable_posemath_in_rcslib}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} _posemath.lo mathprnt.lo sincos.lo posemath.lo"
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
fi
--- 2264,2268 ----
if test "x${enable_posemath_in_rcslib}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} _posemath.lo mathprnt.lo sincos.lo posemath.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
fi
***************
*** 2290,2295 ****
if test "x${enable_nmlmod_in_rcslib}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} nml_mod.lo cmd_msg.lo stat_msg.lo nml_oi.lo"
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
fi
--- 2270,2274 ----
if test "x${enable_nmlmod_in_rcslib}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} nml_mod.lo cmd_msg.lo stat_msg.lo nml_oi.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
fi
***************
*** 2301,2309 ****
fi
enable_sokintrf=yes
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
CPPFLAGS="${CPPFLAGS} -DCMS_USE_HTTP"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
enable_xml=yes;
fi
--- 2280,2286 ----
fi
enable_sokintrf=yes
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_HTTP"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
enable_xml=yes;
fi
***************
*** 2311,2328 ****
if test "x${enable_tty}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} ttymem.lo tty_srv.lo ttyintf.lo"
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
CPPFLAGS="${CPPFLAGS} -DCMS_USE_TTY"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
fi
if test "x${enable_locmem}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} locmem.lo"
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
CPPFLAGS="${CPPFLAGS} -DCMS_USE_LOCMEM"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
fi
--- 2288,2301 ----
if test "x${enable_tty}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} ttymem.lo tty_srv.lo ttyintf.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_TTY"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
if test "x${enable_locmem}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} locmem.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_LOCMEM"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 2331,2339 ****
if test "x${enable_phantom}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} phantom.lo"
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
CPPFLAGS="${CPPFLAGS} -DCMS_USE_PHANTOM"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
fi
--- 2304,2310 ----
if test "x${enable_phantom}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} phantom.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_PHANTOM"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 2346,2354 ****
fi
enable_sokintrf=yes
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
CPPFLAGS="${CPPFLAGS} -DCMS_USE_STCP"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
fi
--- 2317,2323 ----
fi
enable_sokintrf=yes
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_STCP"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 2362,2370 ****
fi
enable_sokintrf=yes
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
CPPFLAGS="${CPPFLAGS} -DCMS_USE_TCP"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
# CONFIGURED_LTLIBRARIES="${CONFIGURED_LTLIBRARIES} libcmstcp.la"
# AC_MSG_NOTICE([CONFIGURED_LTLIBRARIES=${CONFIGURED_LTLIBRARIES}])
--- 2331,2337 ----
fi
enable_sokintrf=yes
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_TCP"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
# CONFIGURED_LTLIBRARIES="${CONFIGURED_LTLIBRARIES} libcmstcp.la"
# AC_MSG_NOTICE([CONFIGURED_LTLIBRARIES=${CONFIGURED_LTLIBRARIES}])
***************
*** 2379,2387 ****
fi
enable_sokintrf=yes
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
CPPFLAGS="${CPPFLAGS} -DCMS_USE_UDP"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
fi
--- 2346,2352 ----
fi
enable_sokintrf=yes
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_UDP"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 2389,2397 ****
if test "x${enable_crypt}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} crypt2.lo"
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
CPPFLAGS="${CPPFLAGS} -DCMS_USE_CRYPT2"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
fi
--- 2354,2360 ----
if test "x${enable_crypt}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} crypt2.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_CRYPT2"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 2400,2408 ****
if test "x${enable_xml}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} cms_xml_up.lo"
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
CPPFLAGS="${CPPFLAGS} -DCMS_USE_XML"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
fi
--- 2363,2369 ----
if test "x${enable_xml}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} cms_xml_up.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_XML"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 2410,2436 ****
if test "x${enable_xdr}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} cms_xup.lo"
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
CPPFLAGS="${CPPFLAGS} -DCMS_USE_XDR"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
fi
if test "x${enable_disp}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} cms_dup.lo"
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
CPPFLAGS="${CPPFLAGS} -DCMS_USE_DISP"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
fi
if test "x${enable_diag}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} cmsdiag.lo nmldiag.lo"
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
CPPFLAGS="${CPPFLAGS} -DCMS_USE_DIAG"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
fi
--- 2371,2391 ----
if test "x${enable_xdr}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} cms_xup.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_XDR"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
if test "x${enable_disp}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} cms_dup.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_DISP"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
if test "x${enable_diag}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} cmsdiag.lo nmldiag.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_DIAG"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 2439,2457 ****
if test "x${enable_print}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} rcs_prnt.lo"
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
else
CPPFLAGS="${CPPFLAGS} -DDISABLE_RCS_PRINT"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
fi
if test "x${enable_nmlqr}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} nmlqr.lo"
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
CPPFLAGS="${CPPFLAGS} -DCMS_USE_NMLQR"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
fi
--- 2394,2408 ----
if test "x${enable_print}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} rcs_prnt.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
else
CPPFLAGS="${CPPFLAGS} -DDISABLE_RCS_PRINT"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
if test "x${enable_nmlqr}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} nmlqr.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_NMLQR"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 2459,2467 ****
if test "x${enable_server}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} cms_srv.lo nml_srv.lo cmssvrp.lo"
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
CPPFLAGS="${CPPFLAGS} -DCMS_SUPPORT_SERVER"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
enable_sokintrf=yes
fi
--- 2410,2416 ----
if test "x${enable_server}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} cms_srv.lo nml_srv.lo cmssvrp.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_SUPPORT_SERVER"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
enable_sokintrf=yes
fi
***************
*** 2469,2493 ****
if test "x${enable_sokintrf}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} sokintrf.lo"
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
CPPFLAGS="${CPPFLAGS} -DCMS_USE_SOKINTRF"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
fi
if test "x${enable_diagapplet_jar}" = "xyes" ; then
CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} diagapplet.jar CodeGen.jar CodeGenCmdLine.jar rcs.jar";
! { echo "$as_me:$LINENO: CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}" >&5
! echo "$as_me: CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}" >&6;}
elif test "x${enable_codegen_jar}" = "xyes" ; then
CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} CodeGen.jar CodeGenCmdLine.jar rcs.jar";
! { echo "$as_me:$LINENO: CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}" >&5
! echo "$as_me: CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}" >&6;}
elif test "x${enable_rcs_jar}" = "xyes" ; then
CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} rcs.jar";
! { echo "$as_me:$LINENO: CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}" >&5
! echo "$as_me: CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}" >&6;}
fi
--- 2418,2437 ----
if test "x${enable_sokintrf}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} sokintrf.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_SOKINTRF"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
if test "x${enable_diagapplet_jar}" = "xyes" ; then
CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} diagapplet.jar CodeGen.jar CodeGenCmdLine.jar rcs.jar";
! ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
elif test "x${enable_codegen_jar}" = "xyes" ; then
CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} CodeGen.jar CodeGenCmdLine.jar rcs.jar";
! ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
elif test "x${enable_rcs_jar}" = "xyes" ; then
CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} rcs.jar";
! ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
fi
***************
*** 5224,5228 ****
*-*-irix6*)
# Find out which ABI we are using.
! echo '#line 5226 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
--- 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
***************
*** 5760,5764 ****
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
! if { (eval echo configure:5762: \"$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
--- 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
***************
*** 7553,7557 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 7555 "configure"
#include "confdefs.h"
--- 7497,7501 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 7499 "configure"
#include "confdefs.h"
***************
*** 7651,7655 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 7653 "configure"
#include "confdefs.h"
--- 7595,7599 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 7597 "configure"
#include "confdefs.h"
***************
*** 8960,8968 ****
ac_cv_have_xdr_h=yes
CPPFLAGS="${CPPFLAGS} -I${srcdir}/src/nt_xdr";
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
LTLIBOBJS="${LTLIBOBJS} bcopy.lo xdr.lo xdr_arra.lo xdr_floa.lo xdr_mem.lo xdr_rec.lo xdr_refe.lo xdr_stdi.lo";
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
fi
--- 8904,8910 ----
ac_cv_have_xdr_h=yes
CPPFLAGS="${CPPFLAGS} -I${srcdir}/src/nt_xdr";
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
LTLIBOBJS="${LTLIBOBJS} bcopy.lo xdr.lo xdr_arra.lo xdr_floa.lo xdr_mem.lo xdr_rec.lo xdr_refe.lo xdr_stdi.lo";
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
fi
***************
*** 9103,9113 ****
GCJFLAGS="${GCJFLAGS} -I${srcdir}/src/java"
! { echo "$as_me:$LINENO: GCJ : ${GCJ}" >&5
! echo "$as_me: GCJ : ${GCJ}" >&6;}
! { echo "$as_me:$LINENO: GCJFLAGS : ${GCJFLAGS}" >&5
! echo "$as_me: GCJFLAGS : ${GCJFLAGS}" >&6;}
! CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} nml_codegen";
! { echo "$as_me:$LINENO: CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}" >&5
! echo "$as_me: CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}" >&6;}
fi
--- 9045,9052 ----
GCJFLAGS="${GCJFLAGS} -I${srcdir}/src/java"
! ## AC_MSG_NOTICE([GCJ : ${GCJ}])
! ## AC_MSG_NOTICE([GCJFLAGS : ${GCJFLAGS}])
! CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} 'nml_codegen$(EXEEXT)'";
! ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
fi
***************
*** 9271,9283 ****
CONFIGURED_STATIC_LIBRARIES="${CONFIGURED_STATIC_LIBRARIES} librcsrtl.a";
! { echo "$as_me:$LINENO: CONFIGURED_STATIC_LIBRARIES : ${CONFIGURED_STATIC_LIBRARIES}" >&5
! echo "$as_me: CONFIGURED_STATIC_LIBRARIES : ${CONFIGURED_STATIC_LIBRARIES}" >&6;};
if test "x${enable_rtlmem}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} rtlnml.lo rtlmem.lo rtlinux_user_api_implement.lo"
! { echo "$as_me:$LINENO: LTLIBOBJS=${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS=${LTLIBOBJS}" >&6;}
CPPFLAGS="${CPPFLAGS} -DCMS_USE_RTLMEM"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
fi
--- 9210,9219 ----
CONFIGURED_STATIC_LIBRARIES="${CONFIGURED_STATIC_LIBRARIES} librcsrtl.a";
! ## AC_MSG_NOTICE([CONFIGURED_STATIC_LIBRARIES : ${CONFIGURED_STATIC_LIBRARIES}]);
if test "x${enable_rtlmem}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} rtlnml.lo rtlmem.lo rtlinux_user_api_implement.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS=${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_RTLMEM"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 9433,9446 ****
if test "x${HAVE_RTAI}" = "xYES" ; then
CONFIGURED_STATIC_LIBRARIES="${CONFIGURED_STATIC_LIBRARIES} librcsrtai.a";
! { echo "$as_me:$LINENO: CONFIGURED_STATIC_LIBRARIES : ${CONFIGURED_STATIC_LIBRARIES}" >&5
! echo "$as_me: CONFIGURED_STATIC_LIBRARIES : ${CONFIGURED_STATIC_LIBRARIES}" >&6;};
if test "x${enable_rtlmem}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} rtlnml.lo rtlmem.lo rtai_user_api_implement.lo"
! { echo "$as_me:$LINENO: LTLIBOBJS=${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS=${LTLIBOBJS}" >&6;}
CPPFLAGS="${CPPFLAGS} -DCMS_USE_RTLMEM"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
fi
fi
--- 9369,9379 ----
if test "x${HAVE_RTAI}" = "xYES" ; then
CONFIGURED_STATIC_LIBRARIES="${CONFIGURED_STATIC_LIBRARIES} librcsrtai.a";
! ## AC_MSG_NOTICE([CONFIGURED_STATIC_LIBRARIES : ${CONFIGURED_STATIC_LIBRARIES}]);
if test "x${enable_rtlmem}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} rtlnml.lo rtlmem.lo rtai_user_api_implement.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS=${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_RTLMEM"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
fi
***************
*** 10572,10577 ****
! { echo "$as_me:$LINENO: ac_cv_have_winsock2=${ac_cv_have_winsock2}" >&5
! echo "$as_me: ac_cv_have_winsock2=${ac_cv_have_winsock2}" >&6;}
if test "x${ac_cv_have_winsock2}" = "xyes" ; then
--- 10505,10509 ----
! ## AC_MSG_NOTICE([ac_cv_have_winsock2=${ac_cv_have_winsock2}])
if test "x${ac_cv_have_winsock2}" = "xyes" ; then
***************
*** 10581,10585 ****
_ACEOF
!
else
--- 10513,10517 ----
_ACEOF
! ## AC_MSG_NOTICE([LIBS=${LIBS}])
else
***************
*** 10750,10756 ****
! fi
!
! if test "x${ac_cv_have_winsock}" = "xyes" ; then
cat >>confdefs.h <<\_ACEOF
--- 10682,10686 ----
! if test "x${ac_cv_have_winsock}" = "xyes" ; then
cat >>confdefs.h <<\_ACEOF
***************
*** 10758,10767 ****
_ACEOF
! else
! LIBS=${ORIG_LIBS};
fi
fi
echo "$as_me:$LINENO: checking for winver.h" >&5
echo $ECHO_N "checking for winver.h... $ECHO_C" >&6
--- 10688,10702 ----
_ACEOF
! else
! LIBS=${ORIG_LIBS};
! fi
!
!
fi
fi
+ ## AC_MSG_NOTICE([LIBS=${LIBS}])
+
echo "$as_me:$LINENO: checking for winver.h" >&5
echo $ECHO_N "checking for winver.h... $ECHO_C" >&6
***************
*** 10818,10822 ****
! for ac_header in toolhelp.h dos.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--- 10753,10758 ----
!
! for ac_header in toolhelp.h dos.h io.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
***************
*** 11204,11207 ****
--- 11140,11144 ----
fi
+ ## AC_MSG_NOTICE([LIBS=${LIBS}])
ac_ext=cc
***************
*** 12150,12153 ****
--- 12087,12092 ----
+ ## AC_MSG_NOTICE([LIBS=${LIBS}])
+
if test "x${check_for_windows_stuff}" = "xyes" ; then
***************
*** 13015,13018 ****
--- 12954,12959 ----
fi
+ ## AC_MSG_NOTICE([LIBS=${LIBS}])
+
echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6
***************
*** 13673,13679 ****
- if test "x${with_posix_threads}" = "xno" ; then
- with_libpthread=no;
- fi
if test "x${with_posix_threads}" = "xyes" ; then
--- 13614,13617 ----
***************
*** 13783,13790 ****
fi
- if test "x${with_libpthread}" = "xyes" ; then
echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--- 13721,13734 ----
fi
+ if test $ac_cv_header_pthread_h = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_PTHREAD_H 1
+ _ACEOF
+
+ fi
echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
***************
*** 13852,13961 ****
fi
- fi
-
-
- if test "${ac_cv_header_pthread_h+set}" = set; then
- echo "$as_me:$LINENO: checking for pthread.h" >&5
- echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
- if test "${ac_cv_header_pthread_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
- echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
- echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
- else
- # Is the header compilable?
- echo "$as_me:$LINENO: checking pthread.h usability" >&5
- echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
- $ac_includes_default
- #include <pthread.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- ac_header_compiler=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
-
- # Is the header present?
- echo "$as_me:$LINENO: checking pthread.h presence" >&5
- echo $ECHO_N "checking pthread.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
- #include <pthread.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
- else
- ac_cpp_err=yes
- fi
- if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- echo "${ECHO_T}$ac_header_preproc" >&6
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;};;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: pthread.h: check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: pthread.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;};;
- esac
- echo "$as_me:$LINENO: checking for pthread.h" >&5
- echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
- if test "${ac_cv_header_pthread_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_pthread_h=$ac_header_preproc
- fi
- echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
- echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
-
- fi
-
-
echo "$as_me:$LINENO: checking for pthread_create" >&5
--- 13796,13799 ----
***************
*** 14635,14640 ****
CPPFLAGS="${CPPFLAGS} -DNO_THREADS"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
else
--- 14473,14477 ----
CPPFLAGS="${CPPFLAGS} -DNO_THREADS"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
else
***************
*** 15041,15046 ****
CPPFLAGS="${CPPFLAGS} -DNO_THREADS"
! { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
else
--- 14878,14882 ----
CPPFLAGS="${CPPFLAGS} -DNO_THREADS"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
else
***************
*** 16199,16204 ****
windows_shared_memory_available=yes;
CPPFLAGS="${CPPFLAGS} -DWIN32"
! { echo "$as_me:$LINENO: CPPFLAGS=${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS=${CPPFLAGS}" >&6;}
else
{ { echo "$as_me:$LINENO: error: NO Shared Memory seems go be available. Consider --disable-shmem" >&5
--- 16035,16039 ----
windows_shared_memory_available=yes;
CPPFLAGS="${CPPFLAGS} -DWIN32"
! ## AC_MSG_NOTICE([CPPFLAGS=${CPPFLAGS}])
else
{ { echo "$as_me:$LINENO: error: NO Shared Memory seems go be available. Consider --disable-shmem" >&5
***************
*** 17115,17120 ****
LTLIBOBJS="${LTLIBOBJS} unix_sem.lo"
fi
! { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
fi
--- 16950,16954 ----
LTLIBOBJS="${LTLIBOBJS} unix_sem.lo"
fi
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
fi
Index: configure.ac
===================================================================
RCS file: /cvsroot/emc/rcslib/configure.ac,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -d -r1.3.2.3 -r1.3.2.4
*** configure.ac 21 Aug 2003 20:24:13 -0000 1.3.2.3
--- configure.ac 22 Aug 2003 03:34:26 -0000 1.3.2.4
***************
*** 8,12 ****
AC_MSG_NOTICE([PLEASE READ THE INSTALL FILE])
! CONFIGURED_PROGRAMS="nmltest nmlcfg nmlclean";
CONFIGURED_STATIC_LIBRARIES=""
CONFIGURED_SUBDIRS=
--- 8,12 ----
AC_MSG_NOTICE([PLEASE READ THE INSTALL FILE])
! CONFIGURED_PROGRAMS='nmltest$(EXEEXT) nmlcfg$(EXEEXT) nmlclean$(EXEEXT)'
CONFIGURED_STATIC_LIBRARIES=""
CONFIGURED_SUBDIRS=
***************
*** 49,64 ****
- AC_ARG_WITH(libpthread,
- [AC_HELP_STRING([--with-libpthread],
- [Check for libpthread and use if found. (default=yes)])],
- [with_libpthread=$withval;
- AC_MSG_NOTICE([with_libpthread=${with_libpthread}])],
- [with_libpthread=no]
- )
-
-
AC_ARG_WITH(posix_threads,
[AC_HELP_STRING([--with-posix_threads],
! [Check for POSIX threads and use if found. (You may need to seperately enable libpthread.) (default=yes)])],
[with_posix_threads=$withval;
AC_MSG_NOTICE([with_posix_threads=${with_posix_threads}])],
--- 49,55 ----
AC_ARG_WITH(posix_threads,
[AC_HELP_STRING([--with-posix_threads],
! [Check for POSIX threads and use if found. (default=yes)])],
[with_posix_threads=$withval;
AC_MSG_NOTICE([with_posix_threads=${with_posix_threads}])],
***************
*** 293,305 ****
if test "x${enable_xsd2nmlh}" = "xyes" ; then
! CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} xsd2nmlh"
! AC_MSG_NOTICE([CONFIGURED_PROGRAMS=${CONFIGURED_PROGRAMS}])
fi
if test "x${enable_filemem}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} filemem.lo"
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_FILEMEM"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
--- 284,296 ----
if test "x${enable_xsd2nmlh}" = "xyes" ; then
! CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} 'xsd2nmlh$(EXEEXT)'"
! ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS=${CONFIGURED_PROGRAMS}])
fi
if test "x${enable_filemem}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} filemem.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_FILEMEM"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 307,313 ****
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"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
--- 298,304 ----
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"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 317,321 ****
if test "x${enable_posemath_in_rcslib}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} _posemath.lo mathprnt.lo sincos.lo posemath.lo"
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
fi
--- 308,312 ----
if test "x${enable_posemath_in_rcslib}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} _posemath.lo mathprnt.lo sincos.lo posemath.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
fi
***************
*** 323,327 ****
if test "x${enable_nmlmod_in_rcslib}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} nml_mod.lo cmd_msg.lo stat_msg.lo nml_oi.lo"
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
fi
--- 314,318 ----
if test "x${enable_nmlmod_in_rcslib}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} nml_mod.lo cmd_msg.lo stat_msg.lo nml_oi.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
fi
***************
*** 333,339 ****
fi
enable_sokintrf=yes
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_HTTP"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
enable_xml=yes;
fi
--- 324,330 ----
fi
enable_sokintrf=yes
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_HTTP"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
enable_xml=yes;
fi
***************
*** 341,354 ****
if test "x${enable_tty}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} ttymem.lo tty_srv.lo ttyintf.lo"
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_TTY"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
if test "x${enable_locmem}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} locmem.lo"
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_LOCMEM"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
--- 332,345 ----
if test "x${enable_tty}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} ttymem.lo tty_srv.lo ttyintf.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_TTY"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
if test "x${enable_locmem}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} locmem.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_LOCMEM"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 357,363 ****
if test "x${enable_phantom}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} phantom.lo"
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_PHANTOM"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
--- 348,354 ----
if test "x${enable_phantom}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} phantom.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_PHANTOM"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 370,376 ****
fi
enable_sokintrf=yes
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_STCP"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
--- 361,367 ----
fi
enable_sokintrf=yes
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_STCP"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 384,390 ****
fi
enable_sokintrf=yes
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_TCP"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
# CONFIGURED_LTLIBRARIES="${CONFIGURED_LTLIBRARIES} libcmstcp.la"
# AC_MSG_NOTICE([CONFIGURED_LTLIBRARIES=${CONFIGURED_LTLIBRARIES}])
--- 375,381 ----
fi
enable_sokintrf=yes
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_TCP"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
# CONFIGURED_LTLIBRARIES="${CONFIGURED_LTLIBRARIES} libcmstcp.la"
# AC_MSG_NOTICE([CONFIGURED_LTLIBRARIES=${CONFIGURED_LTLIBRARIES}])
***************
*** 399,405 ****
fi
enable_sokintrf=yes
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_UDP"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
--- 390,396 ----
fi
enable_sokintrf=yes
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_UDP"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 407,413 ****
if test "x${enable_crypt}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} crypt2.lo"
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_CRYPT2"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
--- 398,404 ----
if test "x${enable_crypt}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} crypt2.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_CRYPT2"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 416,422 ****
if test "x${enable_xml}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} cms_xml_up.lo"
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_XML"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
--- 407,413 ----
if test "x${enable_xml}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} cms_xml_up.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_XML"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 424,444 ****
if test "x${enable_xdr}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} cms_xup.lo"
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_XDR"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
if test "x${enable_disp}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} cms_dup.lo"
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_DISP"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
if test "x${enable_diag}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} cmsdiag.lo nmldiag.lo"
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_DIAG"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
--- 415,435 ----
if test "x${enable_xdr}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} cms_xup.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_XDR"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
if test "x${enable_disp}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} cms_dup.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_DISP"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
if test "x${enable_diag}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} cmsdiag.lo nmldiag.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_DIAG"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 447,461 ****
if test "x${enable_print}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} rcs_prnt.lo"
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
else
CPPFLAGS="${CPPFLAGS} -DDISABLE_RCS_PRINT"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
if test "x${enable_nmlqr}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} nmlqr.lo"
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_NMLQR"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
--- 438,452 ----
if test "x${enable_print}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} rcs_prnt.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
else
CPPFLAGS="${CPPFLAGS} -DDISABLE_RCS_PRINT"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
if test "x${enable_nmlqr}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} nmlqr.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_NMLQR"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 463,469 ****
if test "x${enable_server}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} cms_srv.lo nml_srv.lo cmssvrp.lo"
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_SUPPORT_SERVER"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
enable_sokintrf=yes
fi
--- 454,460 ----
if test "x${enable_server}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} cms_srv.lo nml_srv.lo cmssvrp.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_SUPPORT_SERVER"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
enable_sokintrf=yes
fi
***************
*** 471,490 ****
if test "x${enable_sokintrf}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} sokintrf.lo"
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_SOKINTRF"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
if test "x${enable_diagapplet_jar}" = "xyes" ; then
CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} diagapplet.jar CodeGen.jar CodeGenCmdLine.jar rcs.jar";
! AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
elif test "x${enable_codegen_jar}" = "xyes" ; then
CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} CodeGen.jar CodeGenCmdLine.jar rcs.jar";
! AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
elif test "x${enable_rcs_jar}" = "xyes" ; then
CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} rcs.jar";
! AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
fi
--- 462,481 ----
if test "x${enable_sokintrf}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} sokintrf.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_SOKINTRF"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
if test "x${enable_diagapplet_jar}" = "xyes" ; then
CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} diagapplet.jar CodeGen.jar CodeGenCmdLine.jar rcs.jar";
! ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
elif test "x${enable_codegen_jar}" = "xyes" ; then
CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} CodeGen.jar CodeGenCmdLine.jar rcs.jar";
! ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
elif test "x${enable_rcs_jar}" = "xyes" ; then
CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} rcs.jar";
! ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
fi
***************
*** 544,550 ****
ac_cv_have_xdr_h=yes
CPPFLAGS="${CPPFLAGS} -I${srcdir}/src/nt_xdr";
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
LTLIBOBJS="${LTLIBOBJS} bcopy.lo xdr.lo xdr_arra.lo xdr_floa.lo xdr_mem.lo xdr_rec.lo xdr_refe.lo xdr_stdi.lo";
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
fi
--- 535,541 ----
ac_cv_have_xdr_h=yes
CPPFLAGS="${CPPFLAGS} -I${srcdir}/src/nt_xdr";
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
LTLIBOBJS="${LTLIBOBJS} bcopy.lo xdr.lo xdr_arra.lo xdr_floa.lo xdr_mem.lo xdr_rec.lo xdr_refe.lo xdr_stdi.lo";
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
fi
***************
*** 562,569 ****
GCJFLAGS="${GCJFLAGS} -I${srcdir}/src/java"
! AC_MSG_NOTICE([GCJ : ${GCJ}])
! AC_MSG_NOTICE([GCJFLAGS : ${GCJFLAGS}])
! CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} nml_codegen";
! AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
fi
--- 553,560 ----
GCJFLAGS="${GCJFLAGS} -I${srcdir}/src/java"
! ## AC_MSG_NOTICE([GCJ : ${GCJ}])
! ## AC_MSG_NOTICE([GCJFLAGS : ${GCJFLAGS}])
! CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} 'nml_codegen$(EXEEXT)'";
! ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
fi
***************
*** 579,588 ****
CONFIGURED_STATIC_LIBRARIES="${CONFIGURED_STATIC_LIBRARIES} librcsrtl.a";
! AC_MSG_NOTICE([CONFIGURED_STATIC_LIBRARIES : ${CONFIGURED_STATIC_LIBRARIES}]);
if test "x${enable_rtlmem}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} rtlnml.lo rtlmem.lo rtlinux_user_api_implement.lo"
! AC_MSG_NOTICE([LTLIBOBJS=${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_RTLMEM"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
--- 570,579 ----
CONFIGURED_STATIC_LIBRARIES="${CONFIGURED_STATIC_LIBRARIES} librcsrtl.a";
! ## AC_MSG_NOTICE([CONFIGURED_STATIC_LIBRARIES : ${CONFIGURED_STATIC_LIBRARIES}]);
if test "x${enable_rtlmem}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} rtlnml.lo rtlmem.lo rtlinux_user_api_implement.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS=${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_RTLMEM"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
***************
*** 593,603 ****
if test "x${HAVE_RTAI}" = "xYES" ; then
CONFIGURED_STATIC_LIBRARIES="${CONFIGURED_STATIC_LIBRARIES} librcsrtai.a";
! AC_MSG_NOTICE([CONFIGURED_STATIC_LIBRARIES : ${CONFIGURED_STATIC_LIBRARIES}]);
if test "x${enable_rtlmem}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} rtlnml.lo rtlmem.lo rtai_user_api_implement.lo"
! AC_MSG_NOTICE([LTLIBOBJS=${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_RTLMEM"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
fi
--- 584,594 ----
if test "x${HAVE_RTAI}" = "xYES" ; then
CONFIGURED_STATIC_LIBRARIES="${CONFIGURED_STATIC_LIBRARIES} librcsrtai.a";
! ## AC_MSG_NOTICE([CONFIGURED_STATIC_LIBRARIES : ${CONFIGURED_STATIC_LIBRARIES}]);
if test "x${enable_rtlmem}" = "xyes" ; then
LTLIBOBJS="${LTLIBOBJS} rtlnml.lo rtlmem.lo rtai_user_api_implement.lo"
! ## AC_MSG_NOTICE([LTLIBOBJS=${LTLIBOBJS}])
CPPFLAGS="${CPPFLAGS} -DCMS_USE_RTLMEM"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
fi
fi
***************
*** 677,685 ****
)
! AC_MSG_NOTICE([ac_cv_have_winsock2=${ac_cv_have_winsock2}])
if test "x${ac_cv_have_winsock2}" = "xyes" ; then
AC_DEFINE(HAVE_WINSOCK2_H,1,[Define to 1 you have a working winsock2.h and ws2_32.lib system.])
!
else
--- 668,676 ----
)
! ## AC_MSG_NOTICE([ac_cv_have_winsock2=${ac_cv_have_winsock2}])
if test "x${ac_cv_have_winsock2}" = "xyes" ; then
AC_DEFINE(HAVE_WINSOCK2_H,1,[Define to 1 you have a working winsock2.h and ws2_32.lib system.])
! ## AC_MSG_NOTICE([LIBS=${LIBS}])
else
***************
*** 712,726 ****
)
-
- fi
! if test "x${ac_cv_have_winsock}" = "xyes" ; then
! AC_DEFINE(HAVE_WINSOCK_H,1, [Define to 1 you have a working winsock.h and wsock32.lib system.])
! else
! LIBS=${ORIG_LIBS};
fi
fi
AC_CHECK_HEADER([winver.h],
[ac_cv_have_winver_h=yes],
--- 703,720 ----
)
! if test "x${ac_cv_have_winsock}" = "xyes" ; then
! AC_DEFINE(HAVE_WINSOCK_H,1, [Define to 1 you have a working winsock.h and wsock32.lib system.])
! else
! LIBS=${ORIG_LIBS};
! fi
!
!
fi
fi
+ ## AC_MSG_NOTICE([LIBS=${LIBS}])
+
AC_CHECK_HEADER([winver.h],
[ac_cv_have_winver_h=yes],
***************
*** 734,738 ****
fi
! AC_CHECK_HEADERS([toolhelp.h dos.h])
AC_CACHE_CHECK([for GetTickCount],
--- 728,732 ----
fi
! AC_CHECK_HEADERS([toolhelp.h dos.h io.h])
AC_CACHE_CHECK([for GetTickCount],
***************
*** 832,835 ****
--- 826,830 ----
fi
+ ## AC_MSG_NOTICE([LIBS=${LIBS}])
AC_LANG_PUSH(C++)
***************
*** 848,851 ****
--- 843,848 ----
AC_CHECK_TYPE([caddr_t])
+ ## AC_MSG_NOTICE([LIBS=${LIBS}])
+
if test "x${check_for_windows_stuff}" = "xyes" ; then
***************
*** 923,926 ****
--- 920,925 ----
AC_SEARCH_LIBS(socket,[socket xnet ws2_32 winsock])
AC_CHECK_LIB(m,fabs)
+ ## AC_MSG_NOTICE([LIBS=${LIBS}])
+
AC_SEARCH_LIBS(gethostbyname,[socket nsl resolv xnet])
***************
*** 940,946 ****
AC_CHECK_FUNCS([clock_gettime getcwd gethostbyaddr gethostbyname gethostname gettimeofday getwd inet_ntoa select socket sqrt strchr strcspn strdup strerror strpbrk strrchr strstr strtol strtoul toupper uname sysinfo sysconf sleep usleep nanosleep setitimer sincos fstat opendir readdir])
- if test "x${with_posix_threads}" = "xno" ; then
- with_libpthread=no;
- fi
if test "x${with_posix_threads}" = "xyes" ; then
--- 939,942 ----
***************
*** 948,959 ****
AC_MSG_NOTICE([checking POSIX threads])
! AC_CHECK_HEADER([pthread.h])
!
! if test "x${with_libpthread}" = "xyes" ; then
! AC_CHECK_LIB(pthread,pthread_create)
! fi
!
! AC_CHECK_HEADER(pthread.h)
AC_CHECK_FUNC(pthread_create,
--- 944,951 ----
AC_MSG_NOTICE([checking POSIX threads])
! AC_CHECK_HEADER([pthread.h],
! [AC_DEFINE(HAVE_PTHREAD_H,1,[Define to 1 if you have the pthread.h file])])
! AC_CHECK_LIB(pthread,pthread_create)
AC_CHECK_FUNC(pthread_create,
***************
*** 1013,1017 ****
AC_DEFINE(NO_THREADS,1,[if no thread system is available])
CPPFLAGS="${CPPFLAGS} -DNO_THREADS"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
else
--- 1005,1009 ----
AC_DEFINE(NO_THREADS,1,[if no thread system is available])
CPPFLAGS="${CPPFLAGS} -DNO_THREADS"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
else
***************
*** 1063,1067 ****
AC_DEFINE(NO_THREADS,1,[if no thread system is available])
CPPFLAGS="${CPPFLAGS} -DNO_THREADS"
! AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
else
--- 1055,1059 ----
AC_DEFINE(NO_THREADS,1,[if no thread system is available])
CPPFLAGS="${CPPFLAGS} -DNO_THREADS"
! ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
else
***************
*** 1426,1430 ****
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])
--- 1418,1422 ----
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])
***************
*** 1606,1610 ****
LTLIBOBJS="${LTLIBOBJS} unix_sem.lo"
fi
! AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
fi
--- 1598,1602 ----
LTLIBOBJS="${LTLIBOBJS} unix_sem.lo"
fi
! ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
fi
Index: rcs_config.h.in
===================================================================
RCS file: /cvsroot/emc/rcslib/rcs_config.h.in,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** rcs_config.h.in 21 Aug 2003 20:24:13 -0000 1.1.2.4
--- rcs_config.h.in 22 Aug 2003 03:34:26 -0000 1.1.2.5
***************
*** 73,76 ****
--- 73,79 ----
#undef HAVE_IOSTREAM_H
+ /* Define to 1 if you have the <io.h> header file. */
+ #undef HAVE_IO_H
+
/* Define to 1 if you have the `m' library (-lm). */
#undef HAVE_LIBM
***************
*** 114,117 ****
--- 117,123 ----
/* Define to 1 if you have the process.h file */
#undef HAVE_PROCESS_H
+
+ /* Define to 1 if you have the pthread.h file */
+ #undef HAVE_PTHREAD_H
/* Define to 1 if you have the QueryPerformanceCounter function. */
|
