# HG changeset patch # User Bruno Haible # Date 1306082100 -7200 # Node ID 72916c2ab9a11b2e730cc5d15e9883b41d7e6069 # Parent 6105cf25da6c17e50c72ad19888542718ccfa4e6 wcsrtombs: Move AC_LIBOBJ invocations to module description. * m4/wcsrtombs.m4 (gl_FUNC_WCSRTOMBS): Move AC_LIBOBJ and gl_PREREQ_WCSRTOMBS invocations from here... * modules/wcsrtombs (configure.ac): ... to here. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-05-22 Bruno Haible + + wcsrtombs: Move AC_LIBOBJ invocations to module description. + * m4/wcsrtombs.m4 (gl_FUNC_WCSRTOMBS): Move AC_LIBOBJ and + gl_PREREQ_WCSRTOMBS invocations from here... + * modules/wcsrtombs (configure.ac): ... to here. + 2011-05-22 Bruno Haible wcsrchr: Move AC_LIBOBJ invocations to module description. diff --git a/m4/wcsrtombs.m4 b/m4/wcsrtombs.m4 --- a/m4/wcsrtombs.m4 +++ b/m4/wcsrtombs.m4 @@ -1,4 +1,4 @@ -# wcsrtombs.m4 serial 9 +# wcsrtombs.m4 serial 10 dnl Copyright (C) 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, @@ -34,11 +34,6 @@ esac fi fi - if test $HAVE_WCSRTOMBS = 0 || test $REPLACE_WCSRTOMBS = 1; then - AC_LIBOBJ([wcsrtombs]) - AC_LIBOBJ([wcsrtombs-state]) - gl_PREREQ_WCSRTOMBS - fi ]) dnl Test whether the wcsrtombs implementation stores a non-NULL source pointer diff --git a/modules/wcsrtombs b/modules/wcsrtombs --- a/modules/wcsrtombs +++ b/modules/wcsrtombs @@ -20,6 +20,11 @@ configure.ac: gl_FUNC_WCSRTOMBS +if test $HAVE_WCSRTOMBS = 0 || test $REPLACE_WCSRTOMBS = 1; then + AC_LIBOBJ([wcsrtombs]) + AC_LIBOBJ([wcsrtombs-state]) + gl_PREREQ_WCSRTOMBS +fi gl_WCHAR_MODULE_INDICATOR([wcsrtombs]) Makefile.am: