From 00c979d8c748f8d7eeffc1a1397e1e91c99a951c Mon Sep 17 00:00:00 2001
From: serge-sans-paille <sguelton@mozilla.com>
Date: Wed, 28 Feb 2024 11:11:18 +0000
Subject: [PATCH] Bug 1881499 - Move res_ninit check to moz.configure
 r=glandium

Differential Revision: https://phabricator.services.mozilla.com/D202421
---
 build/moz.configure/libraries.configure | 11 ++++++++
 js/src/old-configure.in                 | 30 ---------------------
 old-configure.in                        | 36 -------------------------
 3 files changed, 11 insertions(+), 66 deletions(-)

diff --git a/build/moz.configure/libraries.configure b/build/moz.configure/libraries.configure
index 1d74475936b1..cac37e0ae54d 100644
--- a/build/moz.configure/libraries.configure
+++ b/build/moz.configure/libraries.configure
@@ -42,3 +42,14 @@ set_config(
 )
 
 set_config("REALTIME_LIBS", ["-lrt"], when=have_rt_clock_monotonic_support)
+
+
+have_res_ninit = try_link(
+    includes=["sys/types.h", "netinet/in.h", "arpa/nameser.h", "resolv.h"],
+    body="int foo = res_ninit(&_res);",
+    check_msg="for res_ninit()",
+    flags=depends(when=building_linux)(["-D_BSD_SOURCE=1"]),
+    when=building_with_gnu_cc & ~target_is_netbsd & ~target_is_openbsd,
+)
+
+set_define("HAVE_RES_NINIT", have_res_ninit)
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index 0c9581121270..c124e0030877 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -605,36 +605,6 @@ dnl Checks for math functions.
 dnl ========================================================
 AC_CHECK_LIB(m, sin)
 
-AC_CACHE_CHECK(
-    [for res_ninit()],
-    ac_cv_func_res_ninit,
-    [if test "$OS_TARGET" = NetBSD -o "$OS_TARGET" = OpenBSD; then
-        dnl no need for res_ninit() on NetBSD and OpenBSD
-        ac_cv_func_res_ninit=no
-     else
-       AC_TRY_LINK([
-            #ifdef linux
-            #define _BSD_SOURCE 1
-            #endif
-            #include <sys/types.h>
-            #include <netinet/in.h>
-            #include <arpa/nameser.h>
-            #include <resolv.h>
-            ],
-            [int foo = res_ninit(&_res);],
-            [ac_cv_func_res_ninit=yes],
-            [ac_cv_func_res_ninit=no])
-     fi
-    ])
-
-if test "$ac_cv_func_res_ninit" = "yes"; then
-    AC_DEFINE(HAVE_RES_NINIT)
-dnl must add the link line we do something as foolish as this... dougt
-dnl else
-dnl    AC_CHECK_LIB(bind, res_ninit, AC_DEFINE(HAVE_RES_NINIT),
-dnl        AC_CHECK_LIB(resolv, res_ninit, AC_DEFINE(HAVE_RES_NINIT)))
-fi
-
 AM_LANGINFO_CODESET
 
 AC_LANG_C
diff --git a/old-configure.in b/old-configure.in
index 802fa8db5917..f83794950731 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -634,42 +634,6 @@ then
 fi
 
 
-dnl Checks for library functions.
-dnl ========================================================
-
-AC_CACHE_CHECK(
-    [for res_ninit()],
-    ac_cv_func_res_ninit,
-    [if test "$OS_TARGET" = NetBSD -o "$OS_TARGET" = OpenBSD; then
-        dnl no need for res_ninit() on NetBSD and OpenBSD
-        ac_cv_func_res_ninit=no
-     else
-        AC_TRY_LINK([
-            #ifdef linux
-            #define _BSD_SOURCE 1
-            #endif
-            #include <sys/types.h>
-            #include <netinet/in.h>
-            #include <arpa/nameser.h>
-            #include <resolv.h>
-            ],
-            [int foo = res_ninit(&_res);],
-            [ac_cv_func_res_ninit=yes],
-            [ac_cv_func_res_ninit=no])
-     fi
-    ])
-
-if test "$ac_cv_func_res_ninit" = "yes"; then
-    AC_DEFINE(HAVE_RES_NINIT)
-dnl must add the link line we do something as foolish as this... dougt
-dnl else
-dnl    AC_CHECK_LIB(bind, res_ninit, AC_DEFINE(HAVE_RES_NINIT),
-dnl        AC_CHECK_LIB(resolv, res_ninit, AC_DEFINE(HAVE_RES_NINIT)))
-fi
-
-AC_LANG_C
-
-dnl ===================================================================
 dnl ========================================================
 dnl Put your C++ language/feature checks below
 dnl ========================================================