From 26dd7fe4edb8ed39ebf12cae874eb89e46ff9067 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Fri, 26 May 2023 10:11:11 -0700
Subject: CMake: remove "res_ninit" feature and collapse to just "libresolv"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Testing for "res_ninit" when WrapResolv.cmake has already checked for
far more complex functions was pointless. Instead, just accept the
library that was found by find_package() as good enough and rename the
feature as "libresolv".

Amends 4a46ba1209907796f4a14f6feb35ed4d70155d7d and
68b625901f9eb7c34e3d7aa302e1c0a454d3190b.

Change-Id: Ib5ce7a497e034ebabb2cfffd1762c0afa2fac6e0
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/network/configure.cmake | 31 ++++++-------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

(limited to 'src/network/configure.cmake')

diff --git a/src/network/configure.cmake b/src/network/configure.cmake
index d0417d6e3a..f24f739ce2 100644
--- a/src/network/configure.cmake
+++ b/src/network/configure.cmake
@@ -100,25 +100,6 @@ ci.ifa_prefered = ci.ifa_valid = 0;
 }
 ")
 
-# res_ninit
-qt_config_compile_test(res_ninit
-    LABEL "res_ninit()"
-    LIBRARIES
-        WrapResolv::WrapResolv
-    CODE
-"#include <sys/types.h>
-#include <netinet/in.h>
-#include <resolv.h>
-int main()
-{
-    res_state state;
-    res_ninit(state);
-    res_nclose(state);
-    return 0;
-}
-"
-)
-
 # res_setserver
 qt_config_compile_test(res_setservers
     LABEL "res_setservers()"
@@ -240,6 +221,11 @@ qt_feature("ipv6ifname" PUBLIC
     CONDITION TEST_ipv6ifname
 )
 qt_feature_definition("ipv6ifname" "QT_NO_IPV6IFNAME" NEGATE VALUE "1")
+qt_feature("libresolv" PRIVATE
+    LABEL "libresolv"
+    CONDITION WrapResolv_FOUND
+    AUTODETECT UNIX
+)
 qt_feature("libproxy" PRIVATE
     LABEL "libproxy"
     AUTODETECT OFF
@@ -249,14 +235,9 @@ qt_feature("linux-netlink" PRIVATE
     LABEL "Linux AF_NETLINK"
     CONDITION LINUX AND NOT ANDROID AND TEST_linux_netlink
 )
-qt_feature("res_ninit" PRIVATE
-    LABEL "res_ninit()"
-    CONDITION TEST_res_ninit
-    AUTODETECT UNIX
-)
 qt_feature("res_setservers" PRIVATE
     LABEL "res_setservers()"
-    CONDITION QT_FEATURE_res_ninit AND TEST_res_setservers
+    CONDITION QT_FEATURE_libresolv AND TEST_res_setservers
 )
 qt_feature("securetransport" PUBLIC
     LABEL "SecureTransport"
-- 
cgit v1.2.3