Improved VMS support.

diff --git a/ChangeLog b/ChangeLog
index 17d529982cbc5c6a70b49b0e4ec013801d6234c4..5f7f14e5f3934654036f148d8bf1bdfee00282a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-08  Bruno Haible  <bruno@clisp.org>
+
+       * vms/link_options.opt: New file.
+       * vms/with-libiconv.opt, vms/without-libiconv.opt: New files.
+       * Makefile.am (EXTRA_DIST): Add them.
+       Reported by Jouk Jansen <joukj@hrem.stm.tudelft.nl>.
+
 2003-05-22  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.12.1 released.

diff --git a/Makefile.am b/Makefile.am
index 181338af7123754e3c6a5bf596a952aad01d8268..6d99f33b0a01d4731d8aa9566e4ac40afc6d3f37 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,7 +48,9 @@ EXTRA_DIST += os2/README.OS2 os2/Makefile os2/backward.def os2/configure.awk
 
 # VMS support.
 
-EXTRA_DIST += README.vms Makefile.vms
+EXTRA_DIST += README.vms Makefile.vms \
+              vms/link_options.opt \
+              vms/with-libiconv.opt vms/without-libiconv.opt
 
 
 # Woe32 support.

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index a2e37627c3a20daa009a5363090c90fb74377088..a1ca695699f89c9535970f5b0abd8cbbef382823 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-08  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (config.h_vms): Don't define HAVE_ENVIRON_DECL.
+       Reported by Jouk Jansen <joukj@hrem.stm.tudelft.nl>.
+
 2003-05-22  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.12.1 released.

diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am
index 536d1625cee4ccc62d42f822e8024d34f458643d..347d6394b9d2fbb1eb1b6e51f6a9328bd5ec51bc 100644 (file)
--- a/gettext-runtime/Makefile.am
+++ b/gettext-runtime/Makefile.am
@@ -56,7 +56,6 @@ config.h_vms: config.h.in ../version.sh
             -e 's/#undef HAVE_ALLOCA$$/#define HAVE_ALLOCA 1/' \
             -e 's/#undef HAVE_DECL_STRERROR$$/#define HAVE_DECL_STRERROR 1/' \
             -e 's/#undef HAVE_DLFCN_H$$/#define HAVE_DLFCN_H 1/' \
-            -e 's/#undef HAVE_ENVIRON_DECL$$/#define HAVE_ENVIRON_DECL 1/' \
             -e 's/#undef HAVE_ERRNO_DECL$$/#define HAVE_ERRNO_DECL 1/' \
             -e 's/#undef HAVE_GETCWD$$/#define HAVE_GETCWD 1/' \
             -e 's/#undef HAVE_GETEGID$$/#define HAVE_GETEGID 1/' \

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index c9ed90588c2f98f063dfb64018214aa83378c608..76b13fb77b8faf0e32d26bf919648fc89e20c6cb 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-08  Bruno Haible  <bruno@clisp.org>
+
+       * dcigettext.c (getcwd) [VMS]: Pass 3 arguments.
+       Reported by Jouk Jansen <joukj@hrem.stm.tudelft.nl>.
+
 2003-05-22  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.12.1 released.

diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c
index f6edb95c005996f72716d29a35fa3918752c49f5..1f3a70d0e0f2b1075faee8aad17d988bfef4cc1a 100644 (file)
--- a/gettext-runtime/intl/dcigettext.c
+++ b/gettext-runtime/intl/dcigettext.c
@@ -148,7 +148,11 @@ extern int errno;
 char *getwd ();
 #  define getcwd(buf, max) getwd (buf)
 # else
+#  if VMS
+#   define getcwd(buf, max) (getcwd) (buf, max, 0)
+#  else
 char *getcwd ();
+#  endif
 # endif
 # ifndef HAVE_STPCPY
 static char *stpcpy PARAMS ((char *dest, const char *src));

diff --git a/gettext-runtime/src/ChangeLog b/gettext-runtime/src/ChangeLog
index 577b7aae070e788926484ad885ab6cf4ec1afcde..df0fa7bba7fd5ecad782bcdde648018bd92790b0 100644 (file)
--- a/gettext-runtime/src/ChangeLog
+++ b/gettext-runtime/src/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-08  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.vms (LDADD): Take options from .opt files.
+       (libiconv.opt): New rule.
+       (gettext.exe, ngettext.exe): Depend on it.
+       Reported by Jouk Jansen <joukj@hrem.stm.tudelft.nl>.
+
 2003-05-22  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.12.1 released.

diff --git a/gettext-runtime/src/Makefile.vms b/gettext-runtime/src/Makefile.vms
index e8e66eeb32598f356b73379a21e6216ce814a4b1..6623328323cd9e20054e315ae15957cc0c2d209b 100644 (file)
--- a/gettext-runtime/src/Makefile.vms
+++ b/gettext-runtime/src/Makefile.vms
@@ -26,7 +26,7 @@ DEFS = "VMS=1","HAVE_CONFIG_H=1","LOCALEDIR=""$(localedir)]"""
 
 INCLUDES = /include=([],[-],[-.intl],[-.lib],[-.-.gettext-tools.lib])
 
-LDADD = sys$share:vms_jackets/share
+LDADD = libiconv.opt/opt,[-.-.vms]link_options.opt
 
 LN = copy
 RM = delete
@@ -52,10 +52,14 @@ gettext.obj : gettext.c
 ngettext.obj : ngettext.c
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") ngettext.c
 
-gettext.exe : $(gettext_OBJECTS)
+libiconv.opt :
+       if f$search("sys$library:libiconv.olb") .nes. "" then $(LN) [-.-.vms]with-libiconv.opt libiconv.opt
+       if f$search("sys$library:libiconv.olb") .eqs. "" then $(LN) [-.-.vms]without-libiconv.opt libiconv.opt
+
+gettext.exe : $(gettext_OBJECTS),libiconv.opt
        link /executable=gettext.exe $(gettext_OBJECTS),[-.lib]grt.olb/lib,[-.intl]intl.olb/lib,$(LDADD)
 
-ngettext.exe : $(ngettext_OBJECTS)
+ngettext.exe : $(ngettext_OBJECTS),libiconv.opt
        link /executable=ngettext.exe $(ngettext_OBJECTS),[-.lib]grt.olb/lib,[-.intl]intl.olb/lib,$(LDADD)
 
 install : all

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 6868fecdd0c621710fe775977b5c0a3d8e77bce3..f63593c5dee955583a3e00b09b5dc3d781a2d451 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,12 @@
+2003-05-08  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (config.h_vms): Don't define HAVE_ENVIRON_DECL. Define
+       eaccess.
+       * Makefile.vms (all, install, installdirs, uninstall, check,
+       mostlyclean, clean, distclean, maintainer-clean): Fix passing of srcdir
+       to sub-Makefile.
+       Reported by Jouk Jansen <joukj@hrem.stm.tudelft.nl>.
+
 2003-05-22  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.12.1 released.

diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am
index 8c504283bf70b7736388ecc47da63c3a3664880d..7b50f8e59087772b3920e521f4c83d14eab9f6be 100644 (file)
--- a/gettext-tools/Makefile.am
+++ b/gettext-tools/Makefile.am
@@ -56,7 +56,6 @@ config.h_vms: config.h.in ../version.sh
             -e 's/#undef HAVE_DECL_WCWIDTH$$/#define HAVE_DECL_WCWIDTH 1/' \
             -e 's/#undef HAVE_DIRENT_H$$/#define HAVE_DIRENT_H 1/' \
             -e 's/#undef HAVE_DLFCN_H$$/#define HAVE_DLFCN_H 1/' \
-            -e 's/#undef HAVE_ENVIRON_DECL$$/#define HAVE_ENVIRON_DECL 1/' \
             -e 's/#undef HAVE_ERRNO_DECL$$/#define HAVE_ERRNO_DECL 1/' \
             -e 's/#undef HAVE_FCNTL_H$$/#define HAVE_FCNTL_H 1/' \
             -e 's/#undef HAVE_GETCWD$$/#define HAVE_GETCWD 1/' \
@@ -131,6 +130,7 @@ config.h_vms: config.h.in ../version.sh
             -e 's/#undef ICONV_CONST$$/#define ICONV_CONST/' \
             -e 's/#undef SETLOCALE_CONST$$/#define SETLOCALE_CONST const/' \
             -e 's/#undef STDC_HEADERS$$/#define STDC_HEADERS 1/' \
+            -e 's/#undef eaccess$$/#define eaccess access/' \
             -e 's/#undef fnmatch$$/#define fnmatch rpl_fnmatch/' \
             -e 's/#undef getline$$/#define getline rpl_getline/' \
             -e 's/#undef realpath$$/#define realpath rpl_realpath/' \

diff --git a/gettext-tools/Makefile.vms b/gettext-tools/Makefile.vms
index 6d56f825bf18d8d3ad7d3ee9956c01d0a029bd9c..746658d0a9d1b5df49ae1614b6a066db3c344daf 100644 (file)
--- a/gettext-tools/Makefile.vms
+++ b/gettext-tools/Makefile.vms
@@ -15,7 +15,7 @@ all : config.h
        set default [-]
        create /directory [.intl]
        set default [.intl]
-       $(MMS) $(MMSQUALIFIERS) /description=[-.-.gettext-runtime.intl]Makefile.vms srcdir=[-.-.gettext-runtime.intl] all
+       $(MMS) $(MMSQUALIFIERS) /description=[-.-.gettext-runtime.intl]Makefile.vms /macro=("srcdir=[-.-.gettext-runtime.intl]") all
        set default [-]
        set default [.lib]
        $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms all
@@ -50,7 +50,7 @@ install :
        $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms install
        set default [-]
        set default [.intl]
-       $(MMS) $(MMSQUALIFIERS) /description=[-.-.gettext-runtime.intl]Makefile.vms srcdir=[-.-.gettext-runtime.intl] install
+       $(MMS) $(MMSQUALIFIERS) /description=[-.-.gettext-runtime.intl]Makefile.vms /macro=("srcdir=[-.-.gettext-runtime.intl]") install
        set default [-]
        set default [.lib]
        $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms install
@@ -82,7 +82,7 @@ installdirs :
        $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms installdirs
        set default [-]
        set default [.intl]
-       $(MMS) $(MMSQUALIFIERS) /description=[-.-.gettext-runtime.intl]Makefile.vms srcdir=[-.-.gettext-runtime.intl] installdirs
+       $(MMS) $(MMSQUALIFIERS) /description=[-.-.gettext-runtime.intl]Makefile.vms /macro=("srcdir=[-.-.gettext-runtime.intl]") installdirs
        set default [-]
        set default [.lib]
        $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms installdirs
@@ -114,7 +114,7 @@ uninstall :
        $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms uninstall
        set default [-]
        set default [.intl]
-       $(MMS) $(MMSQUALIFIERS) /description=[-.-.gettext-runtime.intl]Makefile.vms srcdir=[-.-.gettext-runtime.intl] uninstall
+       $(MMS) $(MMSQUALIFIERS) /description=[-.-.gettext-runtime.intl]Makefile.vms /macro=("srcdir=[-.-.gettext-runtime.intl]") uninstall
        set default [-]
        set default [.lib]
        $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms uninstall
@@ -146,7 +146,7 @@ check : all
        $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms check
        set default [-]
        set default [.intl]
-       $(MMS) $(MMSQUALIFIERS) /description=[-.-.gettext-runtime.intl]Makefile.vms srcdir=[-.-.gettext-runtime.intl] check
+       $(MMS) $(MMSQUALIFIERS) /description=[-.-.gettext-runtime.intl]Makefile.vms /macro=("srcdir=[-.-.gettext-runtime.intl]") check
        set default [-]
        set default [.lib]
        $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms check
@@ -178,7 +178,7 @@ mostlyclean :
        $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms mostlyclean
        set default [-]
        set default [.intl]
-       $(MMS) $(MMSQUALIFIERS) /description=[-.-.gettext-runtime.intl]Makefile.vms srcdir=[-.-.gettext-runtime.intl] mostlyclean
+       $(MMS) $(MMSQUALIFIERS) /description=[-.-.gettext-runtime.intl]Makefile.vms /macro=("srcdir=[-.-.gettext-runtime.intl]") mostlyclean
        set default [-]
        set default [.lib]
        $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms mostlyclean
@@ -211,7 +211,7 @@ clean :
        $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms clean
        set default [-]
        set default [.intl]
-       $(MMS) $(MMSQUALIFIERS) /description=[-.-.gettext-runtime.intl]Makefile.vms srcdir=[-.-.gettext-runtime.intl] clean
+       $(MMS) $(MMSQUALIFIERS) /description=[-.-.gettext-runtime.intl]Makefile.vms /macro=("srcdir=[-.-.gettext-runtime.intl]") clean
        set default [-]
        set default [.lib]
        $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms clean
@@ -244,7 +244,7 @@ distclean :
        $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms distclean
        set default [-]
        set default [.intl]
-       $(MMS) $(MMSQUALIFIERS) /description=[-.-.gettext-runtime.intl]Makefile.vms srcdir=[-.-.gettext-runtime.intl] distclean
+       $(MMS) $(MMSQUALIFIERS) /description=[-.-.gettext-runtime.intl]Makefile.vms /macro=("srcdir=[-.-.gettext-runtime.intl]") distclean
        set default [-]
        set default [.lib]
        $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms distclean
@@ -277,7 +277,7 @@ maintainer-clean :
        $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms maintainer-clean
        set default [-]
        set default [.intl]
-       $(MMS) $(MMSQUALIFIERS) /description=[-.-.gettext-runtime.intl]Makefile.vms srcdir=[-.-.gettext-runtime.intl] maintainer-clean
+       $(MMS) $(MMSQUALIFIERS) /description=[-.-.gettext-runtime.intl]Makefile.vms /macro=("srcdir=[-.-.gettext-runtime.intl]") maintainer-clean
        set default [-]
        set default [.lib]
        $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms maintainer-clean

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 05176120f81d49f55f0a431aad6a86dcc361846b..7e6683963d79f21969ee0c759d699a61d16c6be2 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,12 @@
+2003-05-08  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.vms (alloca.h): New rule.
+       (all, javacomp.obj, javaexec.obj): Depend on it.
+       (getopt.obj): Compile with ELIDE_CODE.
+       * canonicalize.c (__getcwd) [VMS]: Pass 3 arguments to getcwd.
+       * xgetcwd.c (getcwd) [VMS]: Pass 3 arguments.
+       Reported by Jouk Jansen <joukj@hrem.stm.tudelft.nl>.
+
 2003-05-22  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.12.1 released.

diff --git a/gettext-tools/lib/Makefile.vms b/gettext-tools/lib/Makefile.vms
index e5a54e342140c4ee8cbeabc428a3b787ceb0e7d8..6c8dd9cf8ffce31a21f22b58ad77102229722bbe 100644 (file)
--- a/gettext-tools/lib/Makefile.vms
+++ b/gettext-tools/lib/Makefile.vms
@@ -78,9 +78,12 @@ OBJECTS = \
   stpcpy.obj, \
   vasprintf.obj
 
-all : fnmatch.h gettextlib.olb
+all : alloca.h,fnmatch.h,gettextlib.olb
        write sys$output "Nothing else to be done for 'all'."
 
+alloca.h : alloca_.h
+       $(LN) alloca_.h alloca.h
+
 fnmatch.h : pfnmatch.h
        $(LN) pfnmatch.h fnmatch.h
 
@@ -124,7 +127,7 @@ gcd.obj : gcd.c
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) gcd.c
 
 getopt.obj : getopt.c
-       $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) getopt.c
+       $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"ELIDE_CODE=1") getopt.c
 
 getopt1.obj : getopt1.c
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) getopt1.c
@@ -132,10 +135,10 @@ getopt1.obj : getopt1.c
 hash.obj : hash.c
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) hash.c
 
-javacomp.obj : javacomp.c
+javacomp.obj : javacomp.c,alloca.h
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) javacomp.c
 
-javaexec.obj : javaexec.c
+javaexec.obj : javaexec.c,alloca.h
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) javaexec.c
 
 linebreak.obj : linebreak.c

diff --git a/gettext-tools/lib/canonicalize.c b/gettext-tools/lib/canonicalize.c
index d31600b9f67033cc7a7e241b688f2c106b7f6085..fbdca12119e1a2fc1f8b5fa957de0021aa270d9f 100644 (file)
--- a/gettext-tools/lib/canonicalize.c
+++ b/gettext-tools/lib/canonicalize.c
@@ -67,7 +67,12 @@
 # include "pathmax.h"
 # define __alloca alloca
 # if HAVE_GETCWD
-#  define __getcwd getcwd
+#  ifdef VMS
+    /* We want the directory in Unix syntax, not in VMS syntax.  */
+#   define __getcwd(buf, max) getcwd (buf, max, 0)
+#  else
+#   define __getcwd getcwd
+#  endif
 # else
 #  define __getcwd(buf, max) getwd (buf)
 # endif

diff --git a/gettext-tools/lib/xgetcwd.c b/gettext-tools/lib/xgetcwd.c
index 64b5338faf1277bd0724b1fa9bedfe84f6c8b215..4e6c11e8c0bc15b8c0a0a88fa6d4cb2abe2e5012 100644 (file)
--- a/gettext-tools/lib/xgetcwd.c
+++ b/gettext-tools/lib/xgetcwd.c
@@ -36,7 +36,12 @@ extern int errno;
 #include "pathmax.h"
 
 #if HAVE_GETCWD
+# ifdef VMS
+   /* We want the directory in Unix syntax, not in VMS syntax.  */
+#  define getcwd(Buf, Max) (getcwd) (Buf, Max, 0)
+# else
 char *getcwd ();
+# endif
 #else
 char *getwd ();
 # define getcwd(Buf, Max) getwd (Buf)

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 05353b161113705427acf624d1a34948ff4fd39d..cf763ada93aef9ed71076d62b938d110e881d11e 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,17 @@
+2003-05-08  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.vms (LDADD): Take options from .opt files.
+       (libiconv.opt): New rule.
+       (msgcmp.exe, msgfmt.exe, msgmerge.exe, msgunfmt.exe, xgettext.exe,
+       msgattrib.exe, msgcat.exe, msgcomm.exe, msgconv.exe, msgen.exe,
+       msgexec.exe, msgfilter.exe, msggrep.exe, msginit.exe, msguniq.exe):
+       Depend on it.
+       * plural-eval.c: Include "eval-plural.h" without a path, rely on the
+       Makefile's -I options instead.
+       * read-properties.c (conv_from_java): Change type of q to
+       'unsigned char *'.
+       Reported by Jouk Jansen <joukj@hrem.stm.tudelft.nl>.
+
 2003-05-27  Bruno Haible  <bruno@clisp.org>
 
        * plural-table.c (plural_table): Correct entry for Slovak.

diff --git a/gettext-tools/src/Makefile.vms b/gettext-tools/src/Makefile.vms
index 6c297c3a9f10662d9f878144b47ce7d1c9554e52..88500b9627e1e578695b7f1083b6d2bc071636f1 100644 (file)
--- a/gettext-tools/src/Makefile.vms
+++ b/gettext-tools/src/Makefile.vms
@@ -32,7 +32,7 @@ DEFS = "VMS=1","HAVE_CONFIG_H=1","LOCALEDIR=""$(localedir)]""","GETTEXTJAR=""$(j
 
 INCLUDES = /include=([],[-],[-.libuniname],[-.lib],[-.intl],[-.-.gettext-runtime.intl])
 
-LDADD = sys$share:vms_jackets/share
+LDADD = libiconv.opt/opt,[-.-.vms]link_options.opt
 LDADD_EXPAT = sys$library:expat/lib
 
 AR = library
@@ -329,50 +329,54 @@ localealias.obj : [-.-.gettext-runtime.intl]localealias.c
 msguniq.obj : msguniq.c
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msguniq.c
 
-msgcmp.exe : $(msgcmp_OBJECTS)
-       link /executable=msgcmp.exe $(msgcmp_OBJECTS),gettextsrc.olb/lib,$(LDADD)
+libiconv.opt :
+       if f$search("sys$library:libiconv.olb") .nes. "" then $(LN) [-.-.vms]with-libiconv.opt libiconv.opt
+       if f$search("sys$library:libiconv.olb") .eqs. "" then $(LN) [-.-.vms]without-libiconv.opt libiconv.opt
 
-msgfmt.exe : $(msgfmt_OBJECTS)
-       link /executable=msgfmt.exe $(msgfmt_OBJECTS),gettextsrc.olb/lib,$(LDADD)
+msgcmp.exe : $(msgcmp_OBJECTS),libiconv.opt
+       link /executable=msgcmp.exe $(msgcmp_OBJECTS),gettextsrc.olb/lib,[-.lib]gettextlib.olb/lib,[-.intl]intl.olb/lib,$(LDADD)
 
-msgmerge.exe : $(msgmerge_OBJECTS)
-       link /executable=msgmerge.exe $(msgmerge_OBJECTS),gettextsrc.olb/lib,$(LDADD)
+msgfmt.exe : $(msgfmt_OBJECTS),libiconv.opt
+       link /executable=msgfmt.exe $(msgfmt_OBJECTS),gettextsrc.olb/lib,[-.lib]gettextlib.olb/lib,[-.intl]intl.olb/lib,$(LDADD)
 
-msgunfmt.exe : $(msgunfmt_OBJECTS)
-       link /executable=msgunfmt.exe $(msgunfmt_OBJECTS),gettextsrc.olb/lib,$(LDADD)
+msgmerge.exe : $(msgmerge_OBJECTS),libiconv.opt
+       link /executable=msgmerge.exe $(msgmerge_OBJECTS),gettextsrc.olb/lib,[-.lib]gettextlib.olb/lib,[-.intl]intl.olb/lib,$(LDADD)
 
-xgettext.exe : $(xgettext_OBJECTS)
-       link /executable=xgettext.exe $(xgettext_OBJECTS),[-.libuniname]uniname.olb/lib,gettextsrc.olb/lib,$(LDADD_EXPAT),$(LDADD)
+msgunfmt.exe : $(msgunfmt_OBJECTS),libiconv.opt
+       link /executable=msgunfmt.exe $(msgunfmt_OBJECTS),gettextsrc.olb/lib,[-.lib]gettextlib.olb/lib,[-.intl]intl.olb/lib,$(LDADD)
 
-msgattrib.exe : $(msgattrib_OBJECTS)
-       link /executable=msgattrib.exe $(msgattrib_OBJECTS),gettextsrc.olb/lib,$(LDADD)
+xgettext.exe : $(xgettext_OBJECTS),libiconv.opt
+       link /executable=xgettext.exe $(xgettext_OBJECTS),[-.libuniname]uniname.olb/lib,gettextsrc.olb/lib,[-.lib]gettextlib.olb/lib,[-.intl]intl.olb/lib,$(LDADD_EXPAT),$(LDADD)
 
-msgcat.exe : $(msgcat_OBJECTS)
-       link /executable=msgcat.exe $(msgcat_OBJECTS),gettextsrc.olb/lib,$(LDADD)
+msgattrib.exe : $(msgattrib_OBJECTS),libiconv.opt
+       link /executable=msgattrib.exe $(msgattrib_OBJECTS),gettextsrc.olb/lib,[-.lib]gettextlib.olb/lib,[-.intl]intl.olb/lib,$(LDADD)
 
-msgcomm.exe : $(msgcomm_OBJECTS)
-       link /executable=msgcomm.exe $(msgcomm_OBJECTS),gettextsrc.olb/lib,$(LDADD)
+msgcat.exe : $(msgcat_OBJECTS),libiconv.opt
+       link /executable=msgcat.exe $(msgcat_OBJECTS),gettextsrc.olb/lib,[-.lib]gettextlib.olb/lib,[-.intl]intl.olb/lib,$(LDADD)
 
-msgconv.exe : $(msgconv_OBJECTS)
-       link /executable=msgconv.exe $(msgconv_OBJECTS),gettextsrc.olb/lib,$(LDADD)
+msgcomm.exe : $(msgcomm_OBJECTS),libiconv.opt
+       link /executable=msgcomm.exe $(msgcomm_OBJECTS),gettextsrc.olb/lib,[-.lib]gettextlib.olb/lib,[-.intl]intl.olb/lib,$(LDADD)
 
-msgen.exe : $(msgen_OBJECTS)
-       link /executable=msgen.exe $(msgen_OBJECTS),gettextsrc.olb/lib,$(LDADD)
+msgconv.exe : $(msgconv_OBJECTS),libiconv.opt
+       link /executable=msgconv.exe $(msgconv_OBJECTS),gettextsrc.olb/lib,[-.lib]gettextlib.olb/lib,[-.intl]intl.olb/lib,$(LDADD)
 
-msgexec.exe : $(msgexec_OBJECTS)
-       link /executable=msgexec.exe $(msgexec_OBJECTS),gettextsrc.olb/lib,$(LDADD)
+msgen.exe : $(msgen_OBJECTS),libiconv.opt
+       link /executable=msgen.exe $(msgen_OBJECTS),gettextsrc.olb/lib,[-.lib]gettextlib.olb/lib,[-.intl]intl.olb/lib,$(LDADD)
 
-msgfilter.exe : $(msgfilter_OBJECTS)
-       link /executable=msgfilter.exe $(msgfilter_OBJECTS),gettextsrc.olb/lib,$(LDADD)
+msgexec.exe : $(msgexec_OBJECTS),libiconv.opt
+       link /executable=msgexec.exe $(msgexec_OBJECTS),gettextsrc.olb/lib,[-.lib]gettextlib.olb/lib,[-.intl]intl.olb/lib,$(LDADD)
 
-msggrep.exe : $(msggrep_OBJECTS)
-       link /executable=msggrep.exe $(msggrep_OBJECTS),gettextsrc.olb/lib,$(LDADD)
+msgfilter.exe : $(msgfilter_OBJECTS),libiconv.opt
+       link /executable=msgfilter.exe $(msgfilter_OBJECTS),gettextsrc.olb/lib,[-.lib]gettextlib.olb/lib,[-.intl]intl.olb/lib,$(LDADD)
 
-msginit.exe : $(msginit_OBJECTS)
-       link /executable=msginit.exe $(msginit_OBJECTS),[-.intl]localename.obj,gettextsrc.olb/lib,$(LDADD)
+msggrep.exe : $(msggrep_OBJECTS),libiconv.opt
+       link /executable=msggrep.exe $(msggrep_OBJECTS),gettextsrc.olb/lib,[-.lib]gettextlib.olb/lib,[-.intl]intl.olb/lib,$(LDADD)
 
-msguniq.exe : $(msguniq_OBJECTS)
-       link /executable=msguniq.exe $(msguniq_OBJECTS),gettextsrc.olb/lib,$(LDADD)
+msginit.exe : $(msginit_OBJECTS),libiconv.opt
+       link /executable=msginit.exe $(msginit_OBJECTS),[-.intl]localename.obj,gettextsrc.olb/lib,[-.lib]gettextlib.olb/lib,[-.intl]intl.olb/lib,$(LDADD)
+
+msguniq.exe : $(msguniq_OBJECTS),libiconv.opt
+       link /executable=msguniq.exe $(msguniq_OBJECTS),gettextsrc.olb/lib,[-.lib]gettextlib.olb/lib,[-.intl]intl.olb/lib,$(LDADD)
 
 install : all
        create /directory $(prefix)]

diff --git a/gettext-tools/src/plural-eval.c b/gettext-tools/src/plural-eval.c
index 7344f73518d8b0cc30bbd2c9c7784240aa9ee9c6..eb805f2ec8589db5f380d51de788589b81c69b4f 100644 (file)
--- a/gettext-tools/src/plural-eval.c
+++ b/gettext-tools/src/plural-eval.c
@@ -1,5 +1,5 @@
 /* Expression evaluation for plural form selection.
-   Copyright (C) 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
    This program is free software; you can redistribute it and/or modify
@@ -30,4 +30,4 @@
 
 /* Include the expression evaluation code from libintl, this time with
    'extern' linkage.  */
-#include "../intl/eval-plural.h"
+#include "eval-plural.h"

diff --git a/gettext-tools/src/read-properties.c b/gettext-tools/src/read-properties.c
index 2faa3001b683eb70349dd5d82e7e413ed4d38cbb..a38a7a095264b8302632a76324d7e91d57523b60 100644 (file)
--- a/gettext-tools/src/read-properties.c
+++ b/gettext-tools/src/read-properties.c
@@ -266,7 +266,7 @@ conv_from_java (char *string)
   /* This conversion can only shrink the string, never increase its size.
      So there is no need to xmalloc the result freshly.  */
   const char *p = string;
-  char *q = string;
+  unsigned char *q = (unsigned char *) string;
 
   while (*p != '\0')
     {
@@ -336,7 +336,7 @@ conv_from_java (char *string)
            }
        }
       just_one_byte:
-       *q++ = *p++;
+       *q++ = (unsigned char) *p++;
     }
   *q = '\0';
   return string;

diff --git a/vms/link_options.opt b/vms/link_options.opt
new file mode 100644 (file)
index 0000000..d006242
--- /dev/null
+++ b/vms/link_options.opt
@@ -0,0 +1,2 @@
+sys$share:vms_jackets/share
+sys$library:decw$xlibshr.exe/share

diff --git a/vms/with-libiconv.opt b/vms/with-libiconv.opt
new file mode 100644 (file)
index 0000000..4635de9
--- /dev/null
+++ b/vms/with-libiconv.opt
@@ -0,0 +1 @@
+sys$library:libiconv.olb/lib

diff --git a/vms/without-libiconv.opt b/vms/without-libiconv.opt
new file mode 100644 (file)
index 0000000..e69de29