# HG changeset patch # User diego # Date 1233500221 0 # Node ID 540abad3946f19a1a6f5c7047e7b59974dbf450e # Parent 913ded8385713b193d804b03c8a943ed3096bfbf Simplify inet_pton/inet_aton checks. diff -r 913ded838571 -r 540abad3946f configure --- a/configure Sun Feb 01 14:42:57 2009 +0000 +++ b/configure Sun Feb 01 14:57:01 2009 +0000 @@ -2924,19 +2924,16 @@ #include int main(void) { (void) inet_pton(0, 0, 0); return 0; } EOF -if cc_check $_ld_sock ; then - # NOTE: Linux has libresolv but does not need it - test $_ld_sock && _res_comment="using $_ld_sock" - inet_pton=yes - def_inet_pton='#define HAVE_INET_PTON 1' -elif cc_check $_ld_sock -lresolv ; then - _ld_sock="$_ld_sock -lresolv" - _res_comment="using $_ld_sock" - inet_pton=yes +for _ld_tmp in "$_ld_sock" "$_ld_sock -lresolv" ; do + cc_check $_ld_tmp && inet_pton=yes && break +done +if test $inet_pton = yes ; then + test $_ld_tmp && _res_comment="using $_ld_tmp" def_inet_pton='#define HAVE_INET_PTON 1' fi echores "$inet_pton" + echocheck "inet_aton()" def_inet_aton='#define HAVE_INET_ATON 0' inet_aton=no @@ -2946,16 +2943,12 @@ #include int main(void) { (void) inet_aton(0, 0); return 0; } EOF -if cc_check $_ld_sock ; then - # NOTE: Linux has libresolv but does not need it - test $_ld_sock && _res_comment="using $_ld_sock" +for _ld_tmp in "$_ld_sock" "$_ld_sock -lresolv" ; do + cc_check $_ld_tmp && inet_aton=yes && break +done +if test $inet_aton = yes ; then + test $_ld_tmp && _res_comment="using $_ld_tmp" def_inet_aton='#define HAVE_INET_ATON 1' - inet_aton=yes -elif cc_check $_ld_sock -lresolv ; then - _ld_sock="$_ld_sock -lresolv" - _res_comment="using $_ld_sock" - def_inet_aton='#define HAVE_INET_ATON 1' - inet_aton=yes fi echores "$inet_aton"