Merge pull request #4817 from eisenhauer/DillFix

Allow Dill to be build or not depending upon the results of that configuration

Author: eisenhauer

thirdparty/EVPath/EVPath/EVPathConfigCommon.cmake.in

@@ -4,7 +4,9 @@ find_dependency(atl @atl_VERSION@)
 find_dependency(ffs @ffs_VERSION@)
 
 if(NOT @BUILD_SHARED_LIBS@)
-  find_dependency(dill @dill_VERSION@)
+  if(@HAVE_COD_H@)
+    find_dependency(dill @dill_VERSION@)
+  endif()
 
   if(@NVML_FOUND@)
     find_dependency(NVML)

thirdparty/EVPath/EVPath/ip_config.c

@@ -387,7 +387,6 @@ get_qual_hostname(char *buf, int len, attr_list attrs,
     if (buf[0] == 0) {
 	/* bloody hell, what do you have to do? */
 	struct in_addr IP;
-	extern int h_errno;
 	char *iface;
 	if (get_string_attr(attrs, CM_IP_INTERFACE, &iface)){
 	    IP.s_addr = htonl(get_self_ip_iface(trace_func, trace_data, iface));

thirdparty/EVPath/EVPath/qual_hostname.c

@@ -342,7 +342,6 @@ get_qual_hostname(void *cm, char *buf, int len, CMtrans_services svc, attr_list
     if (buf[0] == 0) {
 	/* bloody hell, what do you have to do? */
 	struct in_addr IP;
-	extern int h_errno;
 	IP.s_addr = htonl(get_self_ip_addr(cm, svc));
 	svc->trace_out(cm, "CM<transport> - No hostname yet, trying gethostbyaddr on IP %lx", IP);
 	if (!is_private_IP(ntohl(IP.s_addr))) {

thirdparty/ffs/CMakeLists.txt

@@ -4,7 +4,11 @@ set(BUILD_TESTING OFF)
 set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_CMAKEDIR}/thirdparty")
 
 set(FFS_USE_ATL ON CACHE INTERNAL "")
-set(FFS_USE_DILL ON CACHE INTERNAL "")
+if(TARGET dill::dill)
+    set(FFS_USE_DILL ON CACHE INTERNAL "")
+else()
+    set(FFS_USE_DILL OFF CACHE INTERNAL "")
+endif()                                                                                                                                      
 set(FFS_LIBRARIES_ONLY ON CACHE INTERNAL "")
 set(FFS_QUIET ON CACHE INTERNAL "")
 set(FFS_LIBRARY_PREFIX adios2${ADIOS2_LIBRARY_SUFFIX}_ CACHE INTERNAL "")