Support for determining the Java version supported by javaexec.

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 0f317d30c75acaf6dc523029c7d73d72eb9878bd..554f41536da6bc3435d9ae73526e7f239182b313 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,23 @@
+2006-03-13  Bruno Haible  <bruno@clisp.org>
+
+       * javaversion.h: New file.
+       * javaversion.c: New file.
+       * javaversion.java: New file.
+       * javaversion.class: New file, generated from javaversion.java.
+       * Makefile.am (libgettextlib_la_SOURCES): Add javaversion.h,
+       javaversion.c.
+       (pkgdatadir, pkgdata_DATA): New variables.
+       (EXTRA_DIST): Add javaversion.java.
+       (DEFS): Also define PKGDATADIR.
+       * Makefile.msvc (pkgdatadir, IIpkgdatadir): New variables.
+       (CFLAGS): Also define PKGDATADIR.
+       (OBJECTS): Add javaversion.obj.
+       (javaversion.obj): New rule.
+       * Makefile.vms (pkgdatadir): New variable.
+       (CFLAGS): Also define PKGDATADIR.
+       (OBJECTS): Add javaversion.obj.
+       (javaversion.obj): New rule.
+
 2006-04-30  Bruno Haible  <bruno@clisp.org>
 
        * xvasprintf.h: New file, from gnulib.
@@ -1442,4 +1462,4 @@
        * Makefile.am (EXTRA_DIST): Add ChangeLog.0.
 
 
-See ChangeLog.0 for earlier changes.
\ No newline at end of file
+See ChangeLog.0 for earlier changes.

diff --git a/gettext-tools/lib/Makefile.am b/gettext-tools/lib/Makefile.am
index 128c7d2ef7eb4437038e762ad45577bc03a4a23b..58767ed11ccfcecb73e7ecf16895d75e757e84b9 100644 (file)
--- a/gettext-tools/lib/Makefile.am
+++ b/gettext-tools/lib/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/lib subdirectory of GNU gettext
-## Copyright (C) 1995-1998, 2000-2005 Free Software Foundation, Inc.
+## Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -60,6 +60,7 @@ libgettextlib_la_SOURCES = \
   iconvstring.h iconvstring.c \
   javacomp.h javacomp.c \
   javaexec.h javaexec.c \
+  javaversion.h javaversion.c \
   linebreak.h linebreak.c lbrkprop.h utf8-ucs4.h utf16-ucs4.h \
   mbswidth.h mbswidth.c \
   minmax.h \
@@ -140,6 +141,10 @@ install-exec-clean:
 gettextsrcdir = $(datadir)/gettext
 gettextsrc_DATA = gettext.h
 
+pkgdatadir = $(datadir)/gettext
+pkgdata_DATA = javaversion.class
+EXTRA_DIST += javaversion.java
+
 # Files installed for the examples.
 
 docdir = @docdir@
@@ -159,7 +164,9 @@ EXTRA_DIST += \
 
 AM_CPPFLAGS = -I. -I$(srcdir) -I.. -I../intl -I$(top_srcdir)/intl
 
-DEFS = -DEXEEXT=\"$(EXEEXT)\" -DDEPENDS_ON_LIBINTL=1 -DDEPENDS_ON_LIBICONV=1 @DEFS@
+DEFS = \
+  -DPKGDATADIR=\"$(pkgdatadir)\" \
+  -DEXEEXT=\"$(EXEEXT)\" -DDEPENDS_ON_LIBINTL=1 -DDEPENDS_ON_LIBICONV=1 @DEFS@
 
 
 # >>> gnulib module stdbool.

diff --git a/gettext-tools/lib/Makefile.msvc b/gettext-tools/lib/Makefile.msvc
index 181a119bf77f6a16f92d33287404371150bcd70c..d1e25053415bdeceb5d703a86e3ebc68d78eb939 100644 (file)
--- a/gettext-tools/lib/Makefile.msvc
+++ b/gettext-tools/lib/Makefile.msvc
@@ -34,6 +34,8 @@ exec_prefix = $(prefix)
 bindir = $(exec_prefix)\bin
 libdir = $(exec_prefix)\lib
 includedir = $(prefix)\include
+pkgdatadir = $(datadir)\gettext
+IIpkgdatadir = $(IIdatadir)\\gettext
 
 # Programs used by "make":
 
@@ -60,7 +62,7 @@ OPTIMFLAGS = -D_NDEBUG -O1
 DEBUGFLAGS =
 !endif
 
-CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H -DEXEEXT=\".exe\" -DDEPENDS_ON_LIBINTL=1 -DDEPENDS_ON_LIBICONV=1
+CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H -DPKGDATADIR=\"$(IIpkgdatadir)\" -DEXEEXT=\".exe\" -DDEPENDS_ON_LIBINTL=1 -DDEPENDS_ON_LIBICONV=1
 
 INCLUDES = -I. -I.. -I..\intl -I..\windows -I$(includedir)
 
@@ -106,6 +108,7 @@ OBJECTS = \
   iconvstring.obj \
   javacomp.obj \
   javaexec.obj \
+  javaversion.obj \
   linebreak.obj \
   mbswidth.obj \
   obstack.obj \
@@ -223,6 +226,9 @@ javacomp.obj : javacomp.c
 javaexec.obj : javaexec.c
        $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c javaexec.c
 
+javaversion.obj : javaversion.c
+       $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c javaversion.c
+
 linebreak.obj : linebreak.c
        $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c linebreak.c
 

diff --git a/gettext-tools/lib/Makefile.vms b/gettext-tools/lib/Makefile.vms
index c0b403bb7b84794822d5e2b99688d09f3be666a1..82b9bc41071922f18a3b52c340fdf20bf894747a 100644 (file)
--- a/gettext-tools/lib/Makefile.vms
+++ b/gettext-tools/lib/Makefile.vms
@@ -6,6 +6,7 @@
 prefix = SYS$DATA:[
 exec_prefix = $(prefix)
 libdir = $(exec_prefix).lib
+pkgdatadir = $(datadir).gettext
 
 # Programs used by "make":
 
@@ -20,7 +21,7 @@ WARN_CFLAGS = /warning
 OPTIMFLAGS = /optimize
 
 CFLAGS = $(ABIFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS)
-DEFS = "VMS=1","HAVE_CONFIG_H=1","EXEEXT="".exe""","LIBDIR=""$(libdir)]"""
+DEFS = "VMS=1","HAVE_CONFIG_H=1","PKGDATADIR=""$(pkgdatadir)]""","EXEEXT="".exe""","LIBDIR=""$(libdir)]"""
 
 INCLUDES = /include=([],[-],[-.intl])
 
@@ -64,6 +65,7 @@ OBJECTS = \
   iconvstring.obj, \
   javacomp.obj, \
   javaexec.obj, \
+  javaversion.obj, \
   linebreak.obj, \
   mbswidth.obj, \
   obstack.obj, \
@@ -185,6 +187,9 @@ javacomp.obj : javacomp.c,alloca.h
 javaexec.obj : javaexec.c,alloca.h
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) javaexec.c
 
+javaversion.obj : javaversion.c
+       $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) javaversion.c
+
 linebreak.obj : linebreak.c
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) linebreak.c
 

diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog
index 2ed18156c7068cda0c411f0c242f5475d44603b2..1704ef15d8bdab446e9b75afab1b80a67101346e 100644 (file)
--- a/gettext-tools/po/ChangeLog
+++ b/gettext-tools/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-13  Bruno Haible  <bruno@clisp.org>
+
+       * POTFILES.in: Add lib/javaversion.c.
+
 2006-04-17  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.in.in (MKINSTALLDIRS, mkinstalldirs): Remove variables.

diff --git a/gettext-tools/po/POTFILES.in b/gettext-tools/po/POTFILES.in
index dd51f5b72836be3a6396b5f8fe4d3a73432dba6a..b3e16f471157e10aad892bbca3839aefcb025ff1 100644 (file)
--- a/gettext-tools/po/POTFILES.in
+++ b/gettext-tools/po/POTFILES.in
@@ -15,6 +15,7 @@ lib/execute.c
 lib/getopt.c
 lib/javacomp.c
 lib/javaexec.c
+lib/javaversion.c
 lib/obstack.c
 lib/pipe.c
 lib/quotearg.c