Menu
▾
▴
[Emc-commit] rcslib Makefile.am,1.7.2.9,1.7.2.10 Makefile.in,1.7.2.9,1.7.2.10 configure,1.3.2.6,1.3.2.7 configure.ac,1.3.2.5,1.3.2.6 rcs_config.h.in,1.1.2.5,1.1.2.6
|
From: <wsh...@us...> - 2003-08-26 00:40:00
|
Update of /cvsroot/emc/rcslib
In directory sc8-pr-cvs1:/tmp/cvs-serv4684
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.9
retrieving revision 1.7.2.10
diff -C2 -d -r1.7.2.9 -r1.7.2.10
*** Makefile.am 22 Aug 2003 20:06:35 -0000 1.7.2.9
--- Makefile.am 26 Aug 2003 00:39:43 -0000 1.7.2.10
***************
*** 349,353 ****
src/cms/filemem.cc \
src/cms/cms_xml_up.cc \
- src/cms/xmlcomposespeedtest.cc\
src/node/wm_msg.cc\
src/os_intf/gtimer.cc\
--- 349,352 ----
***************
*** 399,403 ****
src/cms/tcpmem.cc \
src/cms/tcp_opts.cc \
! src/cms/tcp_svr.cc \
src/cms/sendn.c \
src/cms/recvn.c \
--- 398,402 ----
src/cms/tcpmem.cc \
src/cms/tcp_opts.cc \
! src/cms/tcp_srv.cc \
src/cms/sendn.c \
src/cms/recvn.c \
***************
*** 544,548 ****
src/java/rcsdesign/rcsdesignMainLoopInfo.java\
src/java/rcsdesign/rcsdesignModuleInfo.java\
- src/java/rcsdesign/resizingtrash.java\
src/java/rcs/update_ver\
src/java/rcs/RCS_VERSION.java.perm\
--- 543,546 ----
***************
*** 582,588 ****
src/test/ex_cfg.nml\
src/test/test.nml2\
- src/cms/cms_xml_junk.txt\
- src/cms/httpreq.txt\
- src/cms/physmem_info.txt\
src/java/diagapplet/diagappletJarInfo.txt\
src/java/diagapplet/CodeGen/CodeGenCmdLineJarInfo.txt\
--- 580,583 ----
***************
*** 591,603 ****
src/java/rcs/rcsJarInfo.txt\
src/java/rcsdesign/rcsDesignJarInfo.txt\
- src/test/rcs_out.txt\
src/update_rcs_version.sh\
- src/cms/cms_xml_testcompile_command.sh\
- src/cms/makeomac.sh\
src/test/cgtest.sh\
- src/test/debugcgtestsvr2.sh\
src/test/jtestxml.sh\
src/test/mingw_testxml.sh\
- src/test/qtest.sh\
src/test/testxml.sh\
src/test/testxmlperf.sh\
--- 586,593 ----
***************
*** 620,624 ****
etc/testnml.sh\
etc/multiplatbuild.sh\
! Makefile.am.head\
INSTALL.configure
--- 610,614 ----
etc/testnml.sh\
etc/multiplatbuild.sh\
! etc/Makefile\
INSTALL.configure
***************
*** 743,752 ****
src/test/nml_ex1.hh\
src/test/nml_test_format.hh \
- src/cms/cms_cfg_no_config.h \
src/cms/cms_xup_no_config.h \
src/cms/cmsdiag_no_config.h \
src/cms/sokintrf_no_config.h \
src/cms/nml_no_config.h \
! src/cms/tcpmem_no_config.h
!
--- 733,759 ----
src/test/nml_ex1.hh\
src/test/nml_test_format.hh \
src/cms/cms_xup_no_config.h \
+ src/cms/cms_cfg_no_config.h \
src/cms/cmsdiag_no_config.h \
src/cms/sokintrf_no_config.h \
src/cms/nml_no_config.h \
! src/cms/tcpmem_no_config.h \
! src/cms/cms_no_config.h \
! src/cms/sendn_no_config.h \
! src/cms/tcp_srv_no_config.h \
! src/cms/http_srv_no_config.h \
! src/cms/nml_srv_no_config.h \
! src/cms/physmem_no_config.h \
! src/cms/filemem_no_config.h \
! src/cms/ttyintf_no_config.h \
! src/cms/udpmem_no_config.h \
! src/cms/udp_srv_no_config.h \
! src/cms/stcpopts_no_config.h \
! src/cms/recvline_no_config.h \
! src/cms/recvmsgt_no_config.h \
! src/cms/sendmsgt_no_config.h \
! src/node/nml_mod_no_config.h \
! src/os_intf/_timer_no_config.h \
! src/os_intf/timer_no_config.h \
! src/print/rcs_prnt_no_config.h
Index: Makefile.in
===================================================================
RCS file: /cvsroot/emc/rcslib/Makefile.in,v
retrieving revision 1.7.2.9
retrieving revision 1.7.2.10
diff -C2 -d -r1.7.2.9 -r1.7.2.10
*** Makefile.in 22 Aug 2003 20:06:35 -0000 1.7.2.9
--- Makefile.in 26 Aug 2003 00:39:43 -0000 1.7.2.10
***************
*** 441,445 ****
src/cms/filemem.cc \
src/cms/cms_xml_up.cc \
- src/cms/xmlcomposespeedtest.cc\
src/node/wm_msg.cc\
src/os_intf/gtimer.cc\
--- 441,444 ----
***************
*** 491,495 ****
src/cms/tcpmem.cc \
src/cms/tcp_opts.cc \
! src/cms/tcp_svr.cc \
src/cms/sendn.c \
src/cms/recvn.c \
--- 490,494 ----
src/cms/tcpmem.cc \
src/cms/tcp_opts.cc \
! src/cms/tcp_srv.cc \
src/cms/sendn.c \
src/cms/recvn.c \
***************
*** 636,640 ****
src/java/rcsdesign/rcsdesignMainLoopInfo.java\
src/java/rcsdesign/rcsdesignModuleInfo.java\
- src/java/rcsdesign/resizingtrash.java\
src/java/rcs/update_ver\
src/java/rcs/RCS_VERSION.java.perm\
--- 635,638 ----
***************
*** 674,680 ****
src/test/ex_cfg.nml\
src/test/test.nml2\
- src/cms/cms_xml_junk.txt\
- src/cms/httpreq.txt\
- src/cms/physmem_info.txt\
src/java/diagapplet/diagappletJarInfo.txt\
src/java/diagapplet/CodeGen/CodeGenCmdLineJarInfo.txt\
--- 672,675 ----
***************
*** 683,695 ****
src/java/rcs/rcsJarInfo.txt\
src/java/rcsdesign/rcsDesignJarInfo.txt\
- src/test/rcs_out.txt\
src/update_rcs_version.sh\
- src/cms/cms_xml_testcompile_command.sh\
- src/cms/makeomac.sh\
src/test/cgtest.sh\
- src/test/debugcgtestsvr2.sh\
src/test/jtestxml.sh\
src/test/mingw_testxml.sh\
- src/test/qtest.sh\
src/test/testxml.sh\
src/test/testxmlperf.sh\
--- 678,685 ----
***************
*** 712,716 ****
etc/testnml.sh\
etc/multiplatbuild.sh\
! Makefile.am.head\
INSTALL.configure
--- 702,706 ----
etc/testnml.sh\
etc/multiplatbuild.sh\
! etc/Makefile\
INSTALL.configure
***************
*** 836,845 ****
src/test/nml_ex1.hh\
src/test/nml_test_format.hh \
- src/cms/cms_cfg_no_config.h \
src/cms/cms_xup_no_config.h \
src/cms/cmsdiag_no_config.h \
src/cms/sokintrf_no_config.h \
src/cms/nml_no_config.h \
! src/cms/tcpmem_no_config.h
subdir = .
--- 826,853 ----
src/test/nml_ex1.hh\
src/test/nml_test_format.hh \
src/cms/cms_xup_no_config.h \
+ src/cms/cms_cfg_no_config.h \
src/cms/cmsdiag_no_config.h \
src/cms/sokintrf_no_config.h \
src/cms/nml_no_config.h \
! src/cms/tcpmem_no_config.h \
! src/cms/cms_no_config.h \
! src/cms/sendn_no_config.h \
! src/cms/tcp_srv_no_config.h \
! src/cms/http_srv_no_config.h \
! src/cms/nml_srv_no_config.h \
! src/cms/physmem_no_config.h \
! src/cms/filemem_no_config.h \
! src/cms/ttyintf_no_config.h \
! src/cms/udpmem_no_config.h \
! src/cms/udp_srv_no_config.h \
! src/cms/stcpopts_no_config.h \
! src/cms/recvline_no_config.h \
! src/cms/recvmsgt_no_config.h \
! src/cms/sendmsgt_no_config.h \
! src/node/nml_mod_no_config.h \
! src/os_intf/_timer_no_config.h \
! src/os_intf/timer_no_config.h \
! src/print/rcs_prnt_no_config.h
subdir = .
Index: configure
===================================================================
RCS file: /cvsroot/emc/rcslib/configure,v
retrieving revision 1.3.2.6
retrieving revision 1.3.2.7
diff -C2 -d -r1.3.2.6 -r1.3.2.7
*** configure 22 Aug 2003 20:06:35 -0000 1.3.2.6
--- configure 26 Aug 2003 00:39:43 -0000 1.3.2.7
***************
*** 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)
--- 1009,1016 ----
--enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer
! --enable-ALL Enable/Disable all the other features in one
! command. (default=no)
! --enable-ALLJAVA Enable/Disable all java releted features of the
! above in one command. (default=no)
--enable-nml-codegen Build the nml_codegen tool also enables
librcsforgcj. It requires GCJ.(default=no)
***************
*** 1940,1947 ****
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
--- 1942,1955 ----
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=${enableval};enable_rtlmem=${enableval}
fi;
+ # Check whether --enable-ALLJAVA or --disable-ALLJAVA was given.
+ if test "${enable_ALLJAVA+set}" = set; then
+ enableval="$enable_ALLJAVA"
+ enable_nml_codegen=${enableval};enable_rcs_jar=${enableval};enable_codegen_jar=${enableval};enable_diagapplet_jar=${enableval};enable_nml_codegen=${enableval}
+ fi;
+
# Check whether --enable-nml_codegen or --disable-nml_codegen was given.
if test "${enable_nml_codegen+set}" = set; then
***************
*** 2199,2204 ****
enableval="$enable_sokintrf"
enable_sokintrf=$enableval;
! { echo "$as_me:$LINENO: enable_sokintrf=$enableval" >&5
! echo "$as_me: enable_sokintrf=$enableval" >&6;}
else
enable_sokintrf=yes
--- 2207,2212 ----
enableval="$enable_sokintrf"
enable_sokintrf=$enableval;
! { echo "$as_me:$LINENO: enable_sokintrf=${enableval}" >&5
! echo "$as_me: enable_sokintrf=${enableval}" >&6;}
else
enable_sokintrf=yes
***************
*** 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
--- 5180,5184 ----
*-*-irix6*)
# Find out which ABI we are using.
! echo '#line 5182 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
***************
*** 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
--- 5716,5720 ----
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
! if { (eval echo configure:5718: \"$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
***************
*** 7501,7505 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 7503 "configure"
#include "confdefs.h"
--- 7509,7513 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 7511 "configure"
#include "confdefs.h"
***************
*** 7599,7603 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 7601 "configure"
#include "confdefs.h"
--- 7607,7611 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 7609 "configure"
#include "confdefs.h"
***************
*** 9921,9925 ****
! for ac_header in errno.h ctype.h arpa/inet.h fcntl.h netdb.h netinet/in.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/utsname.h sys/systeminfo.h sys/time.h syslog.h termios.h unistd.h semaphore.h sys/filio.h math.h signal.h dirent.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--- 9929,9935 ----
!
!
! for ac_header in errno.h ctype.h arpa/inet.h fcntl.h netdb.h netinet/in.h sys/file.h sys/ioctl.h sys/param.h sys/uio.h net/uio.h sys/socket.h sys/utsname.h sys/systeminfo.h sys/time.h syslog.h termios.h unistd.h semaphore.h sys/filio.h math.h signal.h dirent.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
***************
*** 10041,10046 ****
!
! for ac_header in sys/ipc.h sys/sem.h sys/fcntl.h sys/stat.h sys/wait.h sys/mman.h sys/shm.h sys/sysinfo.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--- 10051,10055 ----
! for ac_header in sys/ipc.h sys/sem.h sys/fcntl.h sys/stat.h sys/mman.h sys/shm.h sys/sysinfo.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
***************
*** 12041,12044 ****
--- 12050,12055 ----
fi
+
+
echo "$as_me:$LINENO: checking for caddr_t" >&5
echo $ECHO_N "checking for caddr_t... $ECHO_C" >&6
***************
*** 12049,12053 ****
#line $LINENO "configure"
#include "confdefs.h"
! $ac_includes_default
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
--- 12060,12116 ----
#line $LINENO "configure"
#include "confdefs.h"
!
! #if HAVE_SYS_TYPES_H
! # include <sys/types.h>
! #endif
! #if HAVE_SYS_STAT_H
! # include <sys/stat.h>
! #endif
! #if STDC_HEADERS
! # include <stdlib.h>
! # include <stddef.h>
! #else
! # if HAVE_STDLIB_H
! # include <stdlib.h>
! # endif
! #endif
! #if HAVE_STRING_H
! # if !STDC_HEADERS && HAVE_MEMORY_H
! # include <memory.h>
! # endif
! # include <string.h>
! #endif
! #if HAVE_STRINGS_H
! # include <strings.h>
! #endif
! #if HAVE_INTTYPES_H
! # include <inttypes.h>
! #else
! # if HAVE_STDINT_H
! # include <stdint.h>
! # endif
! #endif
! #if HAVE_UNISTD_H
! # include <unistd.h>
! #endif
! #if HAVE_SYS_UIO_H
! # include <sys/uio.h>
! #else
! #if HAVE_NET_UIO_H
! # include <net/uio.h>
! #endif
! #endif
! #if HAVE_SYS_SOCKET_H
! #include <sys/socket.h>
! #endif
! #if HAVE_WINSOCK2_H
! #include <winsock2.h>
! #endif
! #if HAVE_WINDOWS_H
! #include <windows.h>
! #endif
!
!
!
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
***************
*** 12089,12092 ****
--- 12152,12382 ----
echo "$as_me:$LINENO: result: $ac_cv_type_caddr_t" >&5
echo "${ECHO_T}$ac_cv_type_caddr_t" >&6
+ if test $ac_cv_type_caddr_t = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_CADDR_T_TYPE 1
+ _ACEOF
+
+ fi
+
+
+
+ echo "$as_me:$LINENO: checking for struct iovec" >&5
+ echo $ECHO_N "checking for struct iovec... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_iovec+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+
+ #if HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
+ #if HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+ #if STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #else
+ # if HAVE_STDLIB_H
+ # include <stdlib.h>
+ # endif
+ #endif
+ #if HAVE_STRING_H
+ # if !STDC_HEADERS && HAVE_MEMORY_H
+ # include <memory.h>
+ # endif
+ # include <string.h>
+ #endif
+ #if HAVE_STRINGS_H
+ # include <strings.h>
+ #endif
+ #if HAVE_INTTYPES_H
+ # include <inttypes.h>
+ #else
+ # if HAVE_STDINT_H
+ # include <stdint.h>
+ # endif
+ #endif
+ #if HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif
+ #if HAVE_SYS_UIO_H
+ # include <sys/uio.h>
+ #else
+ #if HAVE_NET_UIO_H
+ # include <net/uio.h>
+ #endif
+ #endif
+ #if HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
+ #if HAVE_WINSOCK2_H
+ #include <winsock2.h>
+ #endif
+ #if HAVE_WINDOWS_H
+ #include <windows.h>
+ #endif
+
+
+
+ #ifdef F77_DUMMY_MAIN
+ # ifdef __cplusplus
+ extern "C"
+ # endif
+ int F77_DUMMY_MAIN() { return 1; }
+ #endif
+ int
+ main ()
+ {
+ if ((struct iovec *) 0)
+ return 0;
+ if (sizeof (struct iovec))
+ return 0;
+ ;
+ return 0;
+ }
+ _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_cv_type_struct_iovec=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ ac_cv_type_struct_iovec=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_type_struct_iovec" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_iovec" >&6
+ if test $ac_cv_type_struct_iovec = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_STRUCT_IOVEC_TYPE 1
+ _ACEOF
+
+ fi
+
+
+ echo "$as_me:$LINENO: checking for struct msghdr" >&5
+ echo $ECHO_N "checking for struct msghdr... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_msghdr+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+
+ #if HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
+ #if HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+ #if STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #else
+ # if HAVE_STDLIB_H
+ # include <stdlib.h>
+ # endif
+ #endif
+ #if HAVE_STRING_H
+ # if !STDC_HEADERS && HAVE_MEMORY_H
+ # include <memory.h>
+ # endif
+ # include <string.h>
+ #endif
+ #if HAVE_STRINGS_H
+ # include <strings.h>
+ #endif
+ #if HAVE_INTTYPES_H
+ # include <inttypes.h>
+ #else
+ # if HAVE_STDINT_H
+ # include <stdint.h>
+ # endif
+ #endif
+ #if HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif
+ #if HAVE_SYS_UIO_H
+ # include <sys/uio.h>
+ #else
+ #if HAVE_NET_UIO_H
+ # include <net/uio.h>
+ #endif
+ #endif
+ #if HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
+ #if HAVE_WINSOCK2_H
+ #include <winsock2.h>
+ #endif
+ #if HAVE_WINDOWS_H
+ #include <windows.h>
+ #endif
+
+
+
+ #ifdef F77_DUMMY_MAIN
+ # ifdef __cplusplus
+ extern "C"
+ # endif
+ int F77_DUMMY_MAIN() { return 1; }
+ #endif
+ int
+ main ()
+ {
+ if ((struct msghdr *) 0)
+ return 0;
+ if (sizeof (struct msghdr))
+ return 0;
+ ;
+ return 0;
+ }
+ _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_cv_type_struct_msghdr=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ ac_cv_type_struct_msghdr=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_type_struct_msghdr" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_msghdr" >&6
+ if test $ac_cv_type_struct_msghdr = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_STRUCT_MSGHDR_TYPE 1
+ _ACEOF
+
+ fi
+
***************
*** 12095,12098 ****
--- 12385,12389 ----
if test "x${check_for_windows_stuff}" = "xyes" ; then
+
echo "$as_me:$LINENO: checking for u_int" >&5
echo $ECHO_N "checking for u_int... $ECHO_C" >&6
***************
*** 12155,12158 ****
--- 12446,12450 ----
fi
+
if test "x${ac_cv_have_u_int}" = "xyes" ; then
***************
*** 12163,12167 ****
fi
-
echo "$as_me:$LINENO: checking for u_short" >&5
echo $ECHO_N "checking for u_short... $ECHO_C" >&6
--- 12455,12458 ----
***************
*** 12221,12225 ****
ac_cv_have_u_short=yes
else
! ac_cv_have_u_short=yes
fi
--- 12512,12516 ----
ac_cv_have_u_short=yes
else
! ac_cv_have_u_short=no
fi
***************
*** 12291,12295 ****
ac_cv_have_u_long=yes
else
! ac_cv_have_u_long=yes
fi
--- 12582,12586 ----
ac_cv_have_u_long=yes
else
! ac_cv_have_u_long=no
fi
Index: configure.ac
===================================================================
RCS file: /cvsroot/emc/rcslib/configure.ac,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.ac 22 Aug 2003 20:06:36 -0000 1.3.2.5
--- configure.ac 26 Aug 2003 00:39:43 -0000 1.3.2.6
***************
*** 60,66 ****
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,
--- 60,71 ----
AC_ARG_ENABLE(ALL,
[AC_HELP_STRING([--enable-ALL],
! [Enable/Disable all the other features 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=${enableval};enable_rtlmem=${enableval}])
!
+ AC_ARG_ENABLE(ALLJAVA,
+ [AC_HELP_STRING([--enable-ALLJAVA],
+ [Enable/Disable all java releted features 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_nml_codegen=${enableval}])
AC_ARG_ENABLE(nml_codegen,
***************
*** 253,257 ****
[Add some simple socket support support, needed for TCP,UDP,HTTP etc. (default=yes)])],
[enable_sokintrf=$enableval;
! AC_MSG_NOTICE([enable_sokintrf=$enableval])],
[enable_sokintrf=yes])
--- 258,262 ----
[Add some simple socket support support, needed for TCP,UDP,HTTP etc. (default=yes)])],
[enable_sokintrf=$enableval;
! AC_MSG_NOTICE([enable_sokintrf=${enableval}])],
[enable_sokintrf=yes])
***************
*** 610,615 ****
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
! AC_CHECK_HEADERS([errno.h ctype.h arpa/inet.h fcntl.h netdb.h netinet/in.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/utsname.h sys/systeminfo.h sys/time.h syslog.h termios.h unistd.h semaphore.h sys/filio.h math.h signal.h dirent.h])
! AC_CHECK_HEADERS([sys/ipc.h sys/sem.h sys/fcntl.h sys/stat.h sys/wait.h sys/mman.h sys/shm.h sys/sysinfo.h])
AC_CHECK_HEADERS(standards.h sys/xti.h)
--- 615,620 ----
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
! AC_CHECK_HEADERS([errno.h ctype.h arpa/inet.h fcntl.h netdb.h netinet/in.h sys/file.h sys/ioctl.h sys/param.h sys/uio.h net/uio.h sys/socket.h sys/utsname.h sys/systeminfo.h sys/time.h syslog.h termios.h unistd.h semaphore.h sys/filio.h math.h signal.h dirent.h])
! AC_CHECK_HEADERS([sys/ipc.h sys/sem.h sys/fcntl.h sys/stat.h sys/mman.h sys/shm.h sys/sysinfo.h])
AC_CHECK_HEADERS(standards.h sys/xti.h)
***************
*** 843,847 ****
AC_STRUCT_TM
AC_TYPE_UID_T
! AC_CHECK_TYPE([caddr_t])
## AC_MSG_NOTICE([LIBS=${LIBS}])
--- 848,1019 ----
AC_STRUCT_TM
AC_TYPE_UID_T
!
!
! AC_CHECK_TYPE([caddr_t],
! [AC_DEFINE(HAVE_CADDR_T_TYPE,1,[Define to 1 if you have the caddr_t type.])],,
! [
! #if HAVE_SYS_TYPES_H
! # include <sys/types.h>
! #endif
! #if HAVE_SYS_STAT_H
! # include <sys/stat.h>
! #endif
! #if STDC_HEADERS
! # include <stdlib.h>
! # include <stddef.h>
! #else
! # if HAVE_STDLIB_H
! # include <stdlib.h>
! # endif
! #endif
! #if HAVE_STRING_H
! # if !STDC_HEADERS && HAVE_MEMORY_H
! # include <memory.h>
! # endif
! # include <string.h>
! #endif
! #if HAVE_STRINGS_H
! # include <strings.h>
! #endif
! #if HAVE_INTTYPES_H
! # include <inttypes.h>
! #else
! # if HAVE_STDINT_H
! # include <stdint.h>
! # endif
! #endif
! #if HAVE_UNISTD_H
! # include <unistd.h>
! #endif
! #if HAVE_SYS_UIO_H
! # include <sys/uio.h>
! #else
! #if HAVE_NET_UIO_H
! # include <net/uio.h>
! #endif
! #endif
! #if HAVE_SYS_SOCKET_H
! #include <sys/socket.h>
! #endif
! #if HAVE_WINSOCK2_H
! #include <winsock2.h>
! #endif
! #if HAVE_WINDOWS_H
! #include <windows.h>
! #endif
! ]
! )
!
!
! AC_CHECK_TYPE([struct iovec],
! [AC_DEFINE(HAVE_STRUCT_IOVEC_TYPE,1,[Define to 1 if you have the struct iovec type.])],,
! [
! #if HAVE_SYS_TYPES_H
! # include <sys/types.h>
! #endif
! #if HAVE_SYS_STAT_H
! # include <sys/stat.h>
! #endif
! #if STDC_HEADERS
! # include <stdlib.h>
! # include <stddef.h>
! #else
! # if HAVE_STDLIB_H
! # include <stdlib.h>
! # endif
! #endif
! #if HAVE_STRING_H
! # if !STDC_HEADERS && HAVE_MEMORY_H
! # include <memory.h>
! # endif
! # include <string.h>
! #endif
! #if HAVE_STRINGS_H
! # include <strings.h>
! #endif
! #if HAVE_INTTYPES_H
! # include <inttypes.h>
! #else
! # if HAVE_STDINT_H
! # include <stdint.h>
! # endif
! #endif
! #if HAVE_UNISTD_H
! # include <unistd.h>
! #endif
! #if HAVE_SYS_UIO_H
! # include <sys/uio.h>
! #else
! #if HAVE_NET_UIO_H
! # include <net/uio.h>
! #endif
! #endif
! #if HAVE_SYS_SOCKET_H
! #include <sys/socket.h>
! #endif
! #if HAVE_WINSOCK2_H
! #include <winsock2.h>
! #endif
! #if HAVE_WINDOWS_H
! #include <windows.h>
! #endif
! ]
! )
!
! AC_CHECK_TYPE([struct msghdr],
! [AC_DEFINE(HAVE_STRUCT_MSGHDR_TYPE,1,[Define to 1 if you have the struct msghdr type.])],,
! [
! #if HAVE_SYS_TYPES_H
! # include <sys/types.h>
! #endif
! #if HAVE_SYS_STAT_H
! # include <sys/stat.h>
! #endif
! #if STDC_HEADERS
! # include <stdlib.h>
! # include <stddef.h>
! #else
! # if HAVE_STDLIB_H
! # include <stdlib.h>
! # endif
! #endif
! #if HAVE_STRING_H
! # if !STDC_HEADERS && HAVE_MEMORY_H
! # include <memory.h>
! # endif
! # include <string.h>
! #endif
! #if HAVE_STRINGS_H
! # include <strings.h>
! #endif
! #if HAVE_INTTYPES_H
! # include <inttypes.h>
! #else
! # if HAVE_STDINT_H
! # include <stdint.h>
! # endif
! #endif
! #if HAVE_UNISTD_H
! # include <unistd.h>
! #endif
! #if HAVE_SYS_UIO_H
! # include <sys/uio.h>
! #else
! #if HAVE_NET_UIO_H
! # include <net/uio.h>
! #endif
! #endif
! #if HAVE_SYS_SOCKET_H
! #include <sys/socket.h>
! #endif
! #if HAVE_WINSOCK2_H
! #include <winsock2.h>
! #endif
! #if HAVE_WINDOWS_H
! #include <windows.h>
! #endif
! ]
! )
!
## AC_MSG_NOTICE([LIBS=${LIBS}])
***************
*** 849,852 ****
--- 1021,1025 ----
if test "x${check_for_windows_stuff}" = "xyes" ; then
+
AC_CHECK_TYPE([u_int],
[ac_cv_have_u_int=yes],
***************
*** 858,869 ****
#endif
])
if test "x${ac_cv_have_u_int}" = "xyes" ; then
AC_DEFINE(HAVE_U_INT,1,[Define to 1 if you have the u_int type])
fi
-
AC_CHECK_TYPE([u_short],
[ac_cv_have_u_short=yes],
! [ac_cv_have_u_short=yes],
[
#include <windows.h>
--- 1031,1042 ----
#endif
])
+
if test "x${ac_cv_have_u_int}" = "xyes" ; then
AC_DEFINE(HAVE_U_INT,1,[Define to 1 if you have the u_int type])
fi
AC_CHECK_TYPE([u_short],
[ac_cv_have_u_short=yes],
! [ac_cv_have_u_short=no],
[
#include <windows.h>
***************
*** 880,884 ****
AC_CHECK_TYPE([u_long],
[ac_cv_have_u_long=yes],
! [ac_cv_have_u_long=yes],
[
#include <windows.h>
--- 1053,1057 ----
AC_CHECK_TYPE([u_long],
[ac_cv_have_u_long=yes],
! [ac_cv_have_u_long=no],
[
#include <windows.h>
Index: rcs_config.h.in
===================================================================
RCS file: /cvsroot/emc/rcslib/rcs_config.h.in,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** rcs_config.h.in 22 Aug 2003 03:34:26 -0000 1.1.2.5
--- rcs_config.h.in 26 Aug 2003 00:39:43 -0000 1.1.2.6
***************
*** 7,10 ****
--- 7,13 ----
#undef HAVE_ARPA_INET_H
+ /* Define to 1 if you have the caddr_t type. */
+ #undef HAVE_CADDR_T_TYPE
+
/* Define to 1 if you have the `clock_gettime' function. */
#undef HAVE_CLOCK_GETTIME
***************
*** 109,112 ****
--- 112,118 ----
#undef HAVE_NETINET_TCP_H
+ /* Define to 1 if you have the <net/uio.h> header file. */
+ #undef HAVE_NET_UIO_H
+
/* Define to 1 if you have the `opendir' function. */
#undef HAVE_OPENDIR
***************
*** 220,223 ****
--- 226,235 ----
#undef HAVE_STRTOUL
+ /* Define to 1 if you have the struct iovec type. */
+ #undef HAVE_STRUCT_IOVEC_TYPE
+
+ /* Define to 1 if you have the struct msghdr type. */
+ #undef HAVE_STRUCT_MSGHDR_TYPE
+
/* Define to 1 if you have the `sysconf' function. */
#undef HAVE_SYSCONF
***************
*** 282,289 ****
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <sys/utsname.h> header file. */
#undef HAVE_SYS_UTSNAME_H
! /* Define to 1 if you have the <sys/wait.h> header file. */
#undef HAVE_SYS_WAIT_H
--- 294,304 ----
#undef HAVE_SYS_TYPES_H
+ /* Define to 1 if you have the <sys/uio.h> header file. */
+ #undef HAVE_SYS_UIO_H
+
/* Define to 1 if you have the <sys/utsname.h> header file. */
#undef HAVE_SYS_UTSNAME_H
! /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
#undef HAVE_SYS_WAIT_H
|
