From: W.C.A. Wijngaards Date: Mon, 3 Jan 2022 12:26:02 +0000 (+0100) Subject: * Fix build error on Solaris 10 with inet_ntop redeclaration error. X-Git-Tag: 1.8.2-rc.1~28 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f88a75f7159ec2e85e16234ffadf9903326c133a;p=thirdparty%2Fldns.git * Fix build error on Solaris 10 with inet_ntop redeclaration error. --- diff --git a/Changelog b/Changelog index 0e4bcf52..dfee2106 100644 --- a/Changelog +++ b/Changelog @@ -3,6 +3,7 @@ fields. Thanks Felipe Gasper * bugfix #149: Add some missing [out] annotations to doxygen parameters. Thanks aldot. + * Fix build error on Solaris 10 with inet_ntop redeclaration error. 1.8.1 2021-12-03 * bugfix #146: ldns-1.7.1 had soname 3.0, so ldns-1.8.x soname diff --git a/configure.ac b/configure.ac index 840a1d64..f36ffe77 100644 --- a/configure.ac +++ b/configure.ac @@ -136,7 +136,7 @@ AC_CHECK_FUNC([socket], # older Solaris provides inet_ntop in -lresolv. AC_CHECK_FUNC([inet_ntop], [], - [AC_SEARCH_LIBS([inet_ntop], [socket c nsl resolv]) + [AC_SEARCH_LIBS([inet_ntop], [socket c nsl resolv], [ac_cv_func_inet_ntop=yes]) ]) # modern Linux provides inet_pton in -lsocket. @@ -145,7 +145,7 @@ AC_CHECK_FUNC([inet_ntop], # older Solaris provides inet_pton in -lresolv. AC_CHECK_FUNC([inet_pton], [], - [AC_SEARCH_LIBS([inet_pton], [socket c nsl resolv]) + [AC_SEARCH_LIBS([inet_pton], [socket c nsl resolv], [ac_cv_func_inet_pton=yes]) ])