Mercurial > hg > octave-nkf > gnulib-hg
changeset 10500:7d66f23909d8
Avoid assigning ICONV_H in two different files. Fixes a bug.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sat, 27 Sep 2008 19:14:53 +0200 |
parents | e94f2744d6b3 |
children | 4e04aaeb17f9 |
files | ChangeLog m4/iconv_h.m4 m4/iconv_open.m4 |
diffstat | 3 files changed, 19 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2008-09-27 Bruno Haible <bruno@clisp.org> + * m4/iconv_h.m4 (gl_REPLACE_ICONV_H): New macro. + (gl_ICONV_H_DEFAULTS): Initialize ICONV_H here... + (gl_ICONV_H): Not here. + * m4/iconv_open.m4 (gl_REPLACE_ICONV_OPEN): Invoke gl_REPLACE_ICONV_H + instead of assigning ICONV_H directly. + * m4/wchar.m4 (gl_REPLACE_WCHAR_H): New macro. * m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Invoke it instead of assigning WCHAR_H directly.
--- a/m4/iconv_h.m4 +++ b/m4/iconv_h.m4 @@ -1,5 +1,5 @@ -# iconv_h.m4 serial 3 -dnl Copyright (C) 2007 Free Software Foundation, Inc. +# iconv_h.m4 serial 4 +dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8,8 +8,13 @@ [ AC_REQUIRE([gl_ICONV_H_DEFAULTS]) gl_CHECK_NEXT_HEADERS([iconv.h]) - ICONV_H= - AC_SUBST([ICONV_H]) +]) + +dnl Unconditionally enables the replacement of <iconv.h>. +AC_DEFUN([gl_REPLACE_ICONV_H], +[ + AC_REQUIRE([gl_ICONV_H_DEFAULTS]) + ICONV_H='iconv.h' ]) AC_DEFUN([gl_ICONV_MODULE_INDICATOR], @@ -25,4 +30,5 @@ REPLACE_ICONV=0; AC_SUBST([REPLACE_ICONV]) REPLACE_ICONV_OPEN=0; AC_SUBST([REPLACE_ICONV_OPEN]) REPLACE_ICONV_UTF=0; AC_SUBST([REPLACE_ICONV_UTF]) + ICONV_H=''; AC_SUBST([ICONV_H]) ])
--- a/m4/iconv_open.m4 +++ b/m4/iconv_open.m4 @@ -1,5 +1,5 @@ -# iconv_open.m4 serial 3 -dnl Copyright (C) 2007 Free Software Foundation, Inc. +# iconv_open.m4 serial 4 +dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -38,9 +38,9 @@ AC_DEFUN([gl_REPLACE_ICONV_OPEN], [ + gl_REPLACE_ICONV_H REPLACE_ICONV_OPEN=1 AC_LIBOBJ([iconv_open]) - ICONV_H='iconv.h' ]) AC_DEFUN([gl_FUNC_ICONV_OPEN_UTF],