Merge branch 'V5-7-patches'

* V5-7-patches:
  c tests: Ensure that linking succeeds if the openssl path has been specified explicitly
  testing/fulltests/default/T023snmpv3getMD5AES_simple: Skip if the openssl aes.h header file is not available
  testing/fulltests/transports/T361tlstcp_simple: Skip if TLS-TCP is disabled
  python: Ensure that linking succeeds if the openssl path has been specified explicitly
  Darwin >= 15: Avoid ___CFConstantStringClassReference symbol not found failures
  win32/Configure: Improve robustness

Author: bvanassche

configure

@@ -15832,15 +15832,34 @@ $as_echo "none" >&6; }
 	fi
 	;;
 
-    darwin8*|darwin9*|darwin1[0-4]*)
+    darwin*)
         #   Flat Namespace linking                      (Mac OS/X)
         #
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether darwin ld might need -flat_namespace" >&5
 $as_echo_n "checking whether darwin ld might need -flat_namespace... " >&6; }
 	if test -z "$MACOSX_DEPLOYMENT_TARGET"; then
-		LDFLAGS="-flat_namespace -framework CoreFoundation -framework CoreServices -framework DiskArbitration -framework IOKit $LDFLAGS"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+		saved_LDFLAGS="$LDFLAGS"
+                LDFLAGS="-flat_namespace -framework CoreFoundation -framework CoreServices -framework DiskArbitration -framework IOKit $LDFLAGS"
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+else
+  LDFLAGS="$saved_LDFLAGS"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 	else
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }

configure.d/config_os_progs

@@ -414,13 +414,16 @@ case $target_os in
 	fi
 	;;
 
-    darwin8*|darwin9*|darwin1[[0-4]]*)
+    darwin*)
         #   Flat Namespace linking                      (Mac OS/X)
         #
         AC_MSG_CHECKING([whether darwin ld might need -flat_namespace])
 	if test -z "$MACOSX_DEPLOYMENT_TARGET"; then
-		LDFLAGS="-flat_namespace -framework CoreFoundation -framework CoreServices -framework DiskArbitration -framework IOKit $LDFLAGS"
-		AC_MSG_RESULT([yes])
+		saved_LDFLAGS="$LDFLAGS"
+                LDFLAGS="-flat_namespace -framework CoreFoundation -framework CoreServices -framework DiskArbitration -framework IOKit $LDFLAGS"
+                AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
+                               [AC_MSG_RESULT([yes])],
+                               [LDFLAGS="$saved_LDFLAGS"; AC_MSG_RESULT([no])])
 	else
 		AC_MSG_RESULT([no])
 	fi

net-snmp-config.in

@@ -185,7 +185,7 @@ else
       echo $result
       ;;
     --build-command)
-      echo "@CC@ @CFLAGS@ @DEVFLAGS@"
+      echo "@CC@ @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@"
       ;;
     #################################################### client lib
     --libs)

python/setup.py

@@ -17,7 +17,7 @@
 if intree:
     netsnmp_libs = os.popen(basedir+'/net-snmp-config --libs').read()
     libdir = os.popen(basedir+'/net-snmp-config --build-lib-dirs '+basedir).read()
-    incdir = os.popen(basedir+'/net-snmp-config --build-includes '+basedir).read()
+    incdir = os.popen(basedir+'/net-snmp-config --build-includes '+basedir).read() + " " + os.popen(basedir+'/net-snmp-config --base-cflags '+basedir).read()
     libs = re.findall(r"-l(\S+)", netsnmp_libs)
     libdirs = re.findall(r"-L(\S+)", libdir)
     incdirs = re.findall(r"-I(\S+)", incdir)

testing/fulltests/default/T023snmpv3getMD5AES_simple

@@ -6,6 +6,7 @@ HEADER SNMPv3 get using MD5/AES of .1.3.6.1.2.1.1.3.0
 
 SKIPIFNOT NETSNMP_CAN_DO_CRYPTO
 SKIPIFNOT NETSNMP_ENABLE_SCAPI_AUTHPRIV
+SKIPIFNOT HAVE_OPENSSL_AES_H
 SKIPIFNOT HAVE_AES_CFB128_ENCRYPT
 SKIPIF NETSNMP_DISABLE_MD5
 

testing/fulltests/transports/T361tlstcp_simple

@@ -4,7 +4,7 @@
 
 HEADER TLS-TCP Transport
 
-SKIPIFNOT NETSNMP_TRANSPORT_DTLSUDP_DOMAIN
+SKIPIFNOT NETSNMP_TRANSPORT_TLSTCP_DOMAIN
 
 #
 # Begin test

win32/Configure

@@ -33,8 +33,8 @@ GetOptions      ('config=s' => \$config,
                  'with-winextdll' => \$b_winextdll,
                  'help' => \$help);
 
-if ($help == 1)
-{
+if ($help == 1 || !defined($config) || !defined($linktype) ||
+    !defined($b_ipv6) || !defined($b_winextdll)) {
 my $USAGE = qq/
 Usage:
     perl Configure [<options>]
@@ -70,7 +70,7 @@ if (($linktype ne "static") && ($linktype ne "dynamic")) {
   $linktype = "static";
 }
 
-if ($prefix eq "") {
+if (!$prefix) {
   $prefix = "c:/usr";
 }