From: Bruno Haible Date: Wed, 11 Jun 2003 12:00:20 +0000 (+0000) Subject: Improved VMS support. X-Git-Tag: v0.13~461 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d95e1bb3cf172c640ead3db692dc23eab2610761;p=thirdparty%2Fgettext.git Improved VMS support. --- diff --git a/ChangeLog b/ChangeLog index 17d529982..5f7f14e5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-05-08 Bruno Haible + + * 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 . + 2003-05-22 Bruno Haible * gettext-0.12.1 released. diff --git a/Makefile.am b/Makefile.am index 181338af7..6d99f33b0 100644 --- 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 a2e37627c..a1ca69569 100644 --- a/gettext-runtime/ChangeLog +++ b/gettext-runtime/ChangeLog @@ -1,3 +1,8 @@ +2003-05-08 Bruno Haible + + * Makefile.am (config.h_vms): Don't define HAVE_ENVIRON_DECL. + Reported by Jouk Jansen . + 2003-05-22 Bruno Haible * gettext-0.12.1 released. diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am index 536d1625c..347d6394b 100644 --- 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 c9ed90588..76b13fb77 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,8 @@ +2003-05-08 Bruno Haible + + * dcigettext.c (getcwd) [VMS]: Pass 3 arguments. + Reported by Jouk Jansen . + 2003-05-22 Bruno Haible * gettext-0.12.1 released. diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c index f6edb95c0..1f3a70d0e 100644 --- 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 577b7aae0..df0fa7bba 100644 --- a/gettext-runtime/src/ChangeLog +++ b/gettext-runtime/src/ChangeLog @@ -1,3 +1,10 @@ +2003-05-08 Bruno Haible + + * Makefile.vms (LDADD): Take options from .opt files. + (libiconv.opt): New rule. + (gettext.exe, ngettext.exe): Depend on it. + Reported by Jouk Jansen . + 2003-05-22 Bruno Haible * gettext-0.12.1 released. diff --git a/gettext-runtime/src/Makefile.vms b/gettext-runtime/src/Makefile.vms index e8e66eeb3..662332832 100644 --- 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 6868fecdd..f63593c5d 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,3 +1,12 @@ +2003-05-08 Bruno Haible + + * 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 . + 2003-05-22 Bruno Haible * gettext-0.12.1 released. diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am index 8c504283b..7b50f8e59 100644 --- 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 6d56f825b..746658d0a 100644 --- 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 05176120f..7e6683963 100644 --- a/gettext-tools/lib/ChangeLog +++ b/gettext-tools/lib/ChangeLog @@ -1,3 +1,12 @@ +2003-05-08 Bruno Haible + + * 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 . + 2003-05-22 Bruno Haible * gettext-0.12.1 released. diff --git a/gettext-tools/lib/Makefile.vms b/gettext-tools/lib/Makefile.vms index e5a54e342..6c8dd9cf8 100644 --- 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 d31600b9f..fbdca1211 100644 --- 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 64b5338fa..4e6c11e8c 100644 --- 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 05353b161..cf763ada9 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,17 @@ +2003-05-08 Bruno Haible + + * 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 . + 2003-05-27 Bruno Haible * plural-table.c (plural_table): Correct entry for Slovak. diff --git a/gettext-tools/src/Makefile.vms b/gettext-tools/src/Makefile.vms index 6c297c3a9..88500b962 100644 --- 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 7344f7351..eb805f2ec 100644 --- 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 , 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 2faa3001b..a38a7a095 100644 --- 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 index 000000000..d00624296 --- /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 index 000000000..4635de926 --- /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 index 000000000..e69de29bb