X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ficonv_open;h=014697ebbb399e7cf7c764eb8f7347f8c909a762;hb=5d412172ab1a1775153957a47dc397ce26caf90c;hp=1fa84125e81cf0c9a5ee075de17ebc14cc0f6e14;hpb=b3027087e07468b63109d116e77202d391019125;p=gnulib.git

diff --git a/modules/iconv_open b/modules/iconv_open
index 1fa84125e..014697ebb 100644
--- a/modules/iconv_open
+++ b/modules/iconv_open
@@ -2,7 +2,7 @@ Description:
 Character set conversion.
 
 Files:
-lib/iconv_.h
+lib/iconv.in.h
 lib/iconv_open.c
 lib/iconv_open-aix.gperf
 lib/iconv_open-hpux.gperf
@@ -12,9 +12,11 @@ m4/iconv_h.m4
 m4/iconv_open.m4
 
 Depends-on:
+gperf
 include_next
 iconv
 c-ctype
+c-strcase
 
 configure.ac:
 gl_ICONV_H
@@ -25,18 +27,21 @@ 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_.h
+iconv.h: iconv.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	  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' \
-	      < $(srcdir)/iconv_.h; \
+	      -e 's|@''REPLACE_ICONV_UTF''@|$(REPLACE_ICONV_UTF)|g' \
+	      < $(srcdir)/iconv.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += iconv.h iconv.h-t
 
-GPERF = gperf
 iconv_open-aix.h: iconv_open-aix.gperf
 	$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $@-t
 	mv $@-t $@
@@ -57,6 +62,9 @@ EXTRA_DIST           += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h ico
 Include:
 <iconv.h>
 
+Link:
+$(LTLIBICONV) when linking with libtool, $(LIBICONV) otherwise
+
 License:
 LGPLv2+