utimensat: new module

[gnulib.git] / m4 / iconv_open.m4

diff --git a/m4/iconv_open.m4 b/m4/iconv_open.m4
index e0bb0c3..8eeef9f 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 6
+dnl Copyright (C) 2007-2009 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.
@@ -21,10 +21,11 @@ AC_DEFUN([gl_FUNC_ICONV_OPEN],
     if test $gl_func_iconv_gnu = no; then
       iconv_flavor=
       case "$host_os" in
-        aix*)  iconv_flavor=ICONV_FLAVOR_AIX ;;
-        irix*) iconv_flavor=ICONV_FLAVOR_IRIX ;;
-        hpux*) iconv_flavor=ICONV_FLAVOR_HPUX ;;
-        osf*)  iconv_flavor=ICONV_FLAVOR_OSF ;;
+        aix*)     iconv_flavor=ICONV_FLAVOR_AIX ;;
+        irix*)    iconv_flavor=ICONV_FLAVOR_IRIX ;;
+        hpux*)    iconv_flavor=ICONV_FLAVOR_HPUX ;;
+        osf*)     iconv_flavor=ICONV_FLAVOR_OSF ;;
+        solaris*) iconv_flavor=ICONV_FLAVOR_SOLARIS ;;
       esac
       if test -n "$iconv_flavor"; then
         AC_DEFINE_UNQUOTED([ICONV_FLAVOR], [$iconv_flavor],
@@ -38,9 +39,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],
@@ -226,7 +227,7 @@ changequote([,])dnl
       ])
     if test $gl_cv_func_iconv_supports_utf = no; then
       REPLACE_ICONV_UTF=1
-      AC_DEFINE([REPLACE_ICONV_UTF], 1,
+      AC_DEFINE([REPLACE_ICONV_UTF], [1],
         [Define if the iconv() functions are enhanced to handle the UTF-{16,32}{BE,LE} encodings.])
       REPLACE_ICONV=1
       gl_REPLACE_ICONV_OPEN