diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | m4/setlocale.m4 | 6 | ||||
| -rw-r--r-- | modules/setlocale | 4 |
3 files changed, 12 insertions, 5 deletions
@@ -1,5 +1,12 @@ 2011-05-21 Bruno Haible <bruno@clisp.org> + setlocale: Move AC_LIBOBJ invocations to module description. + * m4/setlocale.m4 (gl_FUNC_SETLOCALE): Move AC_LIBOBJ and + gl_PREREQ_SETLOCALE invocations from here... + * modules/setlocale (configure.ac): ... to here. + +2011-05-21 Bruno Haible <bruno@clisp.org> + unsetenv: Move AC_LIBOBJ invocations to module description. * m4/setenv.m4 (gl_FUNC_UNSETENV): Set HAVE_UNSETENV. Move AC_LIBOBJ and gl_PREREQ_UNSETENV invocations from here... diff --git a/m4/setlocale.m4 b/m4/setlocale.m4 index 92f76f433c..d64780d166 100644 --- a/m4/setlocale.m4 +++ b/m4/setlocale.m4 @@ -1,4 +1,4 @@ -# setlocale.m4 serial 3 +# setlocale.m4 serial 4 dnl Copyright (C) 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, @@ -20,10 +20,6 @@ AC_DEFUN([gl_FUNC_SETLOCALE], esac ;; esac - if test $REPLACE_SETLOCALE = 1; then - AC_LIBOBJ([setlocale]) - gl_PREREQ_SETLOCALE - fi ]) # Prerequisites of lib/setlocale.c. diff --git a/modules/setlocale b/modules/setlocale index 918a037da3..1d8f9975fd 100644 --- a/modules/setlocale +++ b/modules/setlocale @@ -11,6 +11,10 @@ localename [test $REPLACE_SETLOCALE = 1] configure.ac: gl_FUNC_SETLOCALE +if test $REPLACE_SETLOCALE = 1; then + AC_LIBOBJ([setlocale]) + gl_PREREQ_SETLOCALE +fi gl_LOCALE_MODULE_INDICATOR([setlocale]) Makefile.am: |