new module 'iconv-h'

[Bruno Haible]

Another irregularity is that there is no module for the iconv.h include file.
So far it has been part of the 'iconv_open' module. This is inconsistent.


2010-03-06  Bruno Haible  <address@hidden>

        New module 'iconv-h'.
        * modules/iconv-h: New file.
        * modules/iconv_open (Files): Remove lib/iconv.in.h, m4/iconv_h.m4.
        (Depends-on): Add iconv-h. Remove include_next, arg-nonnull.
        (configure.ac): Remove gl_ICONV_H.
        (Makefile.am): Remove rule for iconv.h.

=============================== modules/iconv-h ===============================
Description:
A GNU-like <iconv.h>.

Files:
lib/iconv.in.h
m4/iconv_h.m4

Depends-on:
include_next
arg-nonnull

configure.ac:
gl_ICONV_H

Makefile.am:
BUILT_SOURCES += $(ICONV_H)

# We need the following in order to create <iconv.h> when the system
# doesn't have one that works with the given compiler.
iconv.h: iconv.in.h $(ARG_NONNULL_H)
        $(AM_V_GEN)rm -f address@hidden $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
          sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
              -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \
              -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \
              -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \
              -e 's|@''REPLACE_ICONV_UTF''@|$(REPLACE_ICONV_UTF)|g' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              < $(srcdir)/iconv.in.h; \
        } > address@hidden && \
        mv address@hidden $@
MOSTLYCLEANFILES += iconv.h iconv.h-t

Include:
<iconv.h>

License:
LGPLv2+

Maintainer:
Bruno Haible
===============================================================================
--- modules/iconv_open.orig     Sat Mar  6 19:40:24 2010
+++ modules/iconv_open  Sat Mar  6 19:18:50 2010
@@ -2,49 +2,25 @@
 Character set conversion.
 
 Files:
-lib/iconv.in.h
 lib/iconv_open.c
 lib/iconv_open-aix.gperf
 lib/iconv_open-hpux.gperf
 lib/iconv_open-irix.gperf
 lib/iconv_open-osf.gperf
 lib/iconv_open-solaris.gperf
-m4/iconv_h.m4
 m4/iconv_open.m4
 
 Depends-on:
 gperf
-include_next
-arg-nonnull
+iconv-h
 iconv
 c-ctype
 c-strcase
 
 configure.ac:
-gl_ICONV_H
 gl_FUNC_ICONV_OPEN
 
 Makefile.am:
-BUILT_SOURCES += $(ICONV_H)
-
-# We need the following in order to create <iconv.h> when the system
-# doesn't have one that works with the given compiler.
-iconv.h: iconv.in.h $(ARG_NONNULL_H)
-       $(AM_V_GEN)rm -f address@hidden $@ && \
-       { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-             -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
-             -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \
-             -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \
-             -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \
-             -e 's|@''REPLACE_ICONV_UTF''@|$(REPLACE_ICONV_UTF)|g' \
-             -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-             < $(srcdir)/iconv.in.h; \
-       } > address@hidden && \
-       mv address@hidden $@
-MOSTLYCLEANFILES += iconv.h iconv.h-t
-
 iconv_open-aix.h: iconv_open-aix.gperf
        $(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > 
$(srcdir)/iconv_open-aix.h-t
        mv $(srcdir)/iconv_open-aix.h-t $(srcdir)/iconv_open-aix.h