X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ficonv_h.m4;h=bc05b055174129d0d8ff8594c999ea60cc10feb3;hb=175caaec9cd1aa171316be789c2a744aba22855a;hp=38f22900d180558244e5b5a9cfc1a98e731a5a9d;hpb=3b07669db0f825ef388c9bcb7fdd1049b064617d;p=gnulib.git

diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4
index 38f22900d..bc05b0551 100644
--- 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])
 ])