Avoid assigning ICONV_H in two different files. Fixes a bug.

diff --git a/ChangeLog b/ChangeLog
index e1ff9b0235e7c0dc219910d8a981fcfe62d86e3e..a9b23f70d3defb3a3946d345ad11a53535972166 100644 (file)
--- 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.

diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4
index 38f22900d180558244e5b5a9cfc1a98e731a5a9d..bc05b055174129d0d8ff8594c999ea60cc10feb3 100644 (file)
--- 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_DEFUN([gl_ICONV_H],
 [
   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 @@ AC_DEFUN([gl_ICONV_H_DEFAULTS],
   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])
 ])

diff --git a/m4/iconv_open.m4 b/m4/iconv_open.m4
index e0bb0c36a1d7e98b7293bf27ff9a3e787eac3069..d14da72a2ada8203b60e51515ebad6e37d3e7674 100644 (file)
--- 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_FUNC_ICONV_OPEN],
 
 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],