--- configure.orig	2021-03-13 13:18:59.466284000 -0800
+++ configure	2021-03-13 13:18:59.474328000 -0800
@@ -106,7 +106,7 @@
 }
 
 sub cplusplus_lang {
-    my @compilers = ( $cxx, 'g++', 'c++' );
+    my @compilers = ( $cxx, 'g++9', 'c++' );
     my $x;
     my $program = <<EOF;
 #include <list>
@@ -357,7 +357,7 @@
 
 	log_file("test.cc");
 
-	if (run_cmd($cxx,@cxxflags,"-c","test.cc","-o","xxtest.o") != 0) {
+	if (0) {
 	    print ": no\n";
 	    $y = header_def($x);
 	    print CONFIGH "#undef $y\n";
@@ -511,17 +511,9 @@
 #optional headers
 header_check("strings.h");
 
-$t1=macro_check("netinet/in.h","IPPROTO_TCP","HAVE_IPPROTO_TCP_ON_IN_H");
-$t2=macro_check("netinet/in.h","TCP_NODELAY","HAVE_TCP_NODELAY_ON_IN_H");
-$t3=macro_check("netinet/in.h","SOL_TCP","HAVE_SOL_TCP_ON_IN_H");
-
-$t4=macro_check("netinet/tcp.h","IPPROTO_TCP","HAVE_IPPROTO_TCP_ON_TCP_H");
-$t5=macro_check("netinet/tcp.h","TCP_NODELAY","HAVE_TCP_NODELAY_ON_TCP_H");
-$t6=macro_check("netinet/tcp.h","SOL_TCP","HAVE_SOL_TCP_ON_TCP_H");
-
 print "  net options: ";
 
-if ($t2 != 0) {
+if (0) {
     cppdef("USE_SOCK_OPTS");
     if ($t1!=0 && $t3!=0) {
 	cppundef("NEED_TCP_H");
@@ -535,10 +527,10 @@
 	print "netinet/tcp.h not required, SOL_TCP present.\n";
     }
 } else {
-    if ($t5 != 0 && ($t1!=0 || $t4!=0) && ($t3!=0 || $t6!=0) ) {
+    if (1) {
 	cppdef("NEED_TCP_H");
 	cppdef("USE_SOCK_OPTS");
-	if ($t1!=0 || $t4!=0) {
+	if (1) {
 	    cppdef("USE_IPPROTO_TCP");
 	    print "netinet/tcp.h required, IPPROTO_TCP present.\n";
 	} else {