More VMS support.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index c80d08e99caa2aad437ab8bf247a1e2694e20400..55575e2a02563762cdbde6b4cfd0178ef12de546 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -2,6 +2,7 @@
 
        * Makefile.vms: New file.
        * Makefile.am (EXTRA_DIST): Add Makefile.vms.
+       (x-java.c): Prepend a few VMS specific lines.
        * po-lex.c (mbfile_getc): Change element type of scatchbuf to
        'unsigned char'.
        * write-java.c (string_hashcode, write_java_string): Cast argument of

diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index dc43b46b11b3f2b39715b9dc907aa05f5da40fac..0adb58985fd143ee856cbc49074d037829038386 100644 (file)
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -223,9 +223,16 @@ po-gram-gen2.h: po-gram-gen.h
        $(SED) 's/yy/po_gram_/g' $(srcdir)/po-gram-gen.h > $@-tmp
        mv $@-tmp $@
 
+# We must add the '#include <vms_jackets.h>' here, not inside x-java.l,
+# because on VMS, <vms_jackets.h> must be included before <stdio.h>.
 x-java.c: x-java.l
-       $(LEX) -o$@-tmp -Px_java_yy $(srcdir)/x-java.l
-       test "$(LEX)" = ":" || mv $@-tmp $@
+       test "$(LEX)" = ":" || { \
+         $(LEX) -o$@-tmp -Px_java_yy $(srcdir)/x-java.l && \
+         (echo '#ifdef VMS'; echo '#include <vms_jackets.h>'; echo '#endif'; \
+          cat $@-tmp) > $@-tmq && \
+         rm -f $@-tmp && \
+         mv $@-tmq $@ ; \
+       }
 
 
 # Special rules for installation of auxiliary programs.