diff --git a/common/environment/configure/autoconf_cache/arm-common b/common/environment/configure/autoconf_cache/arm-common
index a8d29c89d2..30c3bdd37b 100644
--- a/common/environment/configure/autoconf_cache/arm-common
+++ b/common/environment/configure/autoconf_cache/arm-common
@@ -167,6 +167,44 @@ screen_cv_sys_terminfo_used=${screen_cv_sys_terminfo_used=yes}
 slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes}
 
 # socat
+sc_cv_sys_crdly_shift=9
+sc_cv_sys_csize_shift=4
+sc_cv_sys_tabdly_shift=11
+sc_cv_termios_ispeed=yes
+sc_cv_type_dev_basic='8 /* unsigned long long */'
+sc_cv_type_gidt_basic='4 /* unsigned int */'
+sc_cv_type_longlong=yes
+sc_cv_type_modet_basic='4 /* unsigned int */'
+sc_cv_type_off64=no
+sc_cv_type_off64_basic='0 /* unknown */'
+sc_cv_type_off_basic='3 /* int */'
+sc_cv_type_pidt_basic='3 /* int */'
+sc_cv_type_rlimit_rlimmax_basic='4 /* unsigned int */'
+sc_cv_type_sa_family_t=yes
+sc_cv_type_sighandler=no
+sc_cv_type_sizet_basic='4 /* unsigned int */'
+sc_cv_type_socklen=yes
+sc_cv_type_socklent_basic='4 /* unsigned int */'
+sc_cv_type_stat64=no
+sc_cv_type_stat64_stblksize_basic='0 /* unknown */'
+sc_cv_type_stat64_stblocks_basic='0 /* unknown */'
+sc_cv_type_stat64_stdev_basic='0 /* unknown */'
+sc_cv_type_stat64_stino_basic='0 /* unknown */'
+sc_cv_type_stat64_stnlink_basic='0 /* unknown */'
+sc_cv_type_stat64_stsize_basic='0 /* unknown */'
+sc_cv_type_stat_stblksize_basic='3 /* int */'
+sc_cv_type_stat_stblocks_basic='3 /* int */'
+sc_cv_type_stat_stino_basic='4 /* unsigned int */'
+sc_cv_type_stat_stnlink_basic='4 /* unsigned int */'
+sc_cv_type_stat_stsize_basic='3 /* int */'
+sc_cv_type_struct_timeval_tv_usec='3 /* int */'
+sc_cv_type_timet_basic='3 /* int */'
+sc_cv_type_uidt_basic='4 /* unsigned int */'
+sc_cv_type_uint16=yes
+sc_cv_type_uint32=yes
+sc_cv_type_uint64=yes
+sc_cv_type_uint8=yes
+sc_cv_typeof_struct_cmsghdr_cmsg_len='4 /* unsigned int */'
 ac_cv_ispeed_offset=${ac_cv_ispeed_offset=13}
 sc_cv_termios_ispeed=${sc_cv_termios_ispeed=yes}
 
diff --git a/common/environment/configure/autoconf_cache/common-linux b/common/environment/configure/autoconf_cache/common-linux
index 1d204da2ca..81fb49e509 100644
--- a/common/environment/configure/autoconf_cache/common-linux
+++ b/common/environment/configure/autoconf_cache/common-linux
@@ -61,6 +61,9 @@ tcl_cv_api_serial=${tcl_cv_api_serial=termios}
 # python
 ac_cv_have_long_long_format=yes
 
+# socat
+ac_cv_have_c99_snprintf=yes
+
 # apache
 ac_cv_o_nonblock_inherited=${ac_cv_o_nonblock_inherited=no}
 
diff --git a/common/environment/configure/autoconf_cache/ix86-common b/common/environment/configure/autoconf_cache/ix86-common
index 0efa92fd04..9858a523e0 100644
--- a/common/environment/configure/autoconf_cache/ix86-common
+++ b/common/environment/configure/autoconf_cache/ix86-common
@@ -167,6 +167,43 @@ rsync_cv_REPLACE_INET_ATON=${rsync_cv_REPLACE_INET_ATON=no}
 # samba
 samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
 
+# socat
+sc_cv_termios_ispeed=yes
+sc_cv_type_dev_basic='8 /* unsigned long long */'
+sc_cv_type_gidt_basic='4 /* unsigned int */'
+sc_cv_type_longlong=yes
+sc_cv_type_modet_basic='4 /* unsigned int */'
+sc_cv_type_off64=no
+sc_cv_type_off64_basic='0 /* unknown */'
+sc_cv_type_off_basic='3 /* int */'
+sc_cv_type_pidt_basic='3 /* int */'
+sc_cv_type_rlimit_rlimmax_basic='4 /* unsigned int */'
+sc_cv_type_sa_family_t=yes
+sc_cv_type_sighandler=no
+sc_cv_type_sizet_basic='4 /* unsigned int */'
+sc_cv_type_socklen=yes
+sc_cv_type_socklent_basic='4 /* unsigned int */'
+sc_cv_type_stat64=no
+sc_cv_type_stat64_stblksize_basic='0 /* unknown */'
+sc_cv_type_stat64_stblocks_basic='0 /* unknown */'
+sc_cv_type_stat64_stdev_basic='0 /* unknown */'
+sc_cv_type_stat64_stino_basic='0 /* unknown */'
+sc_cv_type_stat64_stnlink_basic='0 /* unknown */'
+sc_cv_type_stat64_stsize_basic='0 /* unknown */'
+sc_cv_type_stat_stblksize_basic='3 /* int */'
+sc_cv_type_stat_stblocks_basic='3 /* int */'
+sc_cv_type_stat_stino_basic='4 /* unsigned int */'
+sc_cv_type_stat_stnlink_basic='4 /* unsigned int */'
+sc_cv_type_stat_stsize_basic='3 /* int */'
+sc_cv_type_struct_timeval_tv_usec='3 /* int */'
+sc_cv_type_timet_basic='3 /* int */'
+sc_cv_type_uidt_basic='4 /* unsigned int */'
+sc_cv_type_uint16=yes
+sc_cv_type_uint32=yes
+sc_cv_type_uint64=yes
+sc_cv_type_uint8=yes
+sc_cv_typeof_struct_cmsghdr_cmsg_len='4 /* unsigned int */'
+
 # screen
 screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no}
 screen_cv_sys_memcpy_overlap=${screen_cv_sys_memcpy_overlap=no}
diff --git a/common/environment/configure/autoconf_cache/mips-common b/common/environment/configure/autoconf_cache/mips-common
index 8e7a6244b5..bbe8ff32d6 100644
--- a/common/environment/configure/autoconf_cache/mips-common
+++ b/common/environment/configure/autoconf_cache/mips-common
@@ -16,6 +16,42 @@ screen_cv_sys_sockets_nofs=${screen_cv_sys_sockets_nofs=no}
 screen_cv_sys_sockets_usable=${screen_cv_sys_sockets_usable=yes}
 screen_cv_sys_terminfo_used=${screen_cv_sys_terminfo_used=yes}
 
+# socat
+sc_cv_type_dev_basic='8 /* unsigned long long */'
+sc_cv_type_gidt_basic='4 /* unsigned int */'
+sc_cv_type_longlong=yes
+sc_cv_type_modet_basic='4 /* unsigned int */'
+sc_cv_type_off64=no
+sc_cv_type_off64_basic='0 /* unknown */'
+sc_cv_type_off_basic='3 /* int */'
+sc_cv_type_pidt_basic='3 /* int */'
+sc_cv_type_rlimit_rlimmax_basic='4 /* unsigned int */'
+sc_cv_type_sa_family_t=yes
+sc_cv_type_sighandler=no
+sc_cv_type_sizet_basic='4 /* unsigned int */'
+sc_cv_type_socklen=yes
+sc_cv_type_socklent_basic='4 /* unsigned int */'
+sc_cv_type_stat64=no
+sc_cv_type_stat64_stblksize_basic='0 /* unknown */'
+sc_cv_type_stat64_stblocks_basic='0 /* unknown */'
+sc_cv_type_stat64_stdev_basic='0 /* unknown */'
+sc_cv_type_stat64_stino_basic='0 /* unknown */'
+sc_cv_type_stat64_stnlink_basic='0 /* unknown */'
+sc_cv_type_stat64_stsize_basic='0 /* unknown */'
+sc_cv_type_stat_stblksize_basic='3 /* int */'
+sc_cv_type_stat_stblocks_basic='3 /* int */'
+sc_cv_type_stat_stino_basic='4 /* unsigned int */'
+sc_cv_type_stat_stnlink_basic='4 /* unsigned int */'
+sc_cv_type_stat_stsize_basic='3 /* int */'
+sc_cv_type_struct_timeval_tv_usec='3 /* int */'
+sc_cv_type_timet_basic='3 /* int */'
+sc_cv_type_uidt_basic='4 /* unsigned int */'
+sc_cv_type_uint16=yes
+sc_cv_type_uint32=yes
+sc_cv_type_uint64=yes
+sc_cv_type_uint8=yes
+sc_cv_typeof_struct_cmsghdr_cmsg_len='4 /* unsigned int */'
+
 # ORBit2
 ac_cv_alignof_CORBA_octet=1
 ac_cv_alignof_CORBA_boolean=1
diff --git a/common/environment/configure/autoconf_cache/x86_64-linux b/common/environment/configure/autoconf_cache/x86_64-linux
index 21e1e8b2a9..dc695d2a4b 100644
--- a/common/environment/configure/autoconf_cache/x86_64-linux
+++ b/common/environment/configure/autoconf_cache/x86_64-linux
@@ -132,3 +132,39 @@ ac_cv_alignof_dbus_int16_t=2
 ac_cv_alignof_dbus_int32_t=4
 ac_cv_alignof_dbus_int64_t=8
 ac_cv_alignof_double=8
+
+# socat
+sc_cv_type_dev_basic='6 /* unsigned long */'
+sc_cv_type_gidt_basic='4 /* unsigned int */'
+sc_cv_type_longlong=yes
+sc_cv_type_modet_basic='4 /* unsigned int */'
+sc_cv_type_off64=no
+sc_cv_type_off64_basic='0 /* unknown */'
+sc_cv_type_off_basic='5 /* long */'
+sc_cv_type_pidt_basic='3 /* int */'
+sc_cv_type_rlimit_rlimmax_basic='6 /* unsigned long */'
+sc_cv_type_sa_family_t=yes
+sc_cv_type_sighandler=no
+sc_cv_type_sizet_basic='6 /* unsigned long */'
+sc_cv_type_socklen=yes
+sc_cv_type_socklent_basic='4 /* unsigned int */'
+sc_cv_type_stat64=no
+sc_cv_type_stat64_stblksize_basic='0 /* unknown */'
+sc_cv_type_stat64_stblocks_basic='0 /* unknown */'
+sc_cv_type_stat64_stdev_basic='0 /* unknown */'
+sc_cv_type_stat64_stino_basic='0 /* unknown */'
+sc_cv_type_stat64_stnlink_basic='0 /* unknown */'
+sc_cv_type_stat64_stsize_basic='0 /* unknown */'
+sc_cv_type_stat_stblksize_basic='5 /* long */'
+sc_cv_type_stat_stblocks_basic='5 /* long */'
+sc_cv_type_stat_stino_basic='6 /* unsigned long */'
+sc_cv_type_stat_stnlink_basic='6 /* unsigned long */'
+sc_cv_type_stat_stsize_basic='5 /* long */'
+sc_cv_type_struct_timeval_tv_usec='5 /* long */'
+sc_cv_type_timet_basic='5 /* long */'
+sc_cv_type_uidt_basic='4 /* unsigned int */'
+sc_cv_type_uint16=yes
+sc_cv_type_uint32=yes
+sc_cv_type_uint64=yes
+sc_cv_type_uint8=yes
+sc_cv_typeof_struct_cmsghdr_cmsg_len='6 /* unsigned long */'