*** config.h.in.orig 2004-06-21 02:42:34.000000000 +0900 --- config.h.in 2005-01-11 19:06:30.685681988 +0900 *************** *** 523,528 **** --- 523,534 ---- /* italian */ #undef MESSAGES_IT + /* japanese */ + #undef MESSAGES_JP_EUC + + /* japanese_jis */ + #undef MESSAGES_JP_JIS + /* korean */ #undef MESSAGES_KR *** configure.ac.orig 2005-01-11 11:05:29.000000000 +0900 --- configure.ac 2005-01-11 17:07:43.724067495 +0900 *************** *** 759,767 **** french-funny | polish | spanish | danish | dutch | italian | brazilian-portuguese | slovak | korean | swedish | norwegian | russian | traditional-chinese | simplified-chinese | czech | turkish | hungarian | ! catalan>)], [ if test "x$withval" = "xenglish" ; then AC_DEFINE(MESSAGES_EN,,[english]) elif test "x$withval" = "xgerman" ; then AC_DEFINE(MESSAGES_DE,,[german]) elif test "x$withval" = "xromanian" ; then --- 759,771 ---- french-funny | polish | spanish | danish | dutch | italian | brazilian-portuguese | slovak | korean | swedish | norwegian | russian | traditional-chinese | simplified-chinese | czech | turkish | hungarian | ! catalan | japanese | japanese_jis>)], [ if test "x$withval" = "xenglish" ; then AC_DEFINE(MESSAGES_EN,,[english]) + elif test "x$withval" = "xjapanese" ; then + AC_DEFINE(MESSAGES_JP,,[japanese]) + elif test "x$withval" = "xjapanese_jis" ; then + AC_DEFINE(MESSAGES_JP_JIS,,[japanese_jis]) elif test "x$withval" = "xgerman" ; then AC_DEFINE(MESSAGES_DE,,[german]) elif test "x$withval" = "xromanian" ; then *** configure.orig 2004-06-21 02:41:54.000000000 +0900 --- configure 2005-01-11 19:14:36.666633745 +0900 *************** *** 915,921 **** italian | brazilian-portuguese | slovak | korean | swedish | norwegian | russian | traditional-chinese | simplified-chinese | czech | turkish | hungarian | ! catalan> --with-ldap Users database is an LDAP directory (see doc) --with-mysql Users database is a MySQL database (see doc) --with-pgsql Users database is a PostgreSQL database (see doc) --- 915,921 ---- italian | brazilian-portuguese | slovak | korean | swedish | norwegian | russian | traditional-chinese | simplified-chinese | czech | turkish | hungarian | ! catalan | japanese | japanese_jis> --with-ldap Users database is an LDAP directory (see doc) --with-mysql Users database is a MySQL database (see doc) --with-pgsql Users database is a PostgreSQL database (see doc) *************** *** 3045,3058 **** grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings ! # or remarks (even with -Werror). So we grep stderr for any message ! # that says an option was ignored or not supported. ! # When given -MP, icc 7.0 and 7.1 complain thusly: ! # icc: Command line warning: ignoring option '-M'; no argument required ! # The diagnosis changed in icc 8.0: ! # icc: Command line remark: option '-MP' not supported ! if (grep 'ignoring option' conftest.err || ! grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CC_dependencies_compiler_type=$depmode break fi --- 3045,3053 ---- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings ! # (even with -Werror). So we grep stderr for any message ! # that says an option was ignored. ! if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else am_cv_CC_dependencies_compiler_type=$depmode break fi *************** *** 13791,13796 **** --- 13786,13803 ---- #define MESSAGES_EN _ACEOF + elif test "x$withval" = "xjapanese" ; then + + cat >>confdefs.h <<\_ACEOF + #define MESSAGES_JP + _ACEOF + + elif test "x$withval" = "xjapanese_jis" ; then + + cat >>confdefs.h <<\_ACEOF + #define MESSAGES_JP_JIS + _ACEOF + elif test "x$withval" = "xgerman" ; then cat >>confdefs.h <<\_ACEOF *** src/Makefile.am.orig 2004-03-01 06:15:37.000000000 +0900 --- src/Makefile.am 2005-01-11 17:04:42.036107458 +0900 *************** *** 86,91 **** --- 86,93 ---- messages_tr.h \ messages_zh_cn.h \ messages_zh_tw.h \ + messages_ja_JP_EUC.h \ + messages_ja_JP_JIS.h \ ftpwho-update.c \ ftpwho-update.h \ ftpwho-update_p.h \ *** src/Makefile.in.orig 2005-01-11 11:09:51.000000000 +0900 --- src/Makefile.in 2005-01-11 19:01:05.822852879 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 336,341 **** --- 336,343 ---- messages_tr.h \ messages_zh_cn.h \ messages_zh_tw.h \ + messages_ja_JP_EUC.h \ + messages_ja_JP_JIS.h \ ftpwho-update.c \ ftpwho-update.h \ ftpwho-update_p.h \ *************** *** 1280,1290 **** done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ! test -n "$$unique" || unique=$$empty_fix; \ ! $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ! $$tags $$unique; \ ! fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) --- 1282,1290 ---- done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$tags$$unique" \ ! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ! $$tags $$unique ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) *** src/messages.h.orig 2004-03-01 06:49:28.000000000 +0900 --- src/messages.h 2005-01-11 19:15:04.250374561 +0900 *************** *** 5,10 **** --- 5,18 ---- # define MESSAGES_LOCALE "de_DE" # include "messages_de.h" + #elif defined(MESSAGES_JP) + # define MESSAGES_LOCALE "ja_JP" + # include "messages_ja_JP_EUC.h" + + #elif defined(MESSAGES_JP_JIS) + # define MESSAGES_LOCALE "ja_JP" + # include "messages_ja_JP_JIS.h" + #elif defined(MESSAGES_RO) # define MESSAGES_LOCALE "ro_RO" # include "messages_ro.h"