From: Ondřej Surý <ondrej@sury.org>
Date: Wed, 5 Sep 2018 11:34:44 +0000 (+0200)
Subject: Replace custom HAVE_CATGETS define with AC_CHECK_FUNCS call
X-Git-Tag: v9.13.4~157^2~15
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=7384a9f23aa9decdbfcaaeb577b8130925a6588a;p=thirdparty%2Fbind9.git

Replace custom HAVE_CATGETS define with AC_CHECK_FUNCS call
---

diff --git a/acconfig.h b/acconfig.h
index 6cc24a4b3b1..43c2eace177 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -17,9 +17,6 @@
  ***/
 @TOP@
 
-/** define if catgets() is available */
-#undef HAVE_CATGETS
-
 /** define if getifaddrs() exists */
 #undef HAVE_GETIFADDRS
 
diff --git a/config.h.in b/config.h.in
index d0a1eda1bdc..f50291852a3 100644
--- a/config.h.in
+++ b/config.h.in
@@ -17,9 +17,6 @@
  *** it does not get installed.
  ***/
 
-/** define if catgets() is available */
-#undef HAVE_CATGETS
-
 /** define if getifaddrs() exists */
 #undef HAVE_GETIFADDRS
 
@@ -122,6 +119,9 @@
 /* Define to 1 if the compiler supports __builtin_expect. */
 #undef HAVE_BUILTIN_EXPECT
 
+/* Define to 1 if you have the `catgets' function. */
+#undef HAVE_CATGETS
+
 /* Define to 1 if you have the `chroot' function. */
 #undef HAVE_CHROOT
 
diff --git a/configure b/configure
index 8d87d716ee7..193423fb7fd 100755
--- a/configure
+++ b/configure
@@ -17071,11 +17071,16 @@ fi
 #
 # NLS
 #
-ac_fn_c_check_func "$LINENO" "catgets" "ac_cv_func_catgets"
+for ac_func in catgets
+do :
+  ac_fn_c_check_func "$LINENO" "catgets" "ac_cv_func_catgets"
 if test "x$ac_cv_func_catgets" = xyes; then :
-  $as_echo "#define HAVE_CATGETS 1" >>confdefs.h
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_CATGETS 1
+_ACEOF
 
 fi
+done
 
 
 #
diff --git a/configure.in b/configure.in
index 9a673fe0734..c6e14899646 100644
--- a/configure.in
+++ b/configure.in
@@ -1603,7 +1603,7 @@ AC_SUBST(MKDEPPROG)
 #
 # NLS
 #
-AC_CHECK_FUNC(catgets, AC_DEFINE(HAVE_CATGETS),)
+AC_CHECK_FUNCS([catgets])
 
 #
 # -lxnet buys us one big porting headache...  standards, gotta love 'em.