Mercurial > hg > octave-nkf > gnulib-hg
changeset 14982:734141d3f8bf
inet_ntop. getaddrinfo: Respect rules for use of AC_LIBOBJ.
* m4/inet_ntop.m4 (gl_FUNC_INET_NTOP): Set HAVE_INET_NTOP. Call
AC_CHECK_FUNCS instead of AC_REPLACE_FUNCS. Don't invoke
gl_PREREQ_INET_NTOP. Move tests for declaration of inet_ntop here...
(gl_PREREQ_INET_NTOP): ... from here.
* modules/inet_ntop (configure.ac): Invoke AC_LIBOBJ and
gl_PREREQ_INET_NTOP here.
(Depends-on): Update condition.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 08 May 2011 21:42:19 +0200 |
parents | f557c357cfc4 |
children | 9ee1592da97c |
files | ChangeLog m4/inet_ntop.m4 modules/inet_ntop |
diffstat | 3 files changed, 31 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2011-05-08 Bruno Haible <bruno@clisp.org> + + inet_ntop. getaddrinfo: Respect rules for use of AC_LIBOBJ. + * m4/inet_ntop.m4 (gl_FUNC_INET_NTOP): Set HAVE_INET_NTOP. Call + AC_CHECK_FUNCS instead of AC_REPLACE_FUNCS. Don't invoke + gl_PREREQ_INET_NTOP. Move tests for declaration of inet_ntop here... + (gl_PREREQ_INET_NTOP): ... from here. + * modules/inet_ntop (configure.ac): Invoke AC_LIBOBJ and + gl_PREREQ_INET_NTOP here. + (Depends-on): Update condition. + 2011-05-08 Bruno Haible <bruno@clisp.org> iconv_open: Move AC_LIBOBJ invocations to module description.
--- a/m4/inet_ntop.m4 +++ b/m4/inet_ntop.m4 @@ -1,4 +1,4 @@ -# inet_ntop.m4 serial 14 +# inet_ntop.m4 serial 15 dnl Copyright (C) 2005-2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -11,10 +11,16 @@ dnl Most platforms that provide inet_ntop define it in libc. dnl Solaris 8..10 provide inet_ntop in libnsl instead. + HAVE_INET_NTOP=1 gl_save_LIBS=$LIBS AC_SEARCH_LIBS([inet_ntop], [nsl], [], - [AC_REPLACE_FUNCS([inet_ntop])]) + [AC_CHECK_FUNCS([inet_ntop]) + if test $ac_cv_func_inet_ntop = no; then + HAVE_INET_NTOP=0 + fi + ]) LIBS=$gl_save_LIBS + INET_NTOP_LIB= if test "$ac_cv_search_inet_ntop" != "no" && test "$ac_cv_search_inet_ntop" != "none required"; then @@ -22,11 +28,6 @@ fi AC_SUBST([INET_NTOP_LIB]) - gl_PREREQ_INET_NTOP -]) - -# Prerequisites of lib/inet_ntop.c. -AC_DEFUN([gl_PREREQ_INET_NTOP], [ AC_CHECK_HEADERS_ONCE([netdb.h]) AC_CHECK_DECLS([inet_ntop],,, [#include <arpa/inet.h> @@ -36,7 +37,11 @@ ]) if test $ac_cv_have_decl_inet_ntop = no; then HAVE_DECL_INET_NTOP=0 + AC_REQUIRE([AC_C_RESTRICT]) fi +]) + +# Prerequisites of lib/inet_ntop.c. +AC_DEFUN([gl_PREREQ_INET_NTOP], [ AC_REQUIRE([gl_SOCKET_FAMILIES]) - AC_REQUIRE([AC_C_RESTRICT]) ])
--- a/modules/inet_ntop +++ b/modules/inet_ntop @@ -8,12 +8,16 @@ Depends-on: arpa_inet extensions -sys_socket [test "$ac_cv_search_inet_ntop" = no && test $ac_cv_func_inet_ntop = no] -errno [test "$ac_cv_search_inet_ntop" = no && test $ac_cv_func_inet_ntop = no] -netinet_in [test "$ac_cv_search_inet_ntop" = no && test $ac_cv_func_inet_ntop = no] +sys_socket [test $HAVE_INET_NTOP = 0] +errno [test $HAVE_INET_NTOP = 0] +netinet_in [test $HAVE_INET_NTOP = 0] configure.ac: gl_FUNC_INET_NTOP +if test $HAVE_INET_NTOP = 0; then + AC_LIBOBJ([inet_ntop]) + gl_PREREQ_INET_NTOP +fi gl_ARPA_INET_MODULE_INDICATOR([inet_ntop]) Makefile.am: