X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=m4%2Fstrdup.m4;h=1681a30eba91a9f715c94c8fe2f8a7baef3ad370;hb=4aa85f09e755fc827cd5ab6225f20c83cd42245d;hp=0537def373024afcc889bc4c69eebfb08c9c18bc;hpb=cf7169a2ede9bb08b71de68fe0c8bbecf827abe6;p=debian%2Ftar diff --git a/m4/strdup.m4 b/m4/strdup.m4 index 0537def3..1681a30e 100644 --- a/m4/strdup.m4 +++ b/m4/strdup.m4 @@ -1,6 +1,6 @@ -# strdup.m4 serial 10 +# strdup.m4 serial 13 -dnl Copyright (C) 2002-2008 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,29 +9,27 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRDUP], [ AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_REPLACE_FUNCS(strdup) - AC_CHECK_DECLS_ONCE(strdup) + AC_CHECK_FUNCS_ONCE([strdup]) + AC_CHECK_DECLS_ONCE([strdup]) if test $ac_cv_have_decl_strdup = no; then HAVE_DECL_STRDUP=0 fi - gl_PREREQ_STRDUP ]) AC_DEFUN([gl_FUNC_STRDUP_POSIX], [ AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) - if test $gl_cv_func_malloc_posix != yes; then - REPLACE_STRDUP=1 - AC_LIBOBJ([strdup]) - else - AC_REPLACE_FUNCS(strdup) + AC_CHECK_FUNCS_ONCE([strdup]) + if test $ac_cv_func_strdup = yes; then + if test $gl_cv_func_malloc_posix != yes; then + REPLACE_STRDUP=1 + fi fi - AC_CHECK_DECLS_ONCE(strdup) + AC_CHECK_DECLS_ONCE([strdup]) if test $ac_cv_have_decl_strdup = no; then HAVE_DECL_STRDUP=0 fi - gl_PREREQ_STRDUP ]) # Prerequisites of lib/strdup.c.