diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/ABOUT-NLS gtkali-0.9.5_jp/ABOUT-NLS *** gtkali-0.9.5/ABOUT-NLS Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/ABOUT-NLS Fri Jun 16 10:50:02 2000 *************** *** 0 **** --- 1,226 ---- + Notes on the Free Translation Project + ************************************* + + Free software is going international! The Free Translation Project + is a way to get maintainers of free software, translators, and users all + together, so that will gradually become able to speak many languages. + A few packages already provide translations for their messages. + + If you found this `ABOUT-NLS' file inside a distribution, you may + assume that the distributed package does use GNU `gettext' internally, + itself available at your nearest GNU archive site. But you do *not* + need to install GNU `gettext' prior to configuring, installing or using + this package with messages translated. + + Installers will find here some useful hints. These notes also + explain how users should proceed for getting the programs to use the + available translations. They tell how people wanting to contribute and + work at translations should contact the appropriate team. + + When reporting bugs in the `intl/' directory or bugs which may be + related to internationalization, you should tell about the version of + `gettext' which is used. The information can be found in the + `intl/VERSION' file, in internationalized packages. + + One advise in advance + ===================== + + If you want to exploit the full power of internationalization, you + should configure it using + + ./configure --with-included-gettext + + to force usage of internationalizing routines provided within this + package, despite the existence of internationalizing capabilities in the + operating system where this package is being installed. So far, only + the `gettext' implementation in the GNU C library version 2 provides as + many features (such as locale alias or message inheritance) as the + implementation here. It is also not possible to offer this additional + functionality on top of a `catgets' implementation. Future versions of + GNU `gettext' will very likely convey even more functionality. So it + might be a good idea to change to GNU `gettext' as soon as possible. + + So you need not provide this option if you are using GNU libc 2 or + you have installed a recent copy of the GNU gettext package with the + included `libintl'. + + INSTALL Matters + =============== + + Some packages are "localizable" when properly installed; the + programs they contain can be made to speak your own native language. + Most such packages use GNU `gettext'. Other packages have their own + ways to internationalization, predating GNU `gettext'. + + By default, this package will be installed to allow translation of + messages. It will automatically detect whether the system provides + usable `catgets' (if using this is selected by the installer) or + `gettext' functions. If neither is available, the GNU `gettext' own + library will be used. This library is wholly contained within this + package, usually in the `intl/' subdirectory, so prior installation of + the GNU `gettext' package is *not* required. Installers may use + special options at configuration time for changing the default + behaviour. The commands: + + ./configure --with-included-gettext + ./configure --with-catgets + ./configure --disable-nls + + will respectively bypass any pre-existing `catgets' or `gettext' to use + the internationalizing routines provided within this package, enable + the use of the `catgets' functions (if found on the locale system), or + else, *totally* disable translation of messages. + + When you already have GNU `gettext' installed on your system and run + configure without an option for your new package, `configure' will + probably detect the previously built and installed `libintl.a' file and + will decide to use this. This might be not what is desirable. You + should use the more recent version of the GNU `gettext' library. I.e. + if the file `intl/VERSION' shows that the library which comes with this + package is more recent, you should use + + ./configure --with-included-gettext + + to prevent auto-detection. + + By default the configuration process will not test for the `catgets' + function and therefore they will not be used. The reasons are already + given above: the emulation on top of `catgets' cannot provide all the + extensions provided by the GNU `gettext' library. If you nevertheless + want to use the `catgets' functions use + + ./configure --with-catgets + + to enable the test for `catgets' (this causes no harm if `catgets' is + not available on your system). If you really select this option we + would like to hear about the reasons because we cannot think of any + good one ourself. + + Internationalized packages have usually many `po/LL.po' files, where + LL gives an ISO 639 two-letter code identifying the language. Unless + translations have been forbidden at `configure' time by using the + `--disable-nls' switch, all available translations are installed + together with the package. However, the environment variable `LINGUAS' + may be set, prior to configuration, to limit the installed set. + `LINGUAS' should then contain a space separated list of two-letter + codes, stating which languages are allowed. + + Using This Package + ================== + + As a user, if your language has been installed for this package, you + only have to set the `LANG' environment variable to the appropriate + ISO 639 `LL' two-letter code prior to using the programs in the + package. For example, let's suppose that you speak German. At the + shell prompt, merely execute `setenv LANG de' (in `csh'), + `export LANG; LANG=de' (in `sh') or `export LANG=de' (in `bash'). This + can be done from your `.login' or `.profile' file, once and for all. + + An operating system might already offer message localization for + many of its programs, while other programs have been installed locally + with the full capabilities of GNU `gettext'. Just using `gettext' + extended syntax for `LANG' would break proper localization of already + available operating system programs. In this case, users should set + both `LANGUAGE' and `LANG' variables in their environment, as programs + using GNU `gettext' give preference to `LANGUAGE'. For example, some + Swedish users would rather read translations in German than English for + when Swedish is not available. This is easily accomplished by setting + `LANGUAGE' to `sv:de' while leaving `LANG' to `sv'. + + Translating Teams + ================= + + For the Free Translation Project to be a success, we need interested + people who like their own language and write it well, and who are also + able to synergize with other translators speaking the same language. + Each translation team has its own mailing list, courtesy of Linux + International. You may reach your translation team at the address + `LL@li.org', replacing LL by the two-letter ISO 639 code for your + language. Language codes are *not* the same as the country codes given + in ISO 3166. The following translation teams exist, as of December + 1997: + + Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en', + Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian + `hu', Irish `ga', Italian `it', Indonesian `id', Japanese `ja', + Korean `ko', Latin `la', Norwegian `no', Persian `fa', Polish + `pl', Portuguese `pt', Russian `ru', Slovenian `sl', Spanish `es', + Swedish `sv', and Turkish `tr'. + + For example, you may reach the Chinese translation team by writing to + `zh@li.org'. + + If you'd like to volunteer to *work* at translating messages, you + should become a member of the translating team for your own language. + The subscribing address is *not* the same as the list itself, it has + `-request' appended. For example, speakers of Swedish can send a + message to `sv-request@li.org', having this message body: + + subscribe + + Keep in mind that team members are expected to participate + *actively* in translations, or at solving translational difficulties, + rather than merely lurking around. If your team does not exist yet and + you want to start one, or if you are unsure about what to do or how to + get started, please write to `translation@iro.umontreal.ca' to reach the + coordinator for all translator teams. + + The English team is special. It works at improving and uniformizing + the terminology in use. Proven linguistic skill are praised more than + programming skill, here. + + Available Packages + ================== + + Languages are not equally supported in all packages. The following + matrix shows the current state of internationalization, as of December + 1997. The matrix shows, in regard of each package, for which languages + PO files have been submitted to translation coordination. + + Ready PO files cs da de en es fi fr it ja ko nl no pl pt ru sl sv + .----------------------------------------------------. + bash | [] [] [] | 3 + bison | [] [] [] | 3 + clisp | [] [] [] [] | 4 + cpio | [] [] [] [] [] [] | 6 + diffutils | [] [] [] [] [] | 5 + enscript | [] [] [] [] [] [] | 6 + fileutils | [] [] [] [] [] [] [] [] [] [] | 10 + findutils | [] [] [] [] [] [] [] [] [] | 9 + flex | [] [] [] [] | 4 + gcal | [] [] [] [] [] | 5 + gettext | [] [] [] [] [] [] [] [] [] [] [] | 12 + grep | [] [] [] [] [] [] [] [] [] [] | 10 + hello | [] [] [] [] [] [] [] [] [] [] [] | 11 + id-utils | [] [] [] | 3 + indent | [] [] [] [] [] | 5 + libc | [] [] [] [] [] [] [] | 7 + m4 | [] [] [] [] [] [] | 6 + make | [] [] [] [] [] [] | 6 + music | [] [] | 2 + ptx | [] [] [] [] [] [] [] [] | 8 + recode | [] [] [] [] [] [] [] [] [] | 9 + sh-utils | [] [] [] [] [] [] [] [] | 8 + sharutils | [] [] [] [] [] [] | 6 + tar | [] [] [] [] [] [] [] [] [] [] [] | 11 + texinfo | [] [] [] | 3 + textutils | [] [] [] [] [] [] [] [] [] | 9 + wdiff | [] [] [] [] [] [] [] [] | 8 + `----------------------------------------------------' + 17 languages cs da de en es fi fr it ja ko nl no pl pt ru sl sv + 27 packages 6 4 25 1 18 1 26 2 1 12 20 9 19 7 4 7 17 179 + + Some counters in the preceding matrix are higher than the number of + visible blocks let us expect. This is because a few extra PO files are + used for implementing regional variants of languages, or language + dialects. + + For a PO file in the matrix above to be effective, the package to + which it applies should also have been internationalized and + distributed as such by its maintainer. There might be an observable + lag between the mere existence a PO file and its wide availability in a + distribution. + + If December 1997 seems to be old, you may fetch a more recent copy + of this `ABOUT-NLS' file on most GNU archive sites. + diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/Makefile.am gtkali-0.9.5_jp/Makefile.am *** gtkali-0.9.5/Makefile.am Wed Sep 15 12:06:48 1999 --- gtkali-0.9.5_jp/Makefile.am Fri Jun 16 10:56:42 2000 *************** *** 4,10 **** CLEANFILES=*~ *.o .deps/* .*.swp .*.swo src/config.h ! SUBDIRS=src EXTRA_DIST = src/icon.xpm \ kalinix.lib \ --- 4,10 ---- CLEANFILES=*~ *.o .deps/* .*.swp .*.swo src/config.h ! SUBDIRS=intl po libjcode src EXTRA_DIST = src/icon.xpm \ kalinix.lib \ diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/Makefile.in gtkali-0.9.5_jp/Makefile.in *** gtkali-0.9.5/Makefile.in Thu Apr 13 12:22:20 2000 --- gtkali-0.9.5_jp/Makefile.in Fri Jun 16 22:03:43 2000 *************** *** 57,76 **** NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : CC = @CC@ GTKALI_VERSION = @GTKALI_VERSION@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ AUTOMAKE_OPTIONS = no-dependencies CLEANFILES = *~ *.o .deps/* .*.swp .*.swo src/config.h ! SUBDIRS = src EXTRA_DIST = src/icon.xpm kalinix.lib gtkali.1 --- 57,98 ---- NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ CC = @CC@ + DATADIRNAME = @DATADIRNAME@ + GENCAT = @GENCAT@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ GTKALI_VERSION = @GTKALI_VERSION@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ + GT_NO = @GT_NO@ + GT_YES = @GT_YES@ + INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ + INSTOBJEXT = @INSTOBJEXT@ + INTLDEPS = @INTLDEPS@ + INTLLIBS = @INTLLIBS@ + INTLOBJS = @INTLOBJS@ MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + RANLIB = @RANLIB@ + USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ + USE_NLS = @USE_NLS@ VERSION = @VERSION@ + l = @l@ + localedir = @localedir@ AUTOMAKE_OPTIONS = no-dependencies CLEANFILES = *~ *.o .deps/* .*.swp .*.swo src/config.h ! SUBDIRS = intl po libjcode src EXTRA_DIST = src/icon.xpm kalinix.lib gtkali.1 *************** *** 78,97 **** man_MANS = gtkali.1 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ./src/config.h CONFIG_CLEAN_FILES = man1dir = $(mandir)/man1 MANS = $(man_MANS) NROFF = nroff ! DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ ! Makefile.in NEWS aclocal.m4 configure configure.in install-sh missing \ ! mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: --- 100,119 ---- man_MANS = gtkali.1 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = man1dir = $(mandir)/man1 MANS = $(man_MANS) NROFF = nroff ! DIST_COMMON = README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \ ! INSTALL Makefile.am Makefile.in NEWS acconfig.h aclocal.m4 config.h.in \ ! configure configure.in install-sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: *************** *** 110,115 **** --- 132,165 ---- $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) + config.h: stamp-h + @if test ! -f $@; then \ + rm -f stamp-h; \ + $(MAKE) stamp-h; \ + else :; fi + stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES= CONFIG_HEADERS=config.h \ + $(SHELL) ./config.status + @echo timestamp > stamp-h 2> /dev/null + $(srcdir)/config.h.in: $(srcdir)/stamp-h.in + @if test ! -f $@; then \ + rm -f $(srcdir)/stamp-h.in; \ + $(MAKE) $(srcdir)/stamp-h.in; \ + else :; fi + $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h + cd $(top_srcdir) && $(AUTOHEADER) + @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null + + mostlyclean-hdr: + + clean-hdr: + + distclean-hdr: + -rm -f config.h + + maintainer-clean-hdr: + install-man1: $(mkinstalldirs) $(DESTDIR)$(man1dir) @list='$(man1_MANS)'; \ *************** *** 214,220 **** here=`pwd` && cd $(srcdir) \ && mkid -f$$here/ID $$unique $(LISP) ! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ --- 264,270 ---- here=`pwd` && cd $(srcdir) \ && mkid -f$$here/ID $$unique $(LISP) ! TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ *************** *** 226,233 **** unique=`for i in $$list; do echo $$i; done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: --- 276,283 ---- unique=`for i in $$list; do echo $$i; done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: *************** *** 251,257 **** mkdir $(distdir)/=inst dc_install_base=`cd $(distdir)/=inst && pwd`; \ cd $(distdir)/=build \ ! && ../configure --srcdir=.. --prefix=$$dc_install_base \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ --- 301,307 ---- mkdir $(distdir)/=inst dc_install_base=`cd $(distdir)/=inst && pwd`; \ cd $(distdir)/=build \ ! && ../configure --with-included-gettext --srcdir=.. --prefix=$$dc_install_base \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ *************** *** 305,310 **** --- 355,363 ---- check: check-recursive installcheck-am: installcheck: installcheck-recursive + all-recursive-am: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + install-exec-am: install-exec: install-exec-recursive *************** *** 316,323 **** install: install-recursive uninstall-am: uninstall-man uninstall: uninstall-recursive ! all-am: Makefile $(MANS) ! all-redirect: all-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive --- 369,376 ---- install: install-recursive uninstall-am: uninstall-man uninstall: uninstall-recursive ! all-am: Makefile $(MANS) config.h ! all-redirect: all-recursive-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive *************** *** 335,371 **** -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-recursive ! clean-am: clean-tags clean-generic mostlyclean-am clean: clean-recursive ! distclean-am: distclean-tags distclean-generic clean-am distclean: distclean-recursive -rm -f config.status ! maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ ! distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-recursive -rm -f config.status ! .PHONY: install-man1 uninstall-man1 install-man uninstall-man \ install-data-recursive uninstall-data-recursive install-exec-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ all-recursive check-recursive installcheck-recursive info-recursive \ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs-am \ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean --- 388,425 ---- -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-recursive ! clean-am: clean-hdr clean-tags clean-generic mostlyclean-am clean: clean-recursive ! distclean-am: distclean-hdr distclean-tags distclean-generic clean-am distclean: distclean-recursive -rm -f config.status ! maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ ! maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-recursive -rm -f config.status ! .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ ! install-man1 uninstall-man1 install-man uninstall-man \ install-data-recursive uninstall-data-recursive install-exec-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ all-recursive check-recursive installcheck-recursive info-recursive \ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ ! install-exec-am install-exec install-data-am install-data install-am \ ! install uninstall-am uninstall all-redirect all-am all installdirs-am \ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/acconfig.h gtkali-0.9.5_jp/acconfig.h *** gtkali-0.9.5/acconfig.h Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/acconfig.h Fri Jun 16 10:50:36 2000 *************** *** 0 **** --- 1,8 ---- + #undef ENABLE_NLS + #undef HAVE_CATGETS + #undef HAVE_GETTEXT + #undef HAVE_LC_MESSAGES + #undef HAVE_STPCPY + + #undef PACKAGE + #undef VERSION diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/aclocal.m4 gtkali-0.9.5_jp/aclocal.m4 *** gtkali-0.9.5/aclocal.m4 Mon Apr 10 14:53:44 2000 --- gtkali-0.9.5_jp/aclocal.m4 Fri Jun 16 22:03:42 2000 *************** *** 125,130 **** --- 125,514 ---- fi AC_SUBST($1)]) + # Macro to add for using GNU gettext. + # Ulrich Drepper , 1995. + # + # This file can be copied and used freely without restrictions. It can + # be used in projects which are not available under the GNU Public License + # but which still want to provide support for the GNU gettext functionality. + # Please note that the actual code is *not* freely available. + + # serial 5 + + AC_DEFUN(AM_WITH_NLS, + [AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) + + USE_INCLUDED_LIBINTL=no + + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + AC_DEFINE(ENABLE_NLS) + AC_MSG_CHECKING([whether included gettext is requested]) + AC_ARG_WITH(included-gettext, + [ --with-included-gettext use the GNU gettext library included here], + nls_cv_force_use_gnu_gettext=$withval, + nls_cv_force_use_gnu_gettext=no) + AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + dnl User does not insist on using GNU NLS library. Figure out what + dnl to use. If gettext or catgets are available (in this order) we + dnl use this. Else we have to fall back to GNU NLS library. + dnl catgets is only used if permitted by option --with-catgets. + nls_cv_header_intl= + nls_cv_header_libgt= + CATOBJEXT=NONE + + AC_CHECK_HEADER(libintl.h, + [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, + [AC_TRY_LINK([#include ], [return (int) gettext ("")], + gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) + + if test "$gt_cv_func_gettext_libc" != "yes"; then + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CACHE_CHECK([for gettext in libintl], + gt_cv_func_gettext_libintl, + [AC_CHECK_LIB(intl, gettext, + gt_cv_func_gettext_libintl=yes, + gt_cv_func_gettext_libintl=no)], + gt_cv_func_gettext_libintl=no)]) + fi + + if test "$gt_cv_func_gettext_libc" = "yes" \ + || test "$gt_cv_func_gettext_libintl" = "yes"; then + AC_DEFINE(HAVE_GETTEXT) + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + AC_CHECK_FUNCS(dcgettext) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + INSTOBJEXT=.mo + fi + fi + ]) + + if test "$CATOBJEXT" = "NONE"; then + AC_MSG_CHECKING([whether catgets can be used]) + AC_ARG_WITH(catgets, + [ --with-catgets use catgets functions if available], + nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) + AC_MSG_RESULT($nls_cv_use_catgets) + + if test "$nls_cv_use_catgets" = "yes"; then + dnl No gettext in C library. Try catgets next. + AC_CHECK_LIB(i, main) + AC_CHECK_FUNC(catgets, + [AC_DEFINE(HAVE_CATGETS) + INTLOBJS="\$(CATOBJS)" + AC_PATH_PROG(GENCAT, gencat, no)dnl + if test "$GENCAT" != "no"; then + AC_PATH_PROG(GMSGFMT, gmsgfmt, no) + if test "$GMSGFMT" = "no"; then + AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) + fi + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.cat + INSTOBJEXT=.cat + DATADIRNAME=lib + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi]) + fi + fi + + if test "$CATOBJEXT" = "NONE"; then + dnl Neither gettext nor catgets in included in the C library. + dnl Fall back on GNU gettext library. + nls_cv_use_gnu_gettext=yes + fi + fi + + if test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions used to generate GNU NLS library. + INTLOBJS="\$(GETTOBJS)" + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_SUBST(MSGFMT) + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo + INSTOBJEXT=.mo + DATADIRNAME=share + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi + + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is no GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi + + # We need to process the po/ directory. + POSUB=po + else + DATADIRNAME=share + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi + AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) + + + # If this is used in GNU gettext we have to set USE_NLS to `yes' + # because some of the sources are only built for this goal. + if test "$PACKAGE" = gettext; then + USE_NLS=yes + USE_INCLUDED_LIBINTL=yes + fi + + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.in. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done + + dnl Make all variables we use known to autoconf. + AC_SUBST(USE_INCLUDED_LIBINTL) + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLDEPS) + AC_SUBST(INTLLIBS) + AC_SUBST(INTLOBJS) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) + + AC_DEFUN(AM_GNU_GETTEXT, + [AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_PROG_RANLIB])dnl + AC_REQUIRE([AC_ISC_POSIX])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + AC_REQUIRE([AC_C_CONST])dnl + AC_REQUIRE([AC_C_INLINE])dnl + AC_REQUIRE([AC_TYPE_OFF_T])dnl + AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([AC_FUNC_ALLOCA])dnl + AC_REQUIRE([AC_FUNC_MMAP])dnl + + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ + unistd.h sys/param.h]) + AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ + strdup __argz_count __argz_stringify __argz_next]) + + if test "${ac_cv_func_stpcpy+set}" != "set"; then + AC_CHECK_FUNCS(stpcpy) + fi + if test "${ac_cv_func_stpcpy}" = "yes"; then + AC_DEFINE(HAVE_STPCPY) + fi + + AM_LC_MESSAGES + AM_WITH_NLS + + if test "x$CATOBJEXT" != "x"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for lang in ${LINGUAS=$ALL_LINGUAS}; do + case "$ALL_LINGUAS" in + *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; + esac + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi + + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi + + dnl The reference to in the installed file + dnl must be resolved because we cannot expect the users of this + dnl to define HAVE_LOCALE_H. + if test $ac_cv_header_locale_h = yes; then + INCLUDE_LOCALE_H="#include " + else + INCLUDE_LOCALE_H="\ + /* The system does not provide the header . Take care yourself. */" + fi + AC_SUBST(INCLUDE_LOCALE_H) + + dnl Determine which catalog format we have (if any is needed) + dnl For now we know about two different formats: + dnl Linux libc-5 and the normal X/Open format + test -d intl || mkdir intl + if test "$CATOBJEXT" = ".cat"; then + AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) + + dnl Transform the SED scripts while copying because some dumb SEDs + dnl cannot handle comments. + sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed + fi + dnl po2tbl.sed is always needed. + sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ + $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed + + dnl In the intl/Makefile.in we have a special dependency which makes + dnl only sense for gettext. We comment this out for non-gettext + dnl packages. + if test "$PACKAGE" = "gettext"; then + GT_NO="#NO#" + GT_YES= + else + GT_NO= + GT_YES="#YES#" + fi + AC_SUBST(GT_NO) + AC_SUBST(GT_YES) + + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) + + dnl *** For now the libtool support in intl/Makefile is not for real. + l= + AC_SUBST(l) + + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + ]) + + # Search path for a program which passes the given test. + # Ulrich Drepper , 1996. + # + # This file can be copied and used freely without restrictions. It can + # be used in projects which are not available under the GNU Public License + # but which still want to provide support for the GNU gettext functionality. + # Please note that the actual code is *not* freely available. + + # serial 1 + + dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, + dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) + AC_DEFUN(AM_PATH_PROG_WITH_TEST, + [# Extract the first word of "$2", so it can be a program name with args. + set dummy $2; ac_word=[$]2 + AC_MSG_CHECKING([for $ac_word]) + AC_CACHE_VAL(ac_cv_path_$1, + [case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" + dnl If no 4th arg is given, leave the cache variable unset, + dnl so AC_PATH_PROGS will keep looking. + ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" + ])dnl + ;; + esac])dnl + $1="$ac_cv_path_$1" + if test -n "[$]$1"; then + AC_MSG_RESULT([$]$1) + else + AC_MSG_RESULT(no) + fi + AC_SUBST($1)dnl + ]) + + # Check whether LC_MESSAGES is available in . + # Ulrich Drepper , 1995. + # + # This file can be copied and used freely without restrictions. It can + # be used in projects which are not available under the GNU Public License + # but which still want to provide support for the GNU gettext functionality. + # Please note that the actual code is *not* freely available. + + # serial 1 + + AC_DEFUN(AM_LC_MESSAGES, + [if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES) + fi + fi]) + # Configure paths for GTK+ # Owen Taylor 97-11-3 diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/autogen.sh gtkali-0.9.5_jp/autogen.sh *** gtkali-0.9.5/autogen.sh Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/autogen.sh Fri Jun 16 10:50:38 2000 *************** *** 0 **** --- 1,418 ---- + #!/bin/sh + # Shimaki Matsubara 1998/09/16 + # Last modified: 1999/08/06 + # + # autoconf/automake/gettext ¼«Æ°È½ÊÌ autogen.sh + # + # ¥Ð¥° + # 1¤Ä¤Î¥Ñ¥Ã¥±¡¼¥¸Æâ¤ËÊ£¿ô¤Î configure.in ¤¬´Þ¤Þ¤ì¤ë¤â¤Î¤Ë¤Ï + # Âбþ¤·¤Æ¤¤¤Þ¤»¤ó¡£ + # + # ¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Î gettext ÍѤΥѥ屡¼¥¸¤Ë¤ÏÂбþ¤·¤Æ¤¤¤Þ¤»¤ó¡£ + # gettext 0.10.35 °Ê¹ß¤¬Ë¾¤Þ¤·¤¤¤Ç¤¹¡£ + #============================================================ + # conf_flags ÊÑ¿ô + # configure ¥¹¥¯¥ê¥×¥È¤ËÅϤ·¤¿¤¤³«È¯ÍѤΥե饰¤ò»ØÄꤷ¤Þ¤¹¡£ + # Îã: + # --enable-maintainer-mode + # --enable-compile-warnings + # --enable-debug=yes + conf_flags= + + # configure.in ¤¬Ìµ¤±¤ì¤Ð»Ï¤Þ¤ê¤Þ¤»¤ó¡£ + (test -f configure.in) || + { + #echo "**Error**: You must write 'configure.in', first." + echo "**¥¨¥é¡¼**: ºÇ½é¤Ë 'configure.in' ¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£" + exit 1 + } + + FILE=`sed 's/^.*AC_INIT.*(\(.*\)).*$/\1/;t;d' configure.in` + PACKAGE=`sed 's/^.*PACKAGE=\(.*\)$/\1/;t;d' configure.in` + # gettext ¤ò»ÈÍѤ¹¤ë¤«È½Ê̤·¤Þ¤¹¡£ + ALL_LINGUAS=`sed 's/^.*ALL_LINGUAS="\?\([^"]*\)"\?$/\1/;t;d' configure.in` + # automake ¤ò»ÈÍѤ¹¤ë¤«È½Ê̤·¤Þ¤¹¡£ + (test -f Makefile.am) && { ENABLE_AUTOMAKE=yes; } + # aclocal ÍѤΠinclude ¥Ç¥£¥ì¥¯¥È¥ê¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¤«Ä´¤Ù¤Þ¤¹¡£ + MACRODIRS=`sed 's/^.*AM_ACLOCAL_INCLUDE(\(.*\)).*$/\1/;t;d' configure.in` + DIE=0 + + # AC_INIT ¤Ïɬ¿Ü¤Ç¤¹¡£ + (test -f $FILE) || + { + #echo "**Error**: You must run this script in the top-level '$PACKAGE' directory" + echo "**¥¨¥é¡¼**: '$PACKAGE' ¥È¥Ã¥×¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤³¤Î¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£" + exit 1 + } + + # automake ¤Ç¤Ï¡¢PACKAGE ̾¤Ïɬ¿Ü¤Ç¤¹¡£ + (test "$ENABLE_AUTOMAKE" = "yes") && (test -z "$PACKAGE") && + { + PACKAGE=`sed 's/^.*AM_INIT_AUTOMAKE.*(\([^,]*\),[^)]*).*$/\1/;t;d' configure.in` + (test -z "$PACKAGE") && + { + #echo "**Error**: You must set PACKAGE variable to your package name in configure.in" + echo "**¥¨¥é¡¼**: 'configure.in' Æâ¤Ë PACKAGE ÊÑ¿ô¤ò¤¢¤Ê¤¿¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ÇÄêµÁ¤·¤Æ¤¯¤À¤µ¤¤¡£ " + exit 1 + } + } + + + # autoconf ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«Ä´¤Ù¤Þ¤¹¡£ + (autoconf --version) < /dev/null > /dev/null 2>&1 || + { + #echo + #echo "**Error**: You must have autoconf installed to compile '$PACKAGE'." + #echo "Download the appropriate package for your distribution," + #echo "or get the source at ftp://ftp.gnu.org/pub/gnu/" + echo + echo "**¥¨¥é¡¼**: '$PACKAGE' ¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤¿¤á¤Ë¤Ï autoconf ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£" + echo " ¤¢¤Ê¤¿¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥óÍѤΠautoconf ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤«" + echo " ftp://ftp.gnu.org/pub/gnu/ ¤«¤é¥½¡¼¥¹¤òÆþ¼ê¡¢¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£" + echo " Îã: (Debian GNU/Linux ¥æ¡¼¥¶ÍÑ)" + echo " $ apt-get -fy install autoconf" + DIE=1 + } + # automake ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«Ä´¤Ù¤Þ¤¹¡£ + (test "$ENABLE_AUTOMAKE" = "yes") && + { + (automake --version) < /dev/null > /dev/null 2>&1 || + { + #echo + #echo "**Error**: You must have automake installed to compile '$PACKAGE'." + #echo "Download the appropriate package for your distribution," + #echo "or get the source at ftp://ftp.gnu.org/pub/gnu/" + echo + echo "**¥¨¥é¡¼**: '$PACKAGE' ¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤¿¤á¤Ë¤Ï automake ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£" + echo " ¤¢¤Ê¤¿¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥óÍѤΠautomake ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤«" + echo " ftp://ftp.gnu.org/pub/gnu/ ¤«¤é¥½¡¼¥¹¤òÆþ¼ê¡¢¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£" + echo " Îã: (Debian GNU/Linux ¥æ¡¼¥¶ÍÑ)" + echo " $ apt-get -fy install automake" + DIE=1 + } + } + # gettext ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«Ä´¤Ù¤Þ¤¹¡£ + (grep "^AM_GNU_GETTEXT" configure.in > /dev/null) && + { + (gettext --version) < /dev/null > /dev/null 2>&1 || + { + #echo + #echo "**Error**: You must have gettext installed to compile '$PACKAGE'." + #echo " Download the appropriate package for your distribution," + #echo " or get the source at ftp://ftp.gnu.org/pub/gnu/" + echo + echo "**¥¨¥é¡¼**: '$PACKAGE' ¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤¿¤á¤Ë¤Ï gettext ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£" + echo " ¤¢¤Ê¤¿¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥óÍѤΠgettext ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤«" + echo " ftp://ftp.gnu.org/pub/gnu/ ¤«¤é¥½¡¼¥¹¤òÆþ¼ê¡¢¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£" + echo " Îã: (Debian GNU/Linux ¥æ¡¼¥¶ÍÑ)" + echo " $ apt-get -fy install gettext" + DIE=1 + } + } + (grep "^AM_GNOME_GETTEXT" configure.in > /dev/null) && + { + (gettext --version) < /dev/null > /dev/null 2>&1 || + { + #echo + #echo "**Error**: You must have gettext installed to compile '$PACKAGE'." + #echo " Download the appropriate package for your distribution," + #echo " or get the source at ftp://ftp.gnu.org/pub/gnu/" + echo + echo "**¥¨¥é¡¼**: '$PACKAGE' ¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤¿¤á¤Ë¤Ï gettext ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£" + echo " ¤¢¤Ê¤¿¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥óÍѤΠgettext ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤«" + echo " ftp://ftp.gnu.org/pub/gnu/ ¤«¤é¥½¡¼¥¹¤òÆþ¼ê¡¢¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£" + echo " Îã: (Debian GNU/Linux ¥æ¡¼¥¶ÍÑ)" + echo " $ apt-get -fy install gettext" + DIE=1 + } + } + + # libtool ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«Ä´¤Ù¤Þ¤¹¡£ + (grep "^AM_PROG_LIBTOOL" configure.in > /dev/null) && + { + (libtool --version) < /dev/null > /dev/null 2>&1 || + { + #echo + #echo "**Error**: You must have libtool installed to compile '$PACKAGE'." + #echo "Download the appropriate package for your distribution," + #echo "or get the source at ftp://ftp.gnu.org/pub/gnu/" + echo + echo "**¥¨¥é¡¼**: '$PACKAGE' ¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤¿¤á¤Ë¤Ï libtool ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£" + echo " ¤¢¤Ê¤¿¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥óÍѤΠlibtool ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤«" + echo " ftp://ftp.gnu.org/pub/gnu/ ¤«¤é¥½¡¼¥¹¤òÆþ¼ê¡¢¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£" + echo " Îã: (Debian GNU/Linux ¥æ¡¼¥¶ÍÑ)" + echo " $ apt-get -fy install libtool" + DIE=1 + } + } + + (test "$DIE" -eq 1) && exit 1 + + (test -z "$*") && + { + #echo "**Warning**: I am going to run ./configure with no arguments." + #echo " if you wish to pass any to it, please specify them on the " + #echo " '$0' command line." + echo "**·Ù¹ð**: ./configure ¤ò°ú¿ô̵¤·¤Ç¼Â¹Ô¤·¤Þ¤¹¡£" + echo " ¤â¤·°ú¿ô¤ò»ØÄꤷ¤¿¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢" + echo " '$0' ¤Î°ú¿ô¤Ë»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£" + } + + #echo processing... + echo ½èÍýÃæ... + + # °Í¸´Ø·¸¤òµ­½Ò¤·¤¿¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¢¤ë¤È¤­¤Ïºï½ü¤¹¤ë¡£ + files=`find -name .deps` + #echo "Cleaning .deps/ directories ..." + echo "ºï½üÃæ... .deps/ ¥Ç¥£¥ì¥¯¥È¥ê ..." + for d in $files; do + echo -n " $d" + if test -d $d; then + if (rm -r $d); then + #echo "...removed...OK" + echo "...ºï½ü...´°Î»" + else + #echo "...failed to remove...Why..." + echo "...ºï½ü...¼ºÇÔ...¤Ê¤¼..." + fi + else + #echo "...not found...Why..." + echo "...¸«¼º¤¤¤Þ¤·¤¿...¤Ê¤¼..." + fi + done + + # automake ¤ËɬÍפʥե¡¥¤¥ë¤¬Ìµ¤¤¾ì¹ç¤Ï¤½¤ì¤ò automake ¤ØÅÁ¤¨¤ë¡£ + # + # NEWS README AUTHORS ChangeLog ¤Î¤É¤ì¤â¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¤Ï¡¢ + # --foreign ¤ò automake ¤ØÅϤ¹¡£ + # + requires="NEWS README AUTHORS ChangeLog" + #echo -n "Checking document files ..." + echo -n "³ÎǧÃæ... ¥É¥­¥å¥á¥ó¥È¥Õ¥¡¥¤¥ë ..." + req_flag=0 + for f in $requires; do + test -f $f && test -s $f && req_flag=1 + done + + if test "$req_flag" -eq 1 ; then + echo "" + for f in $requires; do + if test ! -f $f; then + #echo "Creating $f..." + echo "ºîÀ®Ãæ... $f..." + touch $f + elif test ! -s $f; then + #echo "Checking $f ...empty...should be written...OK?" + echo "³ÎǧÃæ... $f... ¶õ¤Ç¤¹¡£É¬¤ºÃæ¿È¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤" + else + #echo "Checking $f ...OK" + echo "³ÎǧÃæ... $f...´°Î»" + fi + done + else + #echo " skiped" + echo " ½èÍý¤òÈô¤Ð¤·¤Þ¤¹" + automake_flags="--foreign" + fi + + # gettext ÍѤγÈÄ¥Éôʬ + # ɬÍ×¤Ê .po ¥Õ¥¡¥¤¥ë¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£ + # po/POTFILES.in ¤¬¸«¤Ä¤«¤é¤Ê¤±¤ì¤Ð¥µ¥ó¥×¥ë¤òºîÀ®¤·¤Þ¤¹¡£ + (test -n "$ALL_LINGUAS") && + { + ((test -d po) && (test -d intl)) || + { + (test -r aclocal.m4) || + { + #echo "Creating aclocal.m4 ..." + echo "ºîÀ®Ãæ... aclocal.m4 ..." + touch aclocal.m4 + } + #echo "Running gettextize..." + echo "¼Â¹ÔÃæ... gettextize..." + echo "no" | gettextize --force --copy + (test -r aclocal.m4) && chmod u+w aclocal.m4 + } + + #echo "Checking po files ..." + echo "³ÎǧÃæ... po ¥Õ¥¡¥¤¥ë ..." + for l in $ALL_LINGUAS; do + po=po/$l.po + if test ! -f $po; then + #echo "Creating $po ..." + echo "ºîÀ®Ãæ... $po ..." + touch $po + else + #echo "Checking $po ...OK" + echo "³ÎǧÃæ... $po ...´°Î»" + fi + done + + # po/POTFILES.in ¤Î¥µ¥ó¥×¥ë¤òºîÀ®¤·¤Þ¤¹¡£ + (test ! -f po/POTFILES.in) && + { + rm -f po/POTFILES.in.example + # ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤é¤·¤­¡¢*.c ¥Õ¥¡¥¤¥ë¤òÁ´¤ÆÎóµó¤·¤Þ¤¹¡£ + # intl/, po/ ¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¥½¡¼¥¹¤Ï½üµî¤·¤Þ¤¹¡£ + src=`find -type f -name '*.c' | sed '/\/intl\//d; /\/po\//d'` + # ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÎÃ椫¤é "_(" ¤ò¸¡º÷¤·¤Þ¤¹¡£ + # ¤³¤Îʸ»úÎ󤬤¢¤ì¤Ð... + for f in $src; do + (grep \_\( $f > /dev/null 2>&1) && echo $f >> po/POTFILES.in.example + done + # po/POTFILES.in.example ¤¬ºîÀ®¤µ¤ì¤Ê¤«¤Ã¤¿¤È¤­¤Ï¡¢ + # ¶õ¤Î¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹¡£ + if test ! -f po/POTFILES.in.example; then + touch po/POTFILES.in.example + fi + cp po/POTFILES.in.example po/POTFILES.in + #echo "**Warning**: po/POTFILES.in was generated automaticaly." + echo "**·Ù¹ð**: po/POTFILES.in ¤ò¼«Æ°Åª¤ËºîÀ®¤·¤Þ¤·¤¿¡£" + } + } + + # /usr/share/aclocal ¤È /usr/local/share/aclocal ¤¬Â¸ºß¤¹¤ë¤È¤­¤Ï¡¢ + # ¾å¼ê¤Ë¤Ä¤¸¤Ä¤Þ¤ò¤¢¤ï¤»¤Þ¤¹¡£ + (test "$ENABLE_AUTOMAKE" = "yes") && + (test -d /usr/share/aclocal) && + (test -d /usr/local/share/aclocal) && + { + # ¥Ç¥£¥ì¥¯¥È¥ê̾¤Ï¤³¤³¤Ç»ØÄꤷ¤Æ¤¤¤Þ¤¹¡£ + macros=m4 + + # aclocal ¤Î path ¤òÄ´¤Ù¡¢.m4 ¤ò¤É¤³¤«¤éÆɤफĴ¤Ù¤Þ¤¹¡£ + if test -f /usr/local/bin/aclocal; then + acl_path1=/usr/local/share/aclocal + acl_path2=/usr/share/aclocal + elif test -f /usr/bin/aclocal; then + acl_path1=/usr/share/aclocal + acl_path2=/usr/local/share/aclocal + fi + + (test -n "$acl_path1") && + { + # ¾Êý¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤·¤«¤Ê¤¤ .m4 ¤ÏÆɤߤ³¤Þ¤ì¤Ê¤¤¤Î¤Ç¡¢ + # $macros/ ¤òºîÀ®¤·¡¢¤½¤³¤Ø¥³¥Ô¡¼¤·¤Þ¤¹¡£ + echo "" + + MACRODIRS="$MACRODIRS $macros" + pwd=`pwd` + cd $acl_path2 + files=`find -type f -name '*.m4'` + # aclocal ¤¬¥Á¥§¥Ã¥¯¤·¤Ê¤¤ .m4 ¤òÆɤߤ³¤à¤è¤¦¤Ë¤·¤Þ¤¹¡£ + for f in $files; do + # Ʊ¤¸¥Õ¥¡¥¤¥ë̾¤¬ $acl_path1 ¤Ë¤¢¤ì¤Ð¡¢¤½¤ì¤Ï¾×Æͤ¹¤ë¤Î¤Ç + # Èô¤Ð¤·¤Þ¤¹¡£ + ff=$acl_path1/$f + if test ! -f $ff; then + # $f ¤Ï¡¢aclocal ¤¬Æɤߤ³¤Þ¤ì¤Ê¤¤ .m4 ¤Ç¤¹¡£ + # ¥æ¡¼¥¶¤¬»ØÄꤹ¤ë $MACRODIRS ¤ÎÃæ¤Ë¤¢¤ë¤«¤É¤¦¤«Ä´¤Ù¤Þ¤¹¡£ + FLAG=0 + for d in $MACRODIRS; do + if test -f $pwd/$d/`basename $f`; then + FLAG=1 + break + fi + done + if test $FLAG -eq 0; then + # $MACRODIRS ¤ÎÃæ¤Ë¤â¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¤Î¤Ç¥³¥Ô¡¼¤·¤Þ¤¹¡£ + mkdir $pwd/$macros > /dev/null 2>&1 + cp $f $pwd/$macros + #echo " " `basename $f` " ... imported from $acl_path2" + echo " " `basename $f` " ... $acl_path2 ¤«¤é¼è¤ê¹þ¤ß¤Þ¤·¤¿" + else + #echo " " `basename $f` " ... already imported" + echo " " `basename $f` " ... ´û¤Ë¼è¤ê¹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹" + fi + fi + done + cd $pwd + } + } + + if grep "^AM_PROG_LIBTOOL" configure.in > /dev/null; then + #echo "Running libtoolize..." + echo "¼Â¹ÔÃæ... libtoolize..." + libtoolize --force --copy + fi + + # ¤³¤³¤«¤éÀè¡¢configure script ¤Þ¤Ç¤Ï¡¢ + # ¥³¥Þ¥ó¥É¤¬1¤Ä¤Ç¤â¼ºÇÔ¤·¤¿¤é»ß¤Þ¤ê¤Þ¤¹¡£ + # + # acinclude.m4 ¤òÆɤ߹þ¤ß¡¢aclocal.m4 ¤òºîÀ®¤¹¤ë¡£ + if test "$ENABLE_AUTOMAKE" = "yes"; then + # aclocal ¤Ë°ú¿ô¤ò»ØÄꤷ¤ÆÆɤߤ³¤Þ¤»¤Þ¤¹¡£ + for d in $MACRODIRS; do + if test -d $d; then + aclocal_include="$aclocal_include -I $d" + fi + done + + # GNOME_INIT ¤¬¤¢¤ë¤È¤­¤Ï¡¢gnome ÍѤΠm4 ¤òÆɤߤ³¤à + (grep "^GNOME_INIT" configure.in > /dev/null) && + { + (echo $ACLOCAL_FLAGS | grep "gnome" > /dev/null) || + (echo $aclocal_include | grep "gnome" > /dev/null) || + aclocal_include="$aclocal_include -I $acl_path1/gnome" + } + + #echo "Running aclocal $ACLOCAL_FLAGS $aclocal_include..." && + echo "¼Â¹ÔÃæ... aclocal $ACLOCAL_FLAGS $aclocal_include..." && + aclocal $ACLOCAL_FLAGS $aclocal_include + fi && + # configure.in ¤òÆɤ߹þ¤ß¡¢configure ¤òºîÀ®¤¹¤ë¡£ + #echo "Running autoconf..." && + echo "¼Â¹ÔÃæ... autoconf..." && + autoconf && + # acconfig.h ¤òÆɤ߹þ¤ß¡¢config.h.in ¤òºîÀ®¤¹¤ë¡£ + if grep "^AM_CONFIG_HEADER" configure.in > /dev/null; then + #echo "Running autoheader..." && + echo "¼Â¹ÔÃæ... autoheader..." && + autoheader + fi && + # Makefile.am ¤òÆɤ߹þ¤ß¡¢Makefile.in ¤òºîÀ®¤¹¤ë¡£ + if test "$ENABLE_AUTOMAKE" = "yes"; then + #echo "Running automake --add-missing $automake_flags..." && + echo "¼Â¹ÔÃæ... automake --add-missing $automake_flags..." && + automake --add-missing $automake_flags + fi && + # configure ¤Î¼Â¹Ô¡£autogen.sh ¥¹¥¯¥ê¥×¥È¤Î°ú¿ô¤¬¤½¤Î¤Þ¤ÞÅϤµ¤ì¤ë¡£ + # config.cache ¤¬¤¢¤ë¤È¤­¤Ïºï½ü¤¹¤ë¡£ + rm -f config.cache && + #echo "Running configure $conf_flags $@..." && + echo "¼Â¹ÔÃæ... configure $conf_flags $@..." && + ./configure $conf_flags "$@" && + + echo && + #echo "Now type 'make' to compile '$PACKAGE'." && + echo "¤µ¤¢¡¢'$PACKAGE' ¤ò³Ú¤·¤à¤¿¤á¤Ë 'make' ¤ò¼Â¹Ô¤·¤è¤¦¡£" && + + # gettext ÍѤγÈÄ¥Éôʬ + (test -f po/POTFILES.in.example) && + { + #echo + #echo "**Warning**: 'po/POTFILES.in' is probably generated by autogen.sh." + #echo "If it is correct, You must check 'po/POTFILES.in'." + echo + echo "**·Ù¹ð**: 'po/POTFILES.in' ¤Ï¤ª¤½¤é¤¯ '$0' ¤Ë¤è¤Ã¤Æ" + echo " ¼«Æ°Åª¤ËºîÀ®¤µ¤ì¤Þ¤·¤¿¡£" + echo " ɬ¤º 'po/POTFILES.in' ¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£" + } + + (test -f po/$PACKAGE.pot) && + { + echo + for l in $ALL_LINGUAS; do + po=po/$l.po + if test ! -s $po; then + #echo "**·Ù¹ð**: '$po' is empty. You have to edit this file from '$PACKAGE.pot'." + echo "**·Ù¹ð**: '$po' ¤¬¶õ¤Ç¤¹¡£" + echo " $PACKAGE.pot' ¤«¤éºîÀ®¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£" + fi + done + } + + exit 0 + + #------------------------------------------------------------ + # diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/config.h.in gtkali-0.9.5_jp/config.h.in *** gtkali-0.9.5/config.h.in Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/config.h.in Fri Jun 16 11:00:35 2000 *************** *** 0 **** --- 1,132 ---- + /* config.h.in. Generated automatically from configure.in by autoheader. */ + + /* Define if using alloca.c. */ + #undef C_ALLOCA + + /* Define to empty if the keyword does not work. */ + #undef const + + /* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. + This function is required for alloca.c support on those systems. */ + #undef CRAY_STACKSEG_END + + /* Define if you have alloca, as a function or macro. */ + #undef HAVE_ALLOCA + + /* Define if you have and it should be used (not on Ultrix). */ + #undef HAVE_ALLOCA_H + + /* Define if you have a working `mmap' system call. */ + #undef HAVE_MMAP + + /* Define as __inline if that's what the C compiler calls it. */ + #undef inline + + /* Define to `long' if doesn't define. */ + #undef off_t + + /* Define to `int' if doesn't define. */ + #undef pid_t + + /* Define if you need to in order for stat and other things to work. */ + #undef _POSIX_SOURCE + + /* Define to `unsigned' if doesn't define. */ + #undef size_t + + /* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown + */ + #undef STACK_DIRECTION + + /* Define if you have the ANSI C header files. */ + #undef STDC_HEADERS + + #undef ENABLE_NLS + #undef HAVE_CATGETS + #undef HAVE_GETTEXT + #undef HAVE_LC_MESSAGES + #undef HAVE_STPCPY + + /* Define if you have the __argz_count function. */ + #undef HAVE___ARGZ_COUNT + + /* Define if you have the __argz_next function. */ + #undef HAVE___ARGZ_NEXT + + /* Define if you have the __argz_stringify function. */ + #undef HAVE___ARGZ_STRINGIFY + + /* Define if you have the dcgettext function. */ + #undef HAVE_DCGETTEXT + + /* Define if you have the getcwd function. */ + #undef HAVE_GETCWD + + /* Define if you have the getpagesize function. */ + #undef HAVE_GETPAGESIZE + + /* Define if you have the munmap function. */ + #undef HAVE_MUNMAP + + /* Define if you have the putenv function. */ + #undef HAVE_PUTENV + + /* Define if you have the setenv function. */ + #undef HAVE_SETENV + + /* Define if you have the setlocale function. */ + #undef HAVE_SETLOCALE + + /* Define if you have the stpcpy function. */ + #undef HAVE_STPCPY + + /* Define if you have the strcasecmp function. */ + #undef HAVE_STRCASECMP + + /* Define if you have the strchr function. */ + #undef HAVE_STRCHR + + /* Define if you have the strdup function. */ + #undef HAVE_STRDUP + + /* Define if you have the header file. */ + #undef HAVE_ARGZ_H + + /* Define if you have the header file. */ + #undef HAVE_LIMITS_H + + /* Define if you have the header file. */ + #undef HAVE_LOCALE_H + + /* Define if you have the header file. */ + #undef HAVE_MALLOC_H + + /* Define if you have the header file. */ + #undef HAVE_NL_TYPES_H + + /* Define if you have the header file. */ + #undef HAVE_STRING_H + + /* Define if you have the header file. */ + #undef HAVE_SYS_PARAM_H + + /* Define if you have the header file. */ + #undef HAVE_UNISTD_H + + /* Define if you have the i library (-li). */ + #undef HAVE_LIBI + + /* Define if you have the intl library (-lintl). */ + #undef HAVE_LIBINTL + + /* Name of package */ + #undef PACKAGE + + /* Version number of package */ + #undef VERSION + diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/configure gtkali-0.9.5_jp/configure *** gtkali-0.9.5/configure Thu Apr 13 12:22:18 2000 --- gtkali-0.9.5_jp/configure Fri Jun 16 22:03:42 2000 *************** *** 13,18 **** --- 13,24 ---- # Any additions from configure.in: ac_default_prefix=/usr/local ac_help="$ac_help + --disable-nls do not use Native Language Support" + ac_help="$ac_help + --with-included-gettext use the GNU gettext library included here" + ac_help="$ac_help + --with-catgets use catgets functions if available" + ac_help="$ac_help --with-gtk-prefix=PFX Prefix where GTK is installed (optional)" ac_help="$ac_help --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)" *************** *** 572,578 **** # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 ! echo "configure:576: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 578,584 ---- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 ! echo "configure:582: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 625,631 **** test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 ! echo "configure:629: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile --- 631,637 ---- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 ! echo "configure:635: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile *************** *** 682,688 **** test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 ! echo "configure:686: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 688,694 ---- test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 ! echo "configure:692: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 728,734 **** missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 ! echo "configure:732: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. --- 734,740 ---- missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 ! echo "configure:738: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. *************** *** 741,747 **** fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 ! echo "configure:745: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. --- 747,753 ---- fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 ! echo "configure:751: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. *************** *** 754,760 **** fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 ! echo "configure:758: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. --- 760,766 ---- fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 ! echo "configure:764: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. *************** *** 767,773 **** fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 ! echo "configure:771: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. --- 773,779 ---- fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 ! echo "configure:777: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. *************** *** 780,786 **** fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 ! echo "configure:784: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. --- 786,792 ---- fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 ! echo "configure:790: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. *************** *** 799,805 **** # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:803: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 805,811 ---- # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:809: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 829,835 **** # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:833: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 835,841 ---- # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:839: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 880,886 **** # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:884: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 886,892 ---- # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:890: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 912,918 **** fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:916: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. --- 918,924 ---- fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:922: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. *************** *** 923,934 **** cat > conftest.$ac_ext << EOF ! #line 927 "configure" #include "confdefs.h" main(){return(0);} EOF ! if { (eval echo configure:932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then --- 929,940 ---- cat > conftest.$ac_ext << EOF ! #line 933 "configure" #include "confdefs.h" main(){return(0);} EOF ! if { (eval echo configure:938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then *************** *** 954,965 **** { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:958: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ! echo "configure:963: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 960,971 ---- { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:964: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ! echo "configure:969: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 968,974 **** yes; #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no --- 974,980 ---- yes; #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no *************** *** 987,993 **** ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ! echo "configure:991: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 993,999 ---- ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ! echo "configure:997: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1020,1026 **** echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 ! echo "configure:1024: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile --- 1026,1032 ---- echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 ! echo "configure:1030: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile *************** *** 1058,1192 **** rm -f conftest* echo "$ac_t""yes" 1>&6 ! # Check whether --with-gtk-prefix or --without-gtk-prefix was given. ! if test "${with_gtk_prefix+set}" = set; then ! withval="$with_gtk_prefix" ! gtk_config_prefix="$withval" ! else ! gtk_config_prefix="" fi ! ! # Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given. ! if test "${with_gtk_exec_prefix+set}" = set; then ! withval="$with_gtk_exec_prefix" ! gtk_config_exec_prefix="$withval" else ! gtk_config_exec_prefix="" ! fi ! ! # Check whether --enable-gtktest or --disable-gtktest was given. ! if test "${enable_gtktest+set}" = set; then ! enableval="$enable_gtktest" : else ! enable_gtktest=yes fi ! ! for module in . ! do ! case "$module" in ! gthread) ! gtk_config_args="$gtk_config_args gthread" ! ;; ! esac ! done ! ! if test x$gtk_config_exec_prefix != x ; then ! gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" ! if test x${GTK_CONFIG+set} != xset ; then ! GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config ! fi ! fi ! if test x$gtk_config_prefix != x ; then ! gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" ! if test x${GTK_CONFIG+set} != xset ; then ! GTK_CONFIG=$gtk_config_prefix/bin/gtk-config ! fi ! fi ! ! # Extract the first word of "gtk-config", so it can be a program name with args. ! set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1112: checking for $ac_word" >&5 ! if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ! case "$GTK_CONFIG" in ! /*) ! ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. ! ;; ! ?:/*) ! ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a dos path. ! ;; ! *) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ! ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word" break fi done IFS="$ac_save_ifs" ! test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" ! ;; ! esac fi ! GTK_CONFIG="$ac_cv_path_GTK_CONFIG" ! if test -n "$GTK_CONFIG"; then ! echo "$ac_t""$GTK_CONFIG" 1>&6 else echo "$ac_t""no" 1>&6 fi ! min_gtk_version=1.2.0 ! echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 ! echo "configure:1147: checking for GTK - version >= $min_gtk_version" >&5 ! no_gtk="" ! if test "$GTK_CONFIG" = "no" ; then ! no_gtk=yes else ! GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` ! GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` ! gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ ! sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` ! gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ ! sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` ! gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ ! sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` ! if test "x$enable_gtktest" = "xyes" ; then ! ac_save_CFLAGS="$CFLAGS" ! ac_save_LIBS="$LIBS" ! CFLAGS="$CFLAGS $GTK_CFLAGS" ! LIBS="$GTK_LIBS $LIBS" ! rm -f conf.gtktest ! if test "$cross_compiling" = yes; then ! echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < ! #include #include ! int ! main () ! { ! int major, minor, micro; ! char *tmp_version; ! system ("touch conf.gtktest"); ! /* HP/UX 9 (%@#!) writes to sscanf strings */ ! tmp_version = g_strdup("$min_gtk_version"); ! if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ! printf("%s, bad version string\n", "$min_gtk_version"); ! exit(1); ! } if ((gtk_major_version != $gtk_config_major_version) || (gtk_minor_version != $gtk_config_minor_version) || --- 1064,3345 ---- rm -f conftest* echo "$ac_t""yes" 1>&6 ! ALL_LINGUAS="ja" ! echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ! echo "configure:1070: checking how to run the C preprocessor" >&5 ! # On Suns, sometimes $CPP names a directory. ! if test -n "$CPP" && test -d "$CPP"; then ! CPP= fi ! if test -z "$CPP"; then ! if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 else ! # This must be in double quotes, not single quotes, because CPP may get ! # substituted into the Makefile and "${CC-cc}" will confuse make. ! CPP="${CC-cc} -E" ! # On the NeXT, cc -E runs the code through the compiler's parser, ! # not just through cpp. ! cat > conftest.$ac_ext < ! Syntax Error ! EOF ! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ! if test -z "$ac_err"; then : else ! echo "$ac_err" >&5 ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! CPP="${CC-cc} -E -traditional-cpp" ! cat > conftest.$ac_ext < ! Syntax Error ! EOF ! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ! if test -z "$ac_err"; then ! : ! else ! echo "$ac_err" >&5 ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! CPP="${CC-cc} -nologo -E" ! cat > conftest.$ac_ext < ! Syntax Error ! EOF ! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ! if test -z "$ac_err"; then ! : ! else ! echo "$ac_err" >&5 ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! CPP=/lib/cpp fi + rm -f conftest* + fi + rm -f conftest* + fi + rm -f conftest* + ac_cv_prog_CPP="$CPP" + fi + CPP="$ac_cv_prog_CPP" + else + ac_cv_prog_CPP="$CPP" + fi + echo "$ac_t""$CPP" 1>&6 ! # Extract the first word of "ranlib", so it can be a program name with args. ! set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1152: checking for $ac_word" >&5 ! if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ! if test -n "$RANLIB"; then ! ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. ! else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ! ac_cv_prog_RANLIB="ranlib" break fi done IFS="$ac_save_ifs" ! test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" fi ! fi ! RANLIB="$ac_cv_prog_RANLIB" ! if test -n "$RANLIB"; then ! echo "$ac_t""$RANLIB" 1>&6 else echo "$ac_t""no" 1>&6 fi ! echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 ! echo "configure:1180: checking for POSIXized ISC" >&5 ! if test -d /etc/conf/kconfig.d && ! grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 ! then ! echo "$ac_t""yes" 1>&6 ! ISC=yes # If later tests want to check for ISC. ! cat >> confdefs.h <<\EOF ! #define _POSIX_SOURCE 1 ! EOF ! ! if test "$GCC" = yes; then ! CC="$CC -posix" else ! CC="$CC -Xp" ! fi ! else ! echo "$ac_t""no" 1>&6 ! ISC= ! fi ! ! echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ! echo "configure:1201: checking for ANSI C header files" >&5 ! if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < + #include + #include + #include + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" + { (eval echo configure:1214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* + ac_cv_header_stdc=yes + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_header_stdc=no + fi + rm -f conftest* ! if test $ac_cv_header_stdc = yes; then ! # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ! cat > conftest.$ac_ext < ! EOF ! if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "memchr" >/dev/null 2>&1; then ! : ! else ! rm -rf conftest* ! ac_cv_header_stdc=no ! fi ! rm -f conftest* ! ! fi ! ! if test $ac_cv_header_stdc = yes; then ! # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. ! cat > conftest.$ac_ext < + EOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "free" >/dev/null 2>&1; then + : + else + rm -rf conftest* + ac_cv_header_stdc=no + fi + rm -f conftest* ! fi ! if test $ac_cv_header_stdc = yes; then ! # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. ! if test "$cross_compiling" = yes; then ! : ! else ! cat > conftest.$ac_ext < ! #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ! #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) ! #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) ! int main () { int i; for (i = 0; i < 256; i++) ! if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); ! exit (0); } ! EOF ! if { (eval echo configure:1281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ! then ! : ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -fr conftest* ! ac_cv_header_stdc=no ! fi ! rm -fr conftest* ! fi ! ! fi ! fi ! ! echo "$ac_t""$ac_cv_header_stdc" 1>&6 ! if test $ac_cv_header_stdc = yes; then ! cat >> confdefs.h <<\EOF ! #define STDC_HEADERS 1 ! EOF ! ! fi ! ! echo $ac_n "checking for working const""... $ac_c" 1>&6 ! echo "configure:1305: checking for working const" >&5 ! if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! cat > conftest.$ac_ext <j = 5; ! } ! { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ ! const int foo = 10; ! } ! ! ; return 0; } ! EOF ! if { (eval echo configure:1359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ! rm -rf conftest* ! ac_cv_c_const=yes ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! ac_cv_c_const=no ! fi ! rm -f conftest* ! fi ! ! echo "$ac_t""$ac_cv_c_const" 1>&6 ! if test $ac_cv_c_const = no; then ! cat >> confdefs.h <<\EOF ! #define const ! EOF ! ! fi ! ! echo $ac_n "checking for inline""... $ac_c" 1>&6 ! echo "configure:1380: checking for inline" >&5 ! if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! ac_cv_c_inline=no ! for ac_kw in inline __inline__ __inline; do ! cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ! rm -rf conftest* ! ac_cv_c_inline=$ac_kw; break ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! fi ! rm -f conftest* ! done ! ! fi ! ! echo "$ac_t""$ac_cv_c_inline" 1>&6 ! case "$ac_cv_c_inline" in ! inline | yes) ;; ! no) cat >> confdefs.h <<\EOF ! #define inline ! EOF ! ;; ! *) cat >> confdefs.h <&6 ! echo "configure:1420: checking for off_t" >&5 ! if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! cat > conftest.$ac_ext < ! #if STDC_HEADERS ! #include ! #include ! #endif ! EOF ! if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then ! rm -rf conftest* ! ac_cv_type_off_t=yes ! else ! rm -rf conftest* ! ac_cv_type_off_t=no ! fi ! rm -f conftest* ! ! fi ! echo "$ac_t""$ac_cv_type_off_t" 1>&6 ! if test $ac_cv_type_off_t = no; then ! cat >> confdefs.h <<\EOF ! #define off_t long ! EOF ! ! fi ! ! echo $ac_n "checking for size_t""... $ac_c" 1>&6 ! echo "configure:1453: checking for size_t" >&5 ! if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! cat > conftest.$ac_ext < ! #if STDC_HEADERS ! #include ! #include ! #endif ! EOF ! if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then ! rm -rf conftest* ! ac_cv_type_size_t=yes ! else ! rm -rf conftest* ! ac_cv_type_size_t=no ! fi ! rm -f conftest* ! ! fi ! echo "$ac_t""$ac_cv_type_size_t" 1>&6 ! if test $ac_cv_type_size_t = no; then ! cat >> confdefs.h <<\EOF ! #define size_t unsigned ! EOF ! ! fi ! ! # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works ! # for constant arguments. Useless! ! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 ! echo "configure:1488: checking for working alloca.h" >&5 ! if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! cat > conftest.$ac_ext < ! int main() { ! char *p = alloca(2 * sizeof(int)); ! ; return 0; } ! EOF ! if { (eval echo configure:1500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ! rm -rf conftest* ! ac_cv_header_alloca_h=yes ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! ac_cv_header_alloca_h=no ! fi ! rm -f conftest* ! fi ! ! echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 ! if test $ac_cv_header_alloca_h = yes; then ! cat >> confdefs.h <<\EOF ! #define HAVE_ALLOCA_H 1 ! EOF ! ! fi ! ! echo $ac_n "checking for alloca""... $ac_c" 1>&6 ! echo "configure:1521: checking for alloca" >&5 ! if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! cat > conftest.$ac_ext < ! # define alloca _alloca ! # else ! # if HAVE_ALLOCA_H ! # include ! # else ! # ifdef _AIX ! #pragma alloca ! # else ! # ifndef alloca /* predefined by HP cc +Olibcalls */ ! char *alloca (); ! # endif ! # endif ! # endif ! # endif ! #endif ! ! int main() { ! char *p = (char *) alloca(1); ! ; return 0; } ! EOF ! if { (eval echo configure:1554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ! rm -rf conftest* ! ac_cv_func_alloca_works=yes ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! ac_cv_func_alloca_works=no ! fi ! rm -f conftest* ! fi ! ! echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 ! if test $ac_cv_func_alloca_works = yes; then ! cat >> confdefs.h <<\EOF ! #define HAVE_ALLOCA 1 ! EOF ! ! fi ! ! if test $ac_cv_func_alloca_works = no; then ! # The SVR3 libPW and SVR4 libucb both contain incompatible functions ! # that cause trouble. Some versions do not even contain alloca or ! # contain a buggy version. If you still want to use their alloca, ! # use ar to extract alloca.o from them instead of compiling alloca.c. ! ALLOCA=alloca.${ac_objext} ! cat >> confdefs.h <<\EOF ! #define C_ALLOCA 1 ! EOF ! ! ! echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 ! echo "configure:1586: checking whether alloca needs Cray hooks" >&5 ! if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! cat > conftest.$ac_ext <&5 | ! egrep "webecray" >/dev/null 2>&1; then ! rm -rf conftest* ! ac_cv_os_cray=yes ! else ! rm -rf conftest* ! ac_cv_os_cray=no ! fi ! rm -f conftest* ! ! fi ! ! echo "$ac_t""$ac_cv_os_cray" 1>&6 ! if test $ac_cv_os_cray = yes; then ! for ac_func in _getb67 GETB67 getb67; do ! echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:1616: checking for $ac_func" >&5 ! if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! cat > conftest.$ac_ext < ! /* Override any gcc2 internal prototype to avoid an error. */ ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char $ac_func(); ! ! int main() { ! ! /* The GNU C library defines this for functions which it implements ! to always fail with ENOSYS. Some functions are actually named ! something starting with __ and the normal name is an alias. */ ! #if defined (__stub_$ac_func) || defined (__stub___$ac_func) ! choke me ! #else ! $ac_func(); ! #endif ! ! ; return 0; } ! EOF ! if { (eval echo configure:1644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ! rm -rf conftest* ! eval "ac_cv_func_$ac_func=yes" ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! eval "ac_cv_func_$ac_func=no" ! fi ! rm -f conftest* ! fi ! ! if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then ! echo "$ac_t""yes" 1>&6 ! cat >> confdefs.h <&6 ! fi ! ! done ! fi ! ! echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 ! echo "configure:1671: checking stack direction for C alloca" >&5 ! if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! if test "$cross_compiling" = yes; then ! ac_cv_c_stack_direction=0 ! else ! cat > conftest.$ac_ext < addr) ? 1 : -1; ! } ! main () ! { ! exit (find_stack_direction() < 0); ! } ! EOF ! if { (eval echo configure:1698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ! then ! ac_cv_c_stack_direction=1 ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -fr conftest* ! ac_cv_c_stack_direction=-1 ! fi ! rm -fr conftest* ! fi ! ! fi ! ! echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 ! cat >> confdefs.h <&6 ! echo "configure:1723: checking for $ac_hdr" >&5 ! if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! cat > conftest.$ac_ext < ! EOF ! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ! if test -z "$ac_err"; then ! rm -rf conftest* ! eval "ac_cv_header_$ac_safe=yes" ! else ! echo "$ac_err" >&5 ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! eval "ac_cv_header_$ac_safe=no" ! fi ! rm -f conftest* ! fi ! if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ! echo "$ac_t""yes" 1>&6 ! ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` ! cat >> confdefs.h <&6 ! fi ! done ! ! for ac_func in getpagesize ! do ! echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:1762: checking for $ac_func" >&5 ! if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! cat > conftest.$ac_ext < ! /* Override any gcc2 internal prototype to avoid an error. */ ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char $ac_func(); ! ! int main() { ! ! /* The GNU C library defines this for functions which it implements ! to always fail with ENOSYS. Some functions are actually named ! something starting with __ and the normal name is an alias. */ ! #if defined (__stub_$ac_func) || defined (__stub___$ac_func) ! choke me ! #else ! $ac_func(); ! #endif ! ! ; return 0; } ! EOF ! if { (eval echo configure:1790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ! rm -rf conftest* ! eval "ac_cv_func_$ac_func=yes" ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! eval "ac_cv_func_$ac_func=no" ! fi ! rm -f conftest* ! fi ! ! if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then ! echo "$ac_t""yes" 1>&6 ! ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` ! cat >> confdefs.h <&6 ! fi ! done ! ! echo $ac_n "checking for working mmap""... $ac_c" 1>&6 ! echo "configure:1815: checking for working mmap" >&5 ! if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! if test "$cross_compiling" = yes; then ! ac_cv_func_mmap_fixed_mapped=no ! else ! cat > conftest.$ac_ext < ! #include ! #include ! ! /* This mess was copied from the GNU getpagesize.h. */ ! #ifndef HAVE_GETPAGESIZE ! # ifdef HAVE_UNISTD_H ! # include ! # endif ! ! /* Assume that all systems that can run configure have sys/param.h. */ ! # ifndef HAVE_SYS_PARAM_H ! # define HAVE_SYS_PARAM_H 1 ! # endif ! ! # ifdef _SC_PAGESIZE ! # define getpagesize() sysconf(_SC_PAGESIZE) ! # else /* no _SC_PAGESIZE */ ! # ifdef HAVE_SYS_PARAM_H ! # include ! # ifdef EXEC_PAGESIZE ! # define getpagesize() EXEC_PAGESIZE ! # else /* no EXEC_PAGESIZE */ ! # ifdef NBPG ! # define getpagesize() NBPG * CLSIZE ! # ifndef CLSIZE ! # define CLSIZE 1 ! # endif /* no CLSIZE */ ! # else /* no NBPG */ ! # ifdef NBPC ! # define getpagesize() NBPC ! # else /* no NBPC */ ! # ifdef PAGESIZE ! # define getpagesize() PAGESIZE ! # endif /* PAGESIZE */ ! # endif /* no NBPC */ ! # endif /* no NBPG */ ! # endif /* no EXEC_PAGESIZE */ ! # else /* no HAVE_SYS_PARAM_H */ ! # define getpagesize() 8192 /* punt totally */ ! # endif /* no HAVE_SYS_PARAM_H */ ! # endif /* no _SC_PAGESIZE */ ! ! #endif /* no HAVE_GETPAGESIZE */ ! ! #ifdef __cplusplus ! extern "C" { void *malloc(unsigned); } ! #else ! char *malloc(); ! #endif ! ! int ! main() ! { ! char *data, *data2, *data3; ! int i, pagesize; ! int fd; ! ! pagesize = getpagesize(); ! ! /* ! * First, make a file with some known garbage in it. ! */ ! data = malloc(pagesize); ! if (!data) ! exit(1); ! for (i = 0; i < pagesize; ++i) ! *(data + i) = rand(); ! umask(0); ! fd = creat("conftestmmap", 0600); ! if (fd < 0) ! exit(1); ! if (write(fd, data, pagesize) != pagesize) ! exit(1); ! close(fd); ! ! /* ! * Next, try to mmap the file at a fixed address which ! * already has something else allocated at it. If we can, ! * also make sure that we see the same garbage. ! */ ! fd = open("conftestmmap", O_RDWR); ! if (fd < 0) ! exit(1); ! data2 = malloc(2 * pagesize); ! if (!data2) ! exit(1); ! data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); ! if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE, ! MAP_PRIVATE | MAP_FIXED, fd, 0L)) ! exit(1); ! for (i = 0; i < pagesize; ++i) ! if (*(data + i) != *(data2 + i)) ! exit(1); ! ! /* ! * Finally, make sure that changes to the mapped area ! * do not percolate back to the file as seen by read(). ! * (This is a bug on some variants of i386 svr4.0.) ! */ ! for (i = 0; i < pagesize; ++i) ! *(data2 + i) = *(data2 + i) + 1; ! data3 = malloc(pagesize); ! if (!data3) ! exit(1); ! if (read(fd, data3, pagesize) != pagesize) ! exit(1); ! for (i = 0; i < pagesize; ++i) ! if (*(data + i) != *(data3 + i)) ! exit(1); ! close(fd); ! unlink("conftestmmap"); ! exit(0); ! } ! ! EOF ! if { (eval echo configure:1963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ! then ! ac_cv_func_mmap_fixed_mapped=yes ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -fr conftest* ! ac_cv_func_mmap_fixed_mapped=no ! fi ! rm -fr conftest* ! fi ! ! fi ! ! echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6 ! if test $ac_cv_func_mmap_fixed_mapped = yes; then ! cat >> confdefs.h <<\EOF ! #define HAVE_MMAP 1 ! EOF ! ! fi ! ! ! for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \ ! unistd.h sys/param.h ! do ! ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ! echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:1991: checking for $ac_hdr" >&5 ! if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! cat > conftest.$ac_ext < ! EOF ! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:2001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ! if test -z "$ac_err"; then ! rm -rf conftest* ! eval "ac_cv_header_$ac_safe=yes" ! else ! echo "$ac_err" >&5 ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! eval "ac_cv_header_$ac_safe=no" ! fi ! rm -f conftest* ! fi ! if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ! echo "$ac_t""yes" 1>&6 ! ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` ! cat >> confdefs.h <&6 ! fi ! done ! ! for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \ ! strdup __argz_count __argz_stringify __argz_next ! do ! echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:2031: checking for $ac_func" >&5 ! if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! cat > conftest.$ac_ext < ! /* Override any gcc2 internal prototype to avoid an error. */ ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char $ac_func(); ! ! int main() { ! ! /* The GNU C library defines this for functions which it implements ! to always fail with ENOSYS. Some functions are actually named ! something starting with __ and the normal name is an alias. */ ! #if defined (__stub_$ac_func) || defined (__stub___$ac_func) ! choke me ! #else ! $ac_func(); ! #endif ! ! ; return 0; } ! EOF ! if { (eval echo configure:2059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ! rm -rf conftest* ! eval "ac_cv_func_$ac_func=yes" ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! eval "ac_cv_func_$ac_func=no" ! fi ! rm -f conftest* ! fi ! ! if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then ! echo "$ac_t""yes" 1>&6 ! ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` ! cat >> confdefs.h <&6 ! fi ! done ! ! ! if test "${ac_cv_func_stpcpy+set}" != "set"; then ! for ac_func in stpcpy ! do ! echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:2088: checking for $ac_func" >&5 ! if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! cat > conftest.$ac_ext < ! /* Override any gcc2 internal prototype to avoid an error. */ ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char $ac_func(); ! ! int main() { ! ! /* The GNU C library defines this for functions which it implements ! to always fail with ENOSYS. Some functions are actually named ! something starting with __ and the normal name is an alias. */ ! #if defined (__stub_$ac_func) || defined (__stub___$ac_func) ! choke me ! #else ! $ac_func(); ! #endif ! ! ; return 0; } ! EOF ! if { (eval echo configure:2116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ! rm -rf conftest* ! eval "ac_cv_func_$ac_func=yes" ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! eval "ac_cv_func_$ac_func=no" ! fi ! rm -f conftest* ! fi ! ! if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then ! echo "$ac_t""yes" 1>&6 ! ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` ! cat >> confdefs.h <&6 ! fi ! done ! ! fi ! if test "${ac_cv_func_stpcpy}" = "yes"; then ! cat >> confdefs.h <<\EOF ! #define HAVE_STPCPY 1 ! EOF ! ! fi ! ! if test $ac_cv_header_locale_h = yes; then ! echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 ! echo "configure:2150: checking for LC_MESSAGES" >&5 ! if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! cat > conftest.$ac_ext < ! int main() { ! return LC_MESSAGES ! ; return 0; } ! EOF ! if { (eval echo configure:2162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ! rm -rf conftest* ! am_cv_val_LC_MESSAGES=yes ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! am_cv_val_LC_MESSAGES=no ! fi ! rm -f conftest* ! fi ! ! echo "$ac_t""$am_cv_val_LC_MESSAGES" 1>&6 ! if test $am_cv_val_LC_MESSAGES = yes; then ! cat >> confdefs.h <<\EOF ! #define HAVE_LC_MESSAGES 1 ! EOF ! ! fi ! fi ! echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 ! echo "configure:2183: checking whether NLS is requested" >&5 ! # Check whether --enable-nls or --disable-nls was given. ! if test "${enable_nls+set}" = set; then ! enableval="$enable_nls" ! USE_NLS=$enableval ! else ! USE_NLS=yes ! fi ! ! echo "$ac_t""$USE_NLS" 1>&6 ! ! ! USE_INCLUDED_LIBINTL=no ! ! if test "$USE_NLS" = "yes"; then ! cat >> confdefs.h <<\EOF ! #define ENABLE_NLS 1 ! EOF ! ! echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 ! echo "configure:2203: checking whether included gettext is requested" >&5 ! # Check whether --with-included-gettext or --without-included-gettext was given. ! if test "${with_included_gettext+set}" = set; then ! withval="$with_included_gettext" ! nls_cv_force_use_gnu_gettext=$withval ! else ! nls_cv_force_use_gnu_gettext=no ! fi ! ! echo "$ac_t""$nls_cv_force_use_gnu_gettext" 1>&6 ! ! nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" ! if test "$nls_cv_force_use_gnu_gettext" != "yes"; then ! nls_cv_header_intl= ! nls_cv_header_libgt= ! CATOBJEXT=NONE ! ! ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` ! echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 ! echo "configure:2222: checking for libintl.h" >&5 ! if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! cat > conftest.$ac_ext < ! EOF ! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:2232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ! if test -z "$ac_err"; then ! rm -rf conftest* ! eval "ac_cv_header_$ac_safe=yes" ! else ! echo "$ac_err" >&5 ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! eval "ac_cv_header_$ac_safe=no" ! fi ! rm -f conftest* ! fi ! if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ! echo "$ac_t""yes" 1>&6 ! echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 ! echo "configure:2249: checking for gettext in libc" >&5 ! if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! cat > conftest.$ac_ext < ! int main() { ! return (int) gettext ("") ! ; return 0; } ! EOF ! if { (eval echo configure:2261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ! rm -rf conftest* ! gt_cv_func_gettext_libc=yes ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! gt_cv_func_gettext_libc=no ! fi ! rm -f conftest* ! fi ! ! echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 ! ! if test "$gt_cv_func_gettext_libc" != "yes"; then ! echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 ! echo "configure:2277: checking for bindtextdomain in -lintl" >&5 ! ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` ! if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! ac_save_LIBS="$LIBS" ! LIBS="-lintl $LIBS" ! cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ! rm -rf conftest* ! eval "ac_cv_lib_$ac_lib_var=yes" ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! eval "ac_cv_lib_$ac_lib_var=no" ! fi ! rm -f conftest* ! LIBS="$ac_save_LIBS" ! ! fi ! if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ! echo "$ac_t""yes" 1>&6 ! echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 ! echo "configure:2312: checking for gettext in libintl" >&5 ! if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 ! echo "configure:2317: checking for gettext in -lintl" >&5 ! ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` ! if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! ac_save_LIBS="$LIBS" ! LIBS="-lintl $LIBS" ! cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ! rm -rf conftest* ! eval "ac_cv_lib_$ac_lib_var=yes" ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! eval "ac_cv_lib_$ac_lib_var=no" ! fi ! rm -f conftest* ! LIBS="$ac_save_LIBS" ! ! fi ! if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ! echo "$ac_t""yes" 1>&6 ! gt_cv_func_gettext_libintl=yes ! else ! echo "$ac_t""no" 1>&6 ! gt_cv_func_gettext_libintl=no ! fi ! ! fi ! ! echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6 ! else ! echo "$ac_t""no" 1>&6 ! fi ! ! fi ! ! if test "$gt_cv_func_gettext_libc" = "yes" \ ! || test "$gt_cv_func_gettext_libintl" = "yes"; then ! cat >> confdefs.h <<\EOF ! #define HAVE_GETTEXT 1 ! EOF ! ! # Extract the first word of "msgfmt", so it can be a program name with args. ! set dummy msgfmt; ac_word=$2 ! echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2375: checking for $ac_word" >&5 ! if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! case "$MSGFMT" in ! /*) ! ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ! ;; ! *) ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then ! ac_cv_path_MSGFMT="$ac_dir/$ac_word" ! break ! fi ! fi ! done ! IFS="$ac_save_ifs" ! test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" ! ;; ! esac ! fi ! MSGFMT="$ac_cv_path_MSGFMT" ! if test -n "$MSGFMT"; then ! echo "$ac_t""$MSGFMT" 1>&6 ! else ! echo "$ac_t""no" 1>&6 ! fi ! if test "$MSGFMT" != "no"; then ! for ac_func in dcgettext ! do ! echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:2409: checking for $ac_func" >&5 ! if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! cat > conftest.$ac_ext < ! /* Override any gcc2 internal prototype to avoid an error. */ ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char $ac_func(); ! ! int main() { ! ! /* The GNU C library defines this for functions which it implements ! to always fail with ENOSYS. Some functions are actually named ! something starting with __ and the normal name is an alias. */ ! #if defined (__stub_$ac_func) || defined (__stub___$ac_func) ! choke me ! #else ! $ac_func(); ! #endif ! ! ; return 0; } ! EOF ! if { (eval echo configure:2437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ! rm -rf conftest* ! eval "ac_cv_func_$ac_func=yes" ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! eval "ac_cv_func_$ac_func=no" ! fi ! rm -f conftest* ! fi ! ! if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then ! echo "$ac_t""yes" 1>&6 ! ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` ! cat >> confdefs.h <&6 ! fi ! done ! ! # Extract the first word of "gmsgfmt", so it can be a program name with args. ! set dummy gmsgfmt; ac_word=$2 ! echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2464: checking for $ac_word" >&5 ! if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! case "$GMSGFMT" in ! /*) ! ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ! ;; ! ?:/*) ! ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. ! ;; ! *) ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! ac_cv_path_GMSGFMT="$ac_dir/$ac_word" ! break ! fi ! done ! IFS="$ac_save_ifs" ! test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ! ;; ! esac ! fi ! GMSGFMT="$ac_cv_path_GMSGFMT" ! if test -n "$GMSGFMT"; then ! echo "$ac_t""$GMSGFMT" 1>&6 ! else ! echo "$ac_t""no" 1>&6 ! fi ! ! # Extract the first word of "xgettext", so it can be a program name with args. ! set dummy xgettext; ac_word=$2 ! echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2500: checking for $ac_word" >&5 ! if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! case "$XGETTEXT" in ! /*) ! ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ! ;; ! *) ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then ! ac_cv_path_XGETTEXT="$ac_dir/$ac_word" ! break ! fi ! fi ! done ! IFS="$ac_save_ifs" ! test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" ! ;; ! esac ! fi ! XGETTEXT="$ac_cv_path_XGETTEXT" ! if test -n "$XGETTEXT"; then ! echo "$ac_t""$XGETTEXT" 1>&6 ! else ! echo "$ac_t""no" 1>&6 ! fi ! ! cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ! rm -rf conftest* ! CATOBJEXT=.gmo ! DATADIRNAME=share ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! CATOBJEXT=.mo ! DATADIRNAME=lib ! fi ! rm -f conftest* ! INSTOBJEXT=.mo ! fi ! fi ! ! else ! echo "$ac_t""no" 1>&6 ! fi ! ! ! if test "$CATOBJEXT" = "NONE"; then ! echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 ! echo "configure:2563: checking whether catgets can be used" >&5 ! # Check whether --with-catgets or --without-catgets was given. ! if test "${with_catgets+set}" = set; then ! withval="$with_catgets" ! nls_cv_use_catgets=$withval ! else ! nls_cv_use_catgets=no ! fi ! ! echo "$ac_t""$nls_cv_use_catgets" 1>&6 ! ! if test "$nls_cv_use_catgets" = "yes"; then ! echo $ac_n "checking for main in -li""... $ac_c" 1>&6 ! echo "configure:2576: checking for main in -li" >&5 ! ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'` ! if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! ac_save_LIBS="$LIBS" ! LIBS="-li $LIBS" ! cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ! rm -rf conftest* ! eval "ac_cv_lib_$ac_lib_var=yes" ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! eval "ac_cv_lib_$ac_lib_var=no" ! fi ! rm -f conftest* ! LIBS="$ac_save_LIBS" ! ! fi ! if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ! echo "$ac_t""yes" 1>&6 ! ac_tr_lib=HAVE_LIB`echo i | sed -e 's/[^a-zA-Z0-9_]/_/g' \ ! -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` ! cat >> confdefs.h <&6 ! fi ! ! echo $ac_n "checking for catgets""... $ac_c" 1>&6 ! echo "configure:2619: checking for catgets" >&5 ! if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! cat > conftest.$ac_ext < ! /* Override any gcc2 internal prototype to avoid an error. */ ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char catgets(); ! ! int main() { ! ! /* The GNU C library defines this for functions which it implements ! to always fail with ENOSYS. Some functions are actually named ! something starting with __ and the normal name is an alias. */ ! #if defined (__stub_catgets) || defined (__stub___catgets) ! choke me ! #else ! catgets(); ! #endif ! ! ; return 0; } ! EOF ! if { (eval echo configure:2647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ! rm -rf conftest* ! eval "ac_cv_func_catgets=yes" ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! eval "ac_cv_func_catgets=no" ! fi ! rm -f conftest* ! fi ! ! if eval "test \"`echo '$ac_cv_func_'catgets`\" = yes"; then ! echo "$ac_t""yes" 1>&6 ! cat >> confdefs.h <<\EOF ! #define HAVE_CATGETS 1 ! EOF ! ! INTLOBJS="\$(CATOBJS)" ! # Extract the first word of "gencat", so it can be a program name with args. ! set dummy gencat; ac_word=$2 ! echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2669: checking for $ac_word" >&5 ! if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! case "$GENCAT" in ! /*) ! ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a path. ! ;; ! ?:/*) ! ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a dos path. ! ;; ! *) ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! ac_cv_path_GENCAT="$ac_dir/$ac_word" ! break ! fi ! done ! IFS="$ac_save_ifs" ! test -z "$ac_cv_path_GENCAT" && ac_cv_path_GENCAT="no" ! ;; ! esac ! fi ! GENCAT="$ac_cv_path_GENCAT" ! if test -n "$GENCAT"; then ! echo "$ac_t""$GENCAT" 1>&6 ! else ! echo "$ac_t""no" 1>&6 ! fi ! if test "$GENCAT" != "no"; then ! # Extract the first word of "gmsgfmt", so it can be a program name with args. ! set dummy gmsgfmt; ac_word=$2 ! echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2705: checking for $ac_word" >&5 ! if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! case "$GMSGFMT" in ! /*) ! ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ! ;; ! ?:/*) ! ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. ! ;; ! *) ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! ac_cv_path_GMSGFMT="$ac_dir/$ac_word" ! break ! fi ! done ! IFS="$ac_save_ifs" ! test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no" ! ;; ! esac ! fi ! GMSGFMT="$ac_cv_path_GMSGFMT" ! if test -n "$GMSGFMT"; then ! echo "$ac_t""$GMSGFMT" 1>&6 ! else ! echo "$ac_t""no" 1>&6 ! fi ! ! if test "$GMSGFMT" = "no"; then ! # Extract the first word of "msgfmt", so it can be a program name with args. ! set dummy msgfmt; ac_word=$2 ! echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2742: checking for $ac_word" >&5 ! if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! case "$GMSGFMT" in ! /*) ! ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ! ;; ! *) ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then ! ac_cv_path_GMSGFMT="$ac_dir/$ac_word" ! break ! fi ! fi ! done ! IFS="$ac_save_ifs" ! test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no" ! ;; ! esac ! fi ! GMSGFMT="$ac_cv_path_GMSGFMT" ! if test -n "$GMSGFMT"; then ! echo "$ac_t""$GMSGFMT" 1>&6 ! else ! echo "$ac_t""no" 1>&6 ! fi ! ! fi ! # Extract the first word of "xgettext", so it can be a program name with args. ! set dummy xgettext; ac_word=$2 ! echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2777: checking for $ac_word" >&5 ! if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! case "$XGETTEXT" in ! /*) ! ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ! ;; ! *) ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then ! ac_cv_path_XGETTEXT="$ac_dir/$ac_word" ! break ! fi ! fi ! done ! IFS="$ac_save_ifs" ! test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" ! ;; ! esac ! fi ! XGETTEXT="$ac_cv_path_XGETTEXT" ! if test -n "$XGETTEXT"; then ! echo "$ac_t""$XGETTEXT" 1>&6 ! else ! echo "$ac_t""no" 1>&6 ! fi ! ! USE_INCLUDED_LIBINTL=yes ! CATOBJEXT=.cat ! INSTOBJEXT=.cat ! DATADIRNAME=lib ! INTLDEPS='$(top_builddir)/intl/libintl.a' ! INTLLIBS=$INTLDEPS ! LIBS=`echo $LIBS | sed -e 's/-lintl//'` ! nls_cv_header_intl=intl/libintl.h ! nls_cv_header_libgt=intl/libgettext.h ! fi ! else ! echo "$ac_t""no" 1>&6 ! fi ! ! fi ! fi ! ! if test "$CATOBJEXT" = "NONE"; then ! nls_cv_use_gnu_gettext=yes ! fi ! fi ! ! if test "$nls_cv_use_gnu_gettext" = "yes"; then ! INTLOBJS="\$(GETTOBJS)" ! # Extract the first word of "msgfmt", so it can be a program name with args. ! set dummy msgfmt; ac_word=$2 ! echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2835: checking for $ac_word" >&5 ! if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! case "$MSGFMT" in ! /*) ! ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ! ;; ! *) ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then ! ac_cv_path_MSGFMT="$ac_dir/$ac_word" ! break ! fi ! fi ! done ! IFS="$ac_save_ifs" ! test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="msgfmt" ! ;; ! esac ! fi ! MSGFMT="$ac_cv_path_MSGFMT" ! if test -n "$MSGFMT"; then ! echo "$ac_t""$MSGFMT" 1>&6 ! else ! echo "$ac_t""no" 1>&6 ! fi ! ! # Extract the first word of "gmsgfmt", so it can be a program name with args. ! set dummy gmsgfmt; ac_word=$2 ! echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2869: checking for $ac_word" >&5 ! if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! case "$GMSGFMT" in ! /*) ! ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ! ;; ! ?:/*) ! ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. ! ;; ! *) ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! ac_cv_path_GMSGFMT="$ac_dir/$ac_word" ! break ! fi ! done ! IFS="$ac_save_ifs" ! test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ! ;; ! esac ! fi ! GMSGFMT="$ac_cv_path_GMSGFMT" ! if test -n "$GMSGFMT"; then ! echo "$ac_t""$GMSGFMT" 1>&6 ! else ! echo "$ac_t""no" 1>&6 ! fi ! ! # Extract the first word of "xgettext", so it can be a program name with args. ! set dummy xgettext; ac_word=$2 ! echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2905: checking for $ac_word" >&5 ! if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! case "$XGETTEXT" in ! /*) ! ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ! ;; ! *) ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then ! ac_cv_path_XGETTEXT="$ac_dir/$ac_word" ! break ! fi ! fi ! done ! IFS="$ac_save_ifs" ! test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" ! ;; ! esac ! fi ! XGETTEXT="$ac_cv_path_XGETTEXT" ! if test -n "$XGETTEXT"; then ! echo "$ac_t""$XGETTEXT" 1>&6 ! else ! echo "$ac_t""no" 1>&6 ! fi ! ! ! USE_INCLUDED_LIBINTL=yes ! CATOBJEXT=.gmo ! INSTOBJEXT=.mo ! DATADIRNAME=share ! INTLDEPS='$(top_builddir)/intl/libintl.a' ! INTLLIBS=$INTLDEPS ! LIBS=`echo $LIBS | sed -e 's/-lintl//'` ! nls_cv_header_intl=intl/libintl.h ! nls_cv_header_libgt=intl/libgettext.h ! fi ! ! if test "$XGETTEXT" != ":"; then ! if $XGETTEXT --omit-header /dev/null 2> /dev/null; then ! : ; ! else ! echo "$ac_t""found xgettext program is not GNU xgettext; ignore it" 1>&6 ! XGETTEXT=":" ! fi ! fi ! ! # We need to process the po/ directory. ! POSUB=po ! else ! DATADIRNAME=share ! nls_cv_header_intl=intl/libintl.h ! nls_cv_header_libgt=intl/libgettext.h ! fi ! ! ! ! ! # If this is used in GNU gettext we have to set USE_NLS to `yes' ! # because some of the sources are only built for this goal. ! if test "$PACKAGE" = gettext; then ! USE_NLS=yes ! USE_INCLUDED_LIBINTL=yes ! fi ! ! for lang in $ALL_LINGUAS; do ! GMOFILES="$GMOFILES $lang.gmo" ! POFILES="$POFILES $lang.po" ! done ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! if test "x$CATOBJEXT" != "x"; then ! if test "x$ALL_LINGUAS" = "x"; then ! LINGUAS= ! else ! echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 ! echo "configure:2998: checking for catalogs to be installed" >&5 ! NEW_LINGUAS= ! for lang in ${LINGUAS=$ALL_LINGUAS}; do ! case "$ALL_LINGUAS" in ! *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; ! esac ! done ! LINGUAS=$NEW_LINGUAS ! echo "$ac_t""$LINGUAS" 1>&6 ! fi ! ! if test -n "$LINGUAS"; then ! for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ! fi ! fi ! ! if test $ac_cv_header_locale_h = yes; then ! INCLUDE_LOCALE_H="#include " ! else ! INCLUDE_LOCALE_H="\ ! /* The system does not provide the header . Take care yourself. */" ! fi ! ! ! test -d intl || mkdir intl ! if test "$CATOBJEXT" = ".cat"; then ! ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` ! echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 ! echo "configure:3026: checking for linux/version.h" >&5 ! if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! cat > conftest.$ac_ext < ! EOF ! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:3036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ! if test -z "$ac_err"; then ! rm -rf conftest* ! eval "ac_cv_header_$ac_safe=yes" ! else ! echo "$ac_err" >&5 ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! eval "ac_cv_header_$ac_safe=no" ! fi ! rm -f conftest* ! fi ! if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ! echo "$ac_t""yes" 1>&6 ! msgformat=linux ! else ! echo "$ac_t""no" 1>&6 ! msgformat=xopen ! fi ! ! ! sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed ! fi ! sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ ! $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed ! ! if test "$PACKAGE" = "gettext"; then ! GT_NO="#NO#" ! GT_YES= ! else ! GT_NO= ! GT_YES="#YES#" ! fi ! ! ! ! MKINSTALLDIRS= ! if test -n "$ac_aux_dir"; then ! MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ! fi ! if test -z "$MKINSTALLDIRS"; then ! MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ! fi ! ! ! l= ! ! ! test -d po || mkdir po ! if test "x$srcdir" != "x."; then ! if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then ! posrcprefix="$srcdir/" ! else ! posrcprefix="../$srcdir/" ! fi ! else ! posrcprefix="../" ! fi ! rm -f po/POTFILES ! sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ ! < $srcdir/po/POTFILES.in > po/POTFILES ! ! echo $ac_n "checking for gettext""... $ac_c" 1>&6 ! echo "configure:3101: checking for gettext" >&5 ! if eval "test \"`echo '$''{'ac_cv_func_gettext'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! cat > conftest.$ac_ext < ! /* Override any gcc2 internal prototype to avoid an error. */ ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char gettext(); ! ! int main() { ! ! /* The GNU C library defines this for functions which it implements ! to always fail with ENOSYS. Some functions are actually named ! something starting with __ and the normal name is an alias. */ ! #if defined (__stub_gettext) || defined (__stub___gettext) ! choke me ! #else ! gettext(); ! #endif ! ! ; return 0; } ! EOF ! if { (eval echo configure:3129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ! rm -rf conftest* ! eval "ac_cv_func_gettext=yes" ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! eval "ac_cv_func_gettext=no" ! fi ! rm -f conftest* ! fi ! ! if eval "test \"`echo '$ac_cv_func_'gettext`\" = yes"; then ! echo "$ac_t""yes" 1>&6 ! : ! else ! echo "$ac_t""no" 1>&6 ! echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 ! echo "configure:3147: checking for gettext in -lintl" >&5 ! ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` ! if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! ac_save_LIBS="$LIBS" ! LIBS="-lintl $LIBS" ! cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ! rm -rf conftest* ! eval "ac_cv_lib_$ac_lib_var=yes" ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! eval "ac_cv_lib_$ac_lib_var=no" ! fi ! rm -f conftest* ! LIBS="$ac_save_LIBS" ! ! fi ! if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ! echo "$ac_t""yes" 1>&6 ! ac_tr_lib=HAVE_LIB`echo intl | sed -e 's/^a-zA-Z0-9_/_/g' \ ! -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` ! cat >> confdefs.h <&6 ! fi ! ! fi ! ! cat >> confdefs.h <<\EOF ! #define HAVE_CATGETS 1 ! EOF ! ! cat >> confdefs.h <<\EOF ! #define ENABLE_NLS 1 ! EOF ! ! cat >> confdefs.h <<\EOF ! #define HAVE_LC_MESSAGES 1 ! EOF ! ! cat >> confdefs.h <<\EOF ! #define HAVE_STPCPY 1 ! EOF ! ! localedir='${prefix}/share/locale' ! ! ! ddnl Check for GTK ! # Check whether --with-gtk-prefix or --without-gtk-prefix was given. ! if test "${with_gtk_prefix+set}" = set; then ! withval="$with_gtk_prefix" ! gtk_config_prefix="$withval" ! else ! gtk_config_prefix="" ! fi ! ! # Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given. ! if test "${with_gtk_exec_prefix+set}" = set; then ! withval="$with_gtk_exec_prefix" ! gtk_config_exec_prefix="$withval" ! else ! gtk_config_exec_prefix="" ! fi ! ! # Check whether --enable-gtktest or --disable-gtktest was given. ! if test "${enable_gtktest+set}" = set; then ! enableval="$enable_gtktest" ! : ! else ! enable_gtktest=yes ! fi ! ! ! for module in . ! do ! case "$module" in ! gthread) ! gtk_config_args="$gtk_config_args gthread" ! ;; ! esac ! done ! ! if test x$gtk_config_exec_prefix != x ; then ! gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" ! if test x${GTK_CONFIG+set} != xset ; then ! GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config ! fi ! fi ! if test x$gtk_config_prefix != x ; then ! gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" ! if test x${GTK_CONFIG+set} != xset ; then ! GTK_CONFIG=$gtk_config_prefix/bin/gtk-config ! fi ! fi ! ! # Extract the first word of "gtk-config", so it can be a program name with args. ! set dummy gtk-config; ac_word=$2 ! echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:3265: checking for $ac_word" >&5 ! if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! case "$GTK_CONFIG" in ! /*) ! ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. ! ;; ! ?:/*) ! ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a dos path. ! ;; ! *) ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word" ! break ! fi ! done ! IFS="$ac_save_ifs" ! test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" ! ;; ! esac ! fi ! GTK_CONFIG="$ac_cv_path_GTK_CONFIG" ! if test -n "$GTK_CONFIG"; then ! echo "$ac_t""$GTK_CONFIG" 1>&6 ! else ! echo "$ac_t""no" 1>&6 ! fi ! ! min_gtk_version=1.2.0 ! echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 ! echo "configure:3300: checking for GTK - version >= $min_gtk_version" >&5 ! no_gtk="" ! if test "$GTK_CONFIG" = "no" ; then ! no_gtk=yes ! else ! GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` ! GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` ! gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ ! sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` ! gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ ! sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` ! gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ ! sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` ! if test "x$enable_gtktest" = "xyes" ; then ! ac_save_CFLAGS="$CFLAGS" ! ac_save_LIBS="$LIBS" ! CFLAGS="$CFLAGS $GTK_CFLAGS" ! LIBS="$GTK_LIBS $LIBS" ! rm -f conf.gtktest ! if test "$cross_compiling" = yes; then ! echo $ac_n "cross compiling; assumed OK... $ac_c" ! else ! cat > conftest.$ac_ext < ! #include ! #include ! ! int ! main () ! { ! int major, minor, micro; ! char *tmp_version; ! ! system ("touch conf.gtktest"); ! ! /* HP/UX 9 (%@#!) writes to sscanf strings */ ! tmp_version = g_strdup("$min_gtk_version"); ! if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ! printf("%s, bad version string\n", "$min_gtk_version"); ! exit(1); ! } if ((gtk_major_version != $gtk_config_major_version) || (gtk_minor_version != $gtk_config_minor_version) || *************** *** 1244,1250 **** } EOF ! if { (eval echo configure:1248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else --- 3397,3403 ---- } EOF ! if { (eval echo configure:3401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else *************** *** 1278,1284 **** CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < --- 3431,3437 ---- CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < *************** *** 1288,1294 **** return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF ! if { (eval echo configure:1292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" --- 3441,3447 ---- return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF ! if { (eval echo configure:3445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" *************** *** 1327,1523 **** rm -f conf.gtktest - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 - echo "configure:1332: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= - fi - if test -z "$CPP"; then - if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:1353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : - else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:1370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : - else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:1387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : - else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp - fi - rm -f conftest* - fi - rm -f conftest* - fi - rm -f conftest* - ac_cv_prog_CPP="$CPP" - fi - CPP="$ac_cv_prog_CPP" - else - ac_cv_prog_CPP="$CPP" - fi - echo "$ac_t""$CPP" 1>&6 - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 - echo "configure:1412: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include - #include - #include - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:1425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* - ac_cv_header_stdc=yes - else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_stdc=no - fi - rm -f conftest* - - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext < - EOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : - else - rm -rf conftest* - ac_cv_header_stdc=no - fi - rm -f conftest* - - fi - - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext < - EOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then - : - else - rm -rf conftest* - ac_cv_header_stdc=no - fi - rm -f conftest* - - fi - - if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : - else - cat > conftest.$ac_ext < - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') - #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) - #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) - int main () { int i; for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); - exit (0); } - - EOF - if { (eval echo configure:1492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_header_stdc=no - fi - rm -fr conftest* - fi - - fi - fi - - echo "$ac_t""$ac_cv_header_stdc" 1>&6 - if test $ac_cv_header_stdc = yes; then - cat >> confdefs.h <<\EOF - #define STDC_HEADERS 1 - EOF - - fi - echo $ac_n "checking for off_t""... $ac_c" 1>&6 ! echo "configure:1516: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS --- 3480,3492 ---- rm -f conf.gtktest echo $ac_n "checking for off_t""... $ac_c" 1>&6 ! echo "configure:3485: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS *************** *** 1545,1556 **** fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 ! echo "configure:1549: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS --- 3514,3525 ---- fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 ! echo "configure:3518: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS *************** *** 1578,1589 **** fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 ! echo "configure:1582: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS --- 3547,3558 ---- fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 ! echo "configure:3551: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS *************** *** 1712,1718 **** ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" ! trap 'rm -fr `echo "Makefile src/Makefile src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then --- 3801,3812 ---- cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then *************** *** 1883,1889 **** if test "${CONFIG_HEADERS+set}" != set; then EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF fi --- 3887,3893 ---- if test "${CONFIG_HEADERS+set}" != set; then EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF fi *************** *** 1969,1980 **** fi; done EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF ! test -z "$CONFIG_HEADERS" || echo timestamp > src/stamp-h exit 0 EOF --- 3973,4033 ---- fi; done EOF + + cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF + srcdir=$ac_given_srcdir + while test -n "$ac_sources"; do + set $ac_dests; ac_dest=$1; shift; ac_dests=$* + set $ac_sources; ac_source=$1; shift; ac_sources=$* + + echo "linking $srcdir/$ac_source to $ac_dest" + + if test ! -r $srcdir/$ac_source; then + { echo "configure: error: $srcdir/$ac_source: File not found" 1>&2; exit 1; } + fi + rm -f $ac_dest + + # Make relative symlinks. + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dest_dir=`echo $ac_dest|sed 's%/[^/][^/]*$%%'` + if test "$ac_dest_dir" != "$ac_dest" && test "$ac_dest_dir" != .; then + # The dest file is in a subdirectory. + test ! -d "$ac_dest_dir" && mkdir "$ac_dest_dir" + ac_dest_dir_suffix="/`echo $ac_dest_dir|sed 's%^\./%%'`" + # A "../" for each directory in $ac_dest_dir_suffix. + ac_dots=`echo $ac_dest_dir_suffix|sed 's%/[^/]*%../%g'` + else + ac_dest_dir_suffix= ac_dots= + fi + + case "$srcdir" in + [/$]*) ac_rel_source="$srcdir/$ac_source" ;; + *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;; + esac + + # Make a symlink if possible; otherwise try a hard link. + if ln -s $ac_rel_source $ac_dest 2>/dev/null || + ln $srcdir/$ac_source $ac_dest; then : + else + { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; } + fi + done + EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF ! test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ! case "$CONFIG_FILES" in *po/Makefile.in*) ! sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ! esac exit 0 EOF diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/configure.in gtkali-0.9.5_jp/configure.in *** gtkali-0.9.5/configure.in Thu Apr 6 00:50:32 2000 --- gtkali-0.9.5_jp/configure.in Fri Jun 16 11:00:27 2000 *************** *** 2,8 **** dnl --------------------------------------------------------------------------- AC_INIT(src/gtkali.c) ! AM_CONFIG_HEADER(src/config.h) dnl Find the version dnl ---------------- --- 2,8 ---- dnl --------------------------------------------------------------------------- AC_INIT(src/gtkali.c) ! AM_CONFIG_HEADER(config.h) dnl Find the version dnl ---------------- *************** *** 27,36 **** dnl Config headers, sanity checks, etc. dnl ----------------------------------- ! dnl AM_CONFIG_HEADER(src/config.h) AM_SANITY_CHECK ! dnl Check for GTK dnl ------------- AM_PATH_GTK(1.2.0, , --- 27,47 ---- dnl Config headers, sanity checks, etc. dnl ----------------------------------- ! dnl AM_CONFIG_HEADER(config.h) AM_SANITY_CHECK ! dnl for gettext ! ALL_LINGUAS="ja" ! AM_GNU_GETTEXT ! AC_CHECK_FUNC(gettext,,AC_CHECK_LIB(intl, gettext)) ! AC_DEFINE(HAVE_CATGETS) ! AC_DEFINE(ENABLE_NLS) ! AC_DEFINE(HAVE_LC_MESSAGES) ! AC_DEFINE(HAVE_STPCPY) ! localedir='${prefix}/share/locale' ! AC_SUBST(localedir) ! ! ddnl Check for GTK dnl ------------- AM_PATH_GTK(1.2.0, , *************** *** 44,47 **** dnl Creates Makefiles dnl ----------------- ! AC_OUTPUT(Makefile src/Makefile) --- 55,64 ---- dnl Creates Makefiles dnl ----------------- ! AC_OUTPUT([ ! Makefile ! intl/Makefile ! po/Makefile.in ! libjcode/Makefile ! src/Makefile ! ]) diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/ChangeLog gtkali-0.9.5_jp/intl/ChangeLog *** gtkali-0.9.5/intl/ChangeLog Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/ChangeLog Fri Jun 16 10:50:02 2000 *************** *** 0 **** --- 1,1086 ---- + 1998-04-29 Ulrich Drepper + + * intl/localealias.c (read_alias_file): Use unsigned char for + local variables. Remove unused variable tp. + * intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char * + for type of codeset. For loosing Solaris systems. + * intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset. + * intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable + len if not needed. + Patches by Jim Meyering. + + 1998-04-28 Ulrich Drepper + + * loadmsgcat.c (_nl_load_domain): Don't assign the element use_mmap if + mmap is not supported. + + * hash-string.h: Don't include . + + 1998-04-27 Ulrich Drepper + + * textdomain.c: Use strdup is available. + + * localealias.c: Define HAVE_MEMPCPY so that we can use this + function. Define and use semapahores to protect modfication of + global objects when compiling for glibc. Add code to allow + freeing alias table. + + * l10nflist.c: Don't assume stpcpy not being a macro. + + * gettextP.h: Define internal_function macri if not already done. + Use glibc byte-swap macros instead of defining SWAP when compiled + for glibc. + (struct loaded_domain): Add elements to allow unloading. + + * Makefile.in (distclean): Don't remove libintl.h here. + + * bindtextdomain.c: Carry over changes from glibc. Use strdup if + available. + + * dcgettext.c: Don't assume stpcpy not being a macro. Mark internal + functions. Add memory freeing code for glibc. + + * dgettext.c: Update copyright. + + * explodename.c: Include stdlib.h and string.h only if they exist. + Use strings.h eventually. + + * finddomain.c: Mark internal functions. Use strdup if available. + Add memory freeing code for glibc. + + 1997-10-10 20:00 Ulrich Drepper + + * libgettext.h: Fix dummy textdomain and bindtextdomain macros. + They should return reasonable values. + Reported by Tom Tromey . + + 1997-09-16 03:33 Ulrich Drepper + + * libgettext.h: Define PARAMS also to `args' if __cplusplus is defined. + * intlh.inst.in: Likewise. + Reported by Jean-Marc Lasgouttes . + + * libintl.glibc: Update from current glibc version. + + 1997-09-06 02:10 Ulrich Drepper + + * intlh.inst.in: Reformat copyright. + + 1997-08-19 15:22 Ulrich Drepper + + * dcgettext.c (DCGETTEXT): Remove wrong comment. + + 1997-08-16 00:13 Ulrich Drepper + + * Makefile.in (install-data): Don't change directory to install. + + 1997-08-01 14:30 Ulrich Drepper + + * cat-compat.c: Fix copyright. + + * localealias.c: Don't define strchr unless !HAVE_STRCHR. + + * loadmsgcat.c: Update copyright. Fix typos. + + * l10nflist.c: Don't define strchr unless !HAVE_STRCHR. + (_nl_make_l10nflist): Handle sponsor and revision correctly. + + * gettext.c: Update copyright. + * gettext.h: Likewise. + * hash-string.h: Likewise. + + * finddomain.c: Remoave dead code. Define strchr only if + !HAVE_STRCHR. + + * explodename.c: Include . + + * explodename.c: Reformat copyright text. + (_nl_explode_name): Fix typo. + + * dcgettext.c: Define and use __set_errno. + (guess_category_value): Don't use setlocale if HAVE_LC_MESSAGES is + not defined. + + * bindtextdom.c: Pretty printing. + + 1997-05-01 02:25 Ulrich Drepper + + * dcgettext.c (guess_category_value): Don't depend on + HAVE_LC_MESSAGES. We don't need the macro here. + Patch by Bruno Haible . + + * cat-compat.c (textdomain): DoN't refer to HAVE_SETLOCALE_NULL + macro. Instead use HAVE_LOCALE_NULL and define it when using + glibc, as in dcgettext.c. + Patch by Bruno Haible . + + * Makefile.in (CPPFLAGS): New variable. Reported by Franc,ois + Pinard. + + Mon Mar 10 06:51:17 1997 Ulrich Drepper + + * Makefile.in: Implement handling of libtool. + + * gettextP.h: Change data structures for use of generic lowlevel + i18n file handling. + + Wed Dec 4 20:21:18 1996 Ulrich Drepper + + * textdomain.c: Put parentheses around arguments of memcpy macro + definition. + * localealias.c: Likewise. + * l10nflist.c: Likewise. + * finddomain.c: Likewise. + * bindtextdom.c: Likewise. + Reported by Thomas Esken. + + Mon Nov 25 22:57:51 1996 Ulrich Drepper + + * textdomain.c: Move definition of `memcpy` macro to right + position. + + Fri Nov 22 04:01:58 1996 Ulrich Drepper + + * finddomain.c [!HAVE_STRING_H && !_LIBC]: Define memcpy using + bcopy if not already defined. Reported by Thomas Esken. + * bindtextdom.c: Likewise. + * l10nflist.c: Likewise. + * localealias.c: Likewise. + * textdomain.c: Likewise. + + Tue Oct 29 11:10:27 1996 Ulrich Drepper + + * Makefile.in (libdir): Change to use exec_prefix instead of + prefix. Reported by Knut-HåvardAksnes . + + Sat Aug 31 03:07:09 1996 Ulrich Drepper + + * l10nflist.c (_nl_normalize_codeset): We convert to lower case, + so don't prepend uppercase `ISO' for only numeric arg. + + Fri Jul 19 00:15:46 1996 Ulrich Drepper + + * l10nflist.c: Move inclusion of argz.h, ctype.h, stdlib.h after + definition of _GNU_SOURCE. Patch by Roland McGrath. + + * Makefile.in (uninstall): Fix another bug with `for' loop and + empty arguments. Patch by Jim Meyering. Correct name os + uninstalled files: no intl- prefix anymore. + + * Makefile.in (install-data): Again work around shells which + cannot handle mpty for list. Reported by Jim Meyering. + + Sat Jul 13 18:11:35 1996 Ulrich Drepper + + * Makefile.in (install): Split goal. Now depend on install-exec + and install-data. + (install-exec, install-data): New goals. Created from former + install goal. + Reported by Karl Berry. + + Sat Jun 22 04:58:14 1996 Ulrich Drepper + + * Makefile.in (MKINSTALLDIRS): New variable. Path to + mkinstalldirs script. + (install): use MKINSTALLDIRS variable or if the script is not present + try to find it in the $top_scrdir). + + Wed Jun 19 02:56:56 1996 Ulrich Drepper + + * l10nflist.c: Linux libc *partly* includes the argz_* functions. + Grr. Work around by renaming the static version and use macros + for renaming. + + Tue Jun 18 20:11:17 1996 Ulrich Drepper + + * l10nflist.c: Correct presence test macros of __argz_* functions. + + * l10nflist.c: Include based on test of it instead when + __argz_* functions are available. + Reported by Andreas Schwab. + + Thu Jun 13 15:17:44 1996 Ulrich Drepper + + * explodename.c, l10nflist.c: Define NULL for dumb systems. + + Tue Jun 11 17:05:13 1996 Ulrich Drepper + + * intlh.inst.in, libgettext.h (dcgettext): Rename local variable + result to __result to prevent name clash. + + * l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to + get prototype for stpcpy and strcasecmp. + + * intlh.inst.in, libgettext.h: Move declaration of + `_nl_msg_cat_cntr' outside __extension__ block to prevent warning + from gcc's -Wnested-extern option. + + Fri Jun 7 01:58:00 1996 Ulrich Drepper + + * Makefile.in (install): Remove comment. + + Thu Jun 6 17:28:17 1996 Ulrich Drepper + + * Makefile.in (install): Work around for another Buglix stupidity. + Always use an `else' close for `if's. Reported by Nelson Beebe. + + * Makefile.in (intlh.inst): Correct typo in phony rule. + Reported by Nelson Beebe. + + Thu Jun 6 01:49:52 1996 Ulrich Drepper + + * dcgettext.c (read_alias_file): Rename variable alloca_list to + block_list as the macro calls assume. + Patch by Eric Backus. + + * localealias.c [!HAVE_ALLOCA]: Define alloca as macro using + malloc. + (read_alias_file): Rename varriabe alloca_list to block_list as the + macro calls assume. + Patch by Eric Backus. + + * l10nflist.c: Correct conditional for inclusion. + Reported by Roland McGrath. + + * Makefile.in (all): Depend on all-@USE_INCLUDED_LIBINTL@, not + all-@USE_NLS@. + + * Makefile.in (install): intlh.inst comes from local dir, not + $(srcdir). + + * Makefile.in (intlh.inst): Special handling of this goal. If + used in gettext, this is really a rul to construct this file. If + used in any other package it is defined as a .PHONY rule with + empty body. + + * finddomain.c: Extract locale file information handling into + l10nfile.c. Rename local stpcpy__ function to stpcpy. + + * dcgettext.c (stpcpy): Add local definition. + + * l10nflist.c: Solve some portability problems. Patches partly by + Thomas Esken. Add local definition of stpcpy. + + Tue Jun 4 02:47:49 1996 Ulrich Drepper + + * intlh.inst.in: Don't depend including on + HAVE_LOCALE_H. Instead configure must rewrite this fiile + depending on the result of the configure run. + + * Makefile.in (install): libintl.inst is now called intlh.inst. + Add rules for updating intlh.inst from intlh.inst.in. + + * libintl.inst: Renamed to intlh.inst.in. + + * localealias.c, dcgettext.c [__GNUC__]: Define HAVE_ALLOCA to 1 + because gcc has __buitlin_alloca. + Reported by Roland McGrath. + + Mon Jun 3 00:32:16 1996 Ulrich Drepper + + * Makefile.in (installcheck): New goal to fulfill needs of + automake's distcheck. + + * Makefile.in (install): Reorder commands so that VERSION is + found. + + * Makefile.in (gettextsrcdir): Now use subdirectory intl/ in + @datadir@/gettext. + (COMSRCS): Add l10nfile.c. + (OBJECTS): Add l10nfile.o. + (DISTFILES): Rename to DISTFILE.normal. Remove $(DISTFILES.common). + (DISTFILE.gettext): Remove $(DISTFILES.common). + (all-gettext): Remove goal. + (install): If $(PACKAGE) = gettext install, otherwose do nothing. No + package but gettext itself should install libintl.h + headers. + (dist): Extend goal to work for gettext, too. + (dist-gettext): Remove goal. + + * dcgettext.c [!HAVE_ALLOCA]: Define macro alloca by using malloc. + + Sun Jun 2 17:33:06 1996 Ulrich Drepper + + * loadmsgcat.c (_nl_load_domain): Parameter is now comes from + find_l10nfile. + + Sat Jun 1 02:23:03 1996 Ulrich Drepper + + * l10nflist.c (__argz_next): Add definition. + + * dcgettext.c [!HAVE_ALLOCA]: Add code for handling missing alloca + code. Use new l10nfile handling. + + * localealias.c [!HAVE_ALLOCA]: Add code for handling missing + alloca code. + + * l10nflist.c: Initial revision. + + Tue Apr 2 18:51:18 1996 Ulrich Drepper + + * Makefile.in (all-gettext): New goal. Same as all-yes. + + Thu Mar 28 23:01:22 1996 Karl Eichwalder + + * Makefile.in (gettextsrcdir): Define using @datadir@. + + Tue Mar 26 12:39:14 1996 Ulrich Drepper + + * finddomain.c: Include . Reported by Roland McGrath. + + Sat Mar 23 02:00:35 1996 Ulrich Drepper + + * finddomain.c (stpcpy): Rename to stpcpy__ to prevent clashing + with external declaration. + + Sat Mar 2 00:47:09 1996 Ulrich Drepper + + * Makefile.in (all-no): Rename from all_no. + + Sat Feb 17 00:25:59 1996 Ulrich Drepper + + * gettextP.h [loaded_domain]: Array `successor' must now contain up + to 63 elements (because of codeset name normalization). + + * finddomain.c: Implement codeset name normalization. + + Thu Feb 15 04:39:09 1996 Ulrich Drepper + + * Makefile.in (all): Define to `all-@USE_NLS@'. + (all-yes, all_no): New goals. `all-no' is noop, `all-yes' + is former all. + + Mon Jan 15 21:46:01 1996 Howard Gayle + + * localealias.c (alias_compare): Increment string pointers in loop + of strcasecmp replacement. + + Fri Dec 29 21:16:34 1995 Ulrich Drepper + + * Makefile.in (install-src): Who commented this goal out ? :-) + + Fri Dec 29 15:08:16 1995 Ulrich Drepper + + * dcgettext.c (DCGETTEXT): Save `errno'. Failing system calls + should not effect it because a missing catalog is no error. + Reported by Harald Knig . + + Tue Dec 19 22:09:13 1995 Ulrich Drepper + + * Makefile.in (Makefile): Explicitly use $(SHELL) for running + shell scripts. + + Fri Dec 15 17:34:59 1995 Andreas Schwab + + * Makefile.in (install-src): Only install library and header when + we use the own implementation. Don't do it when using the + system's gettext or catgets functions. + + * dcgettext.c (find_msg): Must not swap domain->hash_size here. + + Sat Dec 9 16:24:37 1995 Ulrich Drepper + + * localealias.c, libintl.inst, libgettext.h, hash-string.h, + gettextP.h, finddomain.c, dcgettext.c, cat-compat.c: + Use PARAMS instead of __P. Suggested by Roland McGrath. + + Tue Dec 5 11:39:14 1995 Larry Schwimmer + + * libgettext.h: Use `#if !defined (_LIBINTL_H)' instead of `#if + !_LIBINTL_H' because Solaris defines _LIBINTL_H as empty. + + Mon Dec 4 15:42:07 1995 Ulrich Drepper + + * Makefile.in (install-src): + Install libintl.inst instead of libintl.h.install. + + Sat Dec 2 22:51:38 1995 Marcus Daniels + + * cat-compat.c (textdomain): + Reverse order in which files are tried you load. First + try local file, when this failed absolute path. + + Wed Nov 29 02:03:53 1995 Nelson H. F. Beebe + + * cat-compat.c (bindtextdomain): Add missing { }. + + Sun Nov 26 18:21:41 1995 Ulrich Drepper + + * libintl.inst: Add missing __P definition. Reported by Nelson Beebe. + + * Makefile.in: + Add dummy `all' and `dvi' goals. Reported by Tom Tromey. + + Sat Nov 25 16:12:01 1995 Franc,ois Pinard + + * hash-string.h: Capitalize arguments of macros. + + Sat Nov 25 12:01:36 1995 Ulrich Drepper + + * Makefile.in (DISTFILES): Prevent files names longer than 13 + characters. libintl.h.glibc->libintl.glibc, + libintl.h.install->libintl.inst. Reported by Joshua R. Poulson. + + Sat Nov 25 11:31:12 1995 Eric Backus + + * dcgettext.c: Fix bug in preprocessor conditionals. + + Sat Nov 25 02:35:27 1995 Nelson H. F. Beebe + + * libgettext.h: Solaris cc does not understand + #if !SYMBOL1 && !SYMBOL2. Sad but true. + + Thu Nov 23 16:22:14 1995 Ulrich Drepper + + * hash-string.h (hash_string): + Fix for machine with >32 bit `unsigned long's. + + * dcgettext.c (DCGETTEXT): + Fix horrible bug in loop for alternative translation. + + Thu Nov 23 01:45:29 1995 Ulrich Drepper + + * po2tbl.sed.in, linux-msg.sed, xopen-msg.sed: + Some further simplifications in message number generation. + + Mon Nov 20 21:08:43 1995 Ulrich Drepper + + * libintl.h.glibc: Use __const instead of const in prototypes. + + * Makefile.in (install-src): + Install libintl.h.install instead of libintl.h. This + is a stripped-down version. Suggested by Peter Miller. + + * libintl.h.install, libintl.h.glibc: Initial revision. + + * localealias.c (_nl_expand_alias, read_alias_file): + Protect prototypes in type casts by __P. + + Tue Nov 14 16:43:58 1995 Ulrich Drepper + + * hash-string.h: Correct prototype for hash_string. + + Sun Nov 12 12:42:30 1995 Ulrich Drepper + + * hash-string.h (hash_string): Add prototype. + + * gettextP.h: Fix copyright. + (SWAP): Add prototype. + + Wed Nov 8 22:56:33 1995 Ulrich Drepper + + * localealias.c (read_alias_file): Forgot sizeof. + Avoid calling *printf function. This introduces a big overhead. + Patch by Roland McGrath. + + Tue Nov 7 14:21:08 1995 Ulrich Drepper + + * finddomain.c, cat-compat.c: Wrong indentation in #if for stpcpy. + + * finddomain.c (stpcpy): + Define substitution function local. The macro was to flaky. + + * cat-compat.c: Fix typo. + + * xopen-msg.sed, linux-msg.sed: + While bringing message number to right place only accept digits. + + * linux-msg.sed, xopen-msg.sed: Now that the counter does not have + leading 0s we don't need to remove them. Reported by Marcus + Daniels. + + * Makefile.in (../po/cat-id-tbl.o): Use $(top_srdir) in + dependency. Reported by Marcus Daniels. + + * cat-compat.c: (stpcpy) [!_LIBC && !HAVE_STPCPY]: Define replacement. + Generally cleanup using #if instead of #ifndef. + + * Makefile.in: Correct typos in comment. By Franc,ois Pinard. + + Mon Nov 6 00:27:02 1995 Ulrich Drepper + + * Makefile.in (install-src): Don't install libintl.h and libintl.a + if we use an available gettext implementation. + + Sun Nov 5 22:02:08 1995 Ulrich Drepper + + * libgettext.h: Fix typo: HAVE_CATGETTS -> HAVE_CATGETS. Reported + by Franc,ois Pinard. + + * libgettext.h: Use #if instead of #ifdef/#ifndef. + + * finddomain.c: + Comments describing what has to be done should start with FIXME. + + Sun Nov 5 19:38:01 1995 Ulrich Drepper + + * Makefile.in (DISTFILES): Split. Use DISTFILES with normal meaning. + DISTFILES.common names the files common to both dist goals. + DISTFILES.gettext are the files only distributed in GNU gettext. + + Sun Nov 5 17:32:54 1995 Ulrich Drepper + + * dcgettext.c (DCGETTEXT): Correct searching in derived locales. + This was necessary since a change in _nl_find_msg several weeks + ago. I really don't know this is still not fixed. + + Sun Nov 5 12:43:12 1995 Ulrich Drepper + + * loadmsgcat.c (_nl_load_domain): Test for FILENAME == NULL. This + might mark a special condition. + + * finddomain.c (make_entry_rec): Don't make illegal entry as decided. + + * Makefile.in (dist): Suppress error message when ln failed. + Get files from $(srcdir) explicitly. + + * libgettext.h (gettext_const): Rename to gettext_noop. + + Fri Nov 3 07:36:50 1995 Ulrich Drepper + + * finddomain.c (make_entry_rec): + Protect against wrong locale names by testing mask. + + * libgettext.h (gettext_const): Add macro definition. + Capitalize macro arguments. + + Thu Nov 2 23:15:51 1995 Ulrich Drepper + + * finddomain.c (_nl_find_domain): + Test for pointer != NULL before accessing value. + Reported by Tom Tromey. + + * gettext.c (NULL): + Define as (void*)0 instad of 0. Reported by Franc,ois Pinard. + + Mon Oct 30 21:28:52 1995 Ulrich Drepper + + * po2tbl.sed.in: Serious typo bug fixed by Jim Meyering. + + Sat Oct 28 23:20:47 1995 Ulrich Drepper + + * libgettext.h: Disable dcgettext optimization for Solaris 2.3. + + * localealias.c (alias_compare): + Peter Miller reported that tolower in some systems is + even dumber than I thought. Protect call by `isupper'. + + Fri Oct 27 22:22:51 1995 Ulrich Drepper + + * Makefile.in (libdir, includedir): New variables. + (install-src): Install libintl.a and libintl.h in correct dirs. + + Fri Oct 27 22:07:29 1995 Ulrich Drepper + + * Makefile.in (SOURCES): Fix typo: intrl.compat.c -> intl-compat.c. + + * po2tbl.sed.in: Patch for buggy SEDs by Christian von Roques. + + * localealias.c: + Fix typo and superflous test. Reported by Christian von Roques. + + Fri Oct 6 11:52:05 1995 Ulrich Drepper + + * finddomain.c (_nl_find_domain): + Correct some remainder from the pre-CEN syntax. Now + we don't have a constant number of successors anymore. + + Wed Sep 27 21:41:13 1995 Ulrich Drepper + + * Makefile.in (DISTFILES): Add libintl.h.glibc. + + * Makefile.in (dist-libc): Add goal for packing sources for glibc. + (COMSRCS, COMHDRS): Splitted to separate sources shared with glibc. + + * loadmsgcat.c: Forget to continue #if line. + + * localealias.c: + [_LIBC]: Rename strcasecmp to __strcasecmp to keep ANSI C name + space clean. + + * dcgettext.c, finddomain.c: Better comment to last change. + + * loadmsgcat.c: + [_LIBC]: Rename fstat, open, close, read, mmap, and munmap to + __fstat, __open, __close, __read, __mmap, and __munmap resp + to keep ANSI C name space clean. + + * finddomain.c: + [_LIBC]: Rename stpcpy to __stpcpy to keep ANSI C name space clean. + + * dcgettext.c: + [_LIBC]: Rename getced and stpcpy to __getcwd and __stpcpy resp to + keep ANSI C name space clean. + + * libgettext.h: + Include sys/types.h for those old SysV systems out there. + Reported by Francesco Potorti`. + + * loadmsgcat.c (use_mmap): Define if compiled for glibc. + + * bindtextdom.c: Include all those standard headers + unconditionally if _LIBC is defined. + + * finddomain.c: Fix 2 times defiend -> defined. + + * textdomain.c: Include libintl.h instead of libgettext.h when + compiling for glibc. Include all those standard headers + unconditionally if _LIBC is defined. + + * localealias.c, loadmsgcat.c: Prepare to be compiled in glibc. + + * gettext.c: + Include libintl.h instead of libgettext.h when compiling for glibc. + Get NULL from stddef.h if we compile for glibc. + + * finddomain.c: Include libintl.h instead of libgettext.h when + compiling for glibc. Include all those standard headers + unconditionally if _LIBC is defined. + + * dcgettext.c: Include all those standard headers unconditionally + if _LIBC is defined. + + * dgettext.c: If compiled in glibc include libintl.h instead of + libgettext.h. + (locale.h): Don't rely on HAVE_LOCALE_H when compiling for glibc. + + * dcgettext.c: If compiled in glibc include libintl.h instead of + libgettext.h. + (getcwd): Don't rely on HAVE_GETCWD when compiling for glibc. + + * bindtextdom.c: + If compiled in glibc include libintl.h instead of libgettext.h. + + Mon Sep 25 22:23:06 1995 Ulrich Drepper + + * localealias.c (_nl_expand_alias): Don't call bsearch if NMAP <= 0. + Reported by Marcus Daniels. + + * cat-compat.c (bindtextdomain): + String used in putenv must not be recycled. + Reported by Marcus Daniels. + + * libgettext.h (__USE_GNU_GETTEXT): + Additional symbol to signal that we use GNU gettext + library. + + * cat-compat.c (bindtextdomain): + Fix bug with the strange stpcpy replacement. + Reported by Nelson Beebe. + + Sat Sep 23 08:23:51 1995 Ulrich Drepper + + * cat-compat.c: Include for stpcpy prototype. + + * localealias.c (read_alias_file): + While expand strdup code temporary variable `cp' hided + higher level variable with same name. Rename to `tp'. + + * textdomain.c (textdomain): + Avoid warning by using temporary variable in strdup code. + + * finddomain.c (_nl_find_domain): Remove unused variable `application'. + + Thu Sep 21 15:51:44 1995 Ulrich Drepper + + * localealias.c (alias_compare): + Use strcasecmp() only if available. Else use + implementation in place. + + * intl-compat.c: + Wrapper functions now call *__ functions instead of __*. + + * libgettext.h: Declare prototypes for *__ functions instead for __*. + + * cat-compat.c, loadmsgcat.c: + Don't use xmalloc, xstrdup, and stpcpy. These functions are not part + of the standard libc and so prevent libintl.a from being used + standalone. + + * bindtextdom.c: + Don't use xmalloc, xstrdup, and stpcpy. These functions are not part + of the standard libc and so prevent libintl.a from being used + standalone. + Rename to bindtextdomain__ if not used in GNU C Library. + + * dgettext.c: + Rename function to dgettext__ if not used in GNU C Library. + + * gettext.c: + Don't use xmalloc, xstrdup, and stpcpy. These functions are not part + of the standard libc and so prevent libintl.a from being used + standalone. + Functions now called gettext__ if not used in GNU C Library. + + * dcgettext.c, localealias.c, textdomain.c, finddomain.c: + Don't use xmalloc, xstrdup, and stpcpy. These functions are not part + of the standard libc and so prevent libintl.a from being used + standalone. + + Sun Sep 17 23:14:49 1995 Ulrich Drepper + + * finddomain.c: Correct some bugs in handling of CEN standard + locale definitions. + + Thu Sep 7 01:49:28 1995 Ulrich Drepper + + * finddomain.c: Implement CEN syntax. + + * gettextP.h (loaded_domain): Extend number of successors to 31. + + Sat Aug 19 19:25:29 1995 Ulrich Drepper + + * Makefile.in (aliaspath): Remove path to X11 locale dir. + + * Makefile.in: Make install-src depend on install. This helps + gettext to install the sources and other packages can use the + install goal. + + Sat Aug 19 15:19:33 1995 Ulrich Drepper + + * Makefile.in (uninstall): Remove stuff installed by install-src. + + Tue Aug 15 13:13:53 1995 Ulrich Drepper + + * VERSION.in: Initial revision. + + * Makefile.in (DISTFILES): + Add VERSION file. This is not necessary for gettext, but + for other packages using this library. + + Tue Aug 15 06:16:44 1995 Ulrich Drepper + + * gettextP.h (_nl_find_domain): + New prototype after changing search strategy. + + * finddomain.c (_nl_find_domain): + We now try only to find a specified catalog. Fall back to other + catalogs listed in the locale list is now done in __dcgettext. + + * dcgettext.c (__dcgettext): + Now we provide message fall back even to different languages. + I.e. if a message is not available in one language all the other + in the locale list a tried. Formerly fall back was only possible + within one language. Implemented by moving one loop from + _nl_find_domain to here. + + Mon Aug 14 23:45:50 1995 Ulrich Drepper + + * Makefile.in (gettextsrcdir): + Directory where source of GNU gettext library are made + available. + (INSTALL, INSTALL_DATA): Programs used for installing sources. + (gettext-src): New. Rule to install GNU gettext sources for use in + gettextize shell script. + + Sun Aug 13 14:40:48 1995 Ulrich Drepper + + * loadmsgcat.c (_nl_load_domain): + Use mmap for loading only when munmap function is + also available. + + * Makefile.in (install): Depend on `all' goal. + + Wed Aug 9 11:04:33 1995 Ulrich Drepper + + * localealias.c (read_alias_file): + Do not overwrite '\n' when terminating alias value string. + + * localealias.c (read_alias_file): + Handle long lines. Ignore the rest not fitting in + the buffer after the initial `fgets' call. + + Wed Aug 9 00:54:29 1995 Ulrich Drepper + + * gettextP.h (_nl_load_domain): + Add prototype, replacing prototype for _nl_load_msg_cat. + + * finddomain.c (_nl_find_domain): + Remove unneeded variable filename and filename_len. + (expand_alias): Remove prototype because functions does not + exist anymore. + + * localealias.c (read_alias_file): + Change type of fname_len parameter to int. + (xmalloc): Add prototype. + + * loadmsgcat.c: Better prototypes for xmalloc. + + Tue Aug 8 22:30:39 1995 Ulrich Drepper + + * finddomain.c (_nl_find_domain): + Allow alias name to be constructed from the four components. + + * Makefile.in (aliaspath): New variable. Set to preliminary value. + (SOURCES): Add localealias.c. + (OBJECTS): Add localealias.o. + + * gettextP.h: Add prototype for _nl_expand_alias. + + * finddomain.c: Aliasing handled in intl/localealias.c. + + * localealias.c: Aliasing for locale names. + + * bindtextdom.c: Better prototypes for xmalloc and xstrdup. + + Mon Aug 7 23:47:42 1995 Ulrich Drepper + + * Makefile.in (DISTFILES): gettext.perl is now found in misc/. + + * cat-compat.c (bindtextdomain): + Correct implementation. dirname parameter was not used. + Reported by Marcus Daniels. + + * gettextP.h (loaded_domain): + New fields `successor' and `decided' for oo, lazy + message handling implementation. + + * dcgettext.c: + Adopt for oo, lazy message handliing. + Now we can inherit translations from less specific locales. + (find_msg): New function. + + * loadmsgcat.c, finddomain.c: + Complete rewrite. Implement oo, lazy message handling :-). + We now have an additional environment variable `LANGUAGE' with + a higher priority than LC_ALL for the LC_MESSAGE locale. + Here we can set a colon separated list of specifications each + of the form `language[_territory[.codeset]][@modifier]'. + + Sat Aug 5 09:55:42 1995 Ulrich Drepper + + * finddomain.c (unistd.h): + Include to get _PC_PATH_MAX defined on system having it. + + Fri Aug 4 22:42:00 1995 Ulrich Drepper + + * finddomain.c (stpcpy): Include prototype. + + * Makefile.in (dist): Remove `copying instead' message. + + Wed Aug 2 18:52:03 1995 Ulrich Drepper + + * Makefile.in (ID, TAGS): Do not use $^. + + Tue Aug 1 20:07:11 1995 Ulrich Drepper + + * Makefile.in (TAGS, ID): Use $^ as command argument. + (TAGS): Give etags -o option t write to current directory, + not $(srcdir). + (ID): Use $(srcdir) instead os $(top_srcdir)/src. + (distclean): Remove ID. + + Sun Jul 30 11:51:46 1995 Ulrich Drepper + + * Makefile.in (gnulocaledir): + New variable, always using share/ for data directory. + (DEFS): Add GNULOCALEDIR, used in finddomain.c. + + * finddomain.c (_nl_default_dirname): + Set to GNULOCALEDIR, because it always has to point + to the directory where GNU gettext Library writes it to. + + * intl-compat.c (textdomain, bindtextdomain): + Undefine macros before function definition. + + Sat Jul 22 01:10:02 1995 Ulrich Drepper + + * libgettext.h (_LIBINTL_H): + Protect definition in case where this file is included as + libgettext.h on Solaris machines. Add comment about this. + + Wed Jul 19 02:36:42 1995 Ulrich Drepper + + * intl-compat.c (textdomain): Correct typo. + + Wed Jul 19 01:51:35 1995 Ulrich Drepper + + * dcgettext.c (dcgettext): Function now called __dcgettext. + + * dgettext.c (dgettext): Now called __dgettext and calls + __dcgettext. + + * gettext.c (gettext): + Function now called __gettext and calls __dgettext. + + * textdomain.c (textdomain): Function now called __textdomain. + + * bindtextdom.c (bindtextdomain): Function now called + __bindtextdomain. + + * intl-compat.c: Initial revision. + + * Makefile.in (SOURCES): Add intl-compat.c. + (OBJECTS): We always compile the GNU gettext library functions. + OBJECTS contains all objects but cat-compat.o, ../po/cat-if-tbl.o, + and intl-compat.o. + (GETTOBJS): Contains now only intl-compat.o. + + * libgettext.h: + Re-include protection matches dualistic character of libgettext.h. + For all functions in GNU gettext library define __ counter part. + + * finddomain.c (strchr): Define as index if not found in C library. + (_nl_find_domain): For relative paths paste / in between. + + Tue Jul 18 16:37:45 1995 Ulrich Drepper + + * loadmsgcat.c, finddomain.c: Add inclusion of sys/types.h. + + * xopen-msg.sed: Fix bug with `msgstr ""' lines. + A little bit better comments. + + Tue Jul 18 01:18:27 1995 Ulrich Drepper + + * Makefile.in: + po-mode.el, makelinks, combine-sh are now found in ../misc. + + * po-mode.el, makelinks, combine-sh, elisp-comp: + Moved to ../misc/. + + * libgettext.h, gettextP.h, gettext.h: Uniform test for __STDC__. + + Sun Jul 16 22:33:02 1995 Ulrich Drepper + + * Makefile.in (INSTALL, INSTALL_DATA): New variables. + (install-data, uninstall): Install/uninstall .elc file. + + * po-mode.el (Installation comment): + Add .pox as possible extension of .po files. + + Sun Jul 16 13:23:27 1995 Ulrich Drepper + + * elisp-comp: Complete new version by Franc,ois: This does not + fail when not compiling in the source directory. + + Sun Jul 16 00:12:17 1995 Ulrich Drepper + + * Makefile.in (../po/cat-id-tbl.o): + Use $(MAKE) instead of make for recursive make. + + * Makefile.in (.el.elc): Use $(SHELL) instead of /bin/sh. + (install-exec): Add missing dummy goal. + (install-data, uninstall): @ in multi-line shell command at + beginning, not in front of echo. Reported by Eric Backus. + + Sat Jul 15 00:21:28 1995 Ulrich Drepper + + * Makefile.in (DISTFILES): + Rename libgettext.perl to gettext.perl to fit in 14 chars + file systems. + + * gettext.perl: + Rename to gettext.perl to fit in 14 chars file systems. + + Thu Jul 13 23:17:20 1995 Ulrich Drepper + + * cat-compat.c: If !STDC_HEADERS try to include malloc.h. + + Thu Jul 13 20:55:02 1995 Ulrich Drepper + + * po2tbl.sed.in: Pretty printing. + + * linux-msg.sed, xopen-msg.sed: + Correct bugs with handling substitute flags in branches. + + * hash-string.h (hash_string): + Old K&R compilers don't under stand `unsigned char'. + + * gettext.h (nls_uint32): + Some old K&R compilers (eg HP) don't understand `unsigned int'. + + * cat-compat.c (msg_to_cat_id): De-ANSI-fy prototypes. + + Thu Jul 13 01:34:33 1995 Ulrich Drepper + + * Makefile.in (ELCFILES): New variable. + (DISTFILES): Add elisp-comp. + Add implicit rule for .el -> .elc compilation. + (install-data): install $ELCFILES + (clean): renamed po-to-tbl and po-to-msg to po2tbl and po2msg resp. + + * elisp-comp: Initial revision + + Wed Jul 12 16:14:52 1995 Ulrich Drepper + + * Makefile.in: + cat-id-tbl.c is now found in po/. This enables us to use an identical + intl/ directory in all packages. + + * dcgettext.c (dcgettext): hashing does not work for table size <= 2. + + * textdomain.c: fix typo (#if def -> #if defined) + + Tue Jul 11 18:44:43 1995 Ulrich Drepper + + * Makefile.in (stamp-cat-id): use top_srcdir to address source files + (DISTFILES,distclean): move tupdate.perl to src/ + + * po-to-tbl.sed.in: + add additional jump to clear change flag to recognize multiline strings + + Tue Jul 11 01:32:50 1995 Ulrich Drepper + + * textdomain.c: Protect inclusion of stdlib.h and string.h. + + * loadmsgcat.c: Protect inclusion of stdlib.h. + + * libgettext.h: Protect inclusion of locale.h. + Allow use in C++ programs. + Define NULL is not happened already. + + * Makefile.in (DISTFILES): ship po-to-tbl.sed.in instead of + po-to-tbl.sed. + (distclean): remove po-to-tbl.sed and tupdate.perl. + + * tupdate.perl.in: Substitute Perl path even in exec line. + Don't include entries without translation from old .po file. + + Tue Jul 4 00:41:51 1995 Ulrich Drepper + + * tupdate.perl.in: use "Updated: " in msgid "". + + * cat-compat.c: Fix typo (LOCALDIR -> LOCALEDIR). + Define getenv if !__STDC__. + + * bindtextdom.c: Protect stdlib.h and string.h inclusion. + Define free if !__STDC__. + + * finddomain.c: Change DEF_MSG_DOM_DIR to LOCALEDIR. + Define free if !__STDC__. + + * cat-compat.c: Change DEF_MSG_DOM_DIR to LOCALEDIR. + + Mon Jul 3 23:56:30 1995 Ulrich Drepper + + * Makefile.in: Use LOCALEDIR instead of DEF_MSG_DOM_DIR. + Remove unneeded $(srcdir) from Makefile.in dependency. + + * makelinks: Add copyright and short description. + + * po-mode.el: Last version for 0.7. + + * tupdate.perl.in: Fix die message. + + * dcgettext.c: Protect include of string.h. + + * gettext.c: Protect include of stdlib.h and further tries to get NULL. + + * finddomain.c: Some corrections in includes. + + * Makefile.in (INCLUDES): Prune list correct path to Makefile.in. + + * po-to-tbl.sed: Adopt for new .po file format. + + * linux-msg.sed, xopen-msg.sed: Adopt for new .po file format. + + Sun Jul 2 23:55:03 1995 Ulrich Drepper + + * tupdate.perl.in: Complete rewrite for new .po file format. + + Sun Jul 2 02:06:50 1995 Ulrich Drepper + + * First official release. This directory contains all the code + needed to internationalize own packages. It provides functions + which allow to use the X/Open catgets function with an interface + like the Uniforum gettext function. For system which does not + have neither of those a complete implementation is provided. diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/Makefile.in gtkali-0.9.5_jp/intl/Makefile.in *** gtkali-0.9.5/intl/Makefile.in Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/Makefile.in Fri Jun 16 10:50:02 2000 *************** *** 0 **** --- 1,214 ---- + # Makefile for directory with message catalog handling in GNU NLS Utilities. + # Copyright (C) 1995, 1996, 1997 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 + # the Free Software Foundation; either version 2, or (at your option) + # any later version. + # + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ + + SHELL = /bin/sh + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + top_builddir = .. + VPATH = @srcdir@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ + transform = @program_transform_name@ + libdir = $(exec_prefix)/lib + includedir = $(prefix)/include + datadir = $(prefix)/@DATADIRNAME@ + localedir = $(datadir)/locale + gnulocaledir = $(prefix)/share/locale + gettextsrcdir = @datadir@/gettext/intl + aliaspath = $(localedir):. + subdir = intl + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + + l = @l@ + + AR = ar + CC = @CC@ + LIBTOOL = @LIBTOOL@ + RANLIB = @RANLIB@ + + DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \ + -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@ + CPPFLAGS = @CPPFLAGS@ + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ + + COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) + + HEADERS = $(COMHDRS) libgettext.h loadinfo.h + COMHDRS = gettext.h gettextP.h hash-string.h + SOURCES = $(COMSRCS) intl-compat.c cat-compat.c + COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \ + finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \ + explodename.c + OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \ + finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \ + explodename.$lo + CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo + GETTOBJS = intl-compat.$lo + DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \ + xopen-msg.sed $(HEADERS) $(SOURCES) + DISTFILES.normal = VERSION + DISTFILES.gettext = libintl.glibc intlh.inst.in + + .SUFFIXES: + .SUFFIXES: .c .o .lo + .c.o: + $(COMPILE) $< + .c.lo: + $(LIBTOOL) --mode=compile $(COMPILE) $< + + INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib + + all: all-@USE_INCLUDED_LIBINTL@ + + all-yes: libintl.$la intlh.inst + all-no: + + libintl.a: $(OBJECTS) + rm -f $@ + $(AR) cru $@ $(OBJECTS) + $(RANLIB) $@ + + libintl.la: $(OBJECTS) + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \ + -version-info 1:0 -rpath $(libdir) + + ../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot + cd ../po && $(MAKE) cat-id-tbl.$lo + + check: all + + # This installation goal is only used in GNU gettext. Packages which + # only use the library should use install instead. + + # We must not install the libintl.h/libintl.a files if we are on a + # system which has the gettext() function in its C library or in a + # separate library or use the catgets interface. A special case is + # where configure found a previously installed GNU gettext library. + # If you want to use the one which comes with this version of the + # package, you have to use `configure --with-included-gettext'. + install: install-exec install-data + install-exec: all + if test "$(PACKAGE)" = "gettext" \ + && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ + if test -r $(MKINSTALLDIRS); then \ + $(MKINSTALLDIRS) $(libdir) $(includedir); \ + else \ + $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \ + fi; \ + $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \ + $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \ + else \ + : ; \ + fi + install-data: all + if test "$(PACKAGE)" = "gettext"; then \ + if test -r $(MKINSTALLDIRS); then \ + $(MKINSTALLDIRS) $(gettextsrcdir); \ + else \ + $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ + fi; \ + $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \ + dists="$(DISTFILES.common)"; \ + for file in $$dists; do \ + $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \ + done; \ + else \ + : ; \ + fi + + # Define this as empty until I found a useful application. + installcheck: + + uninstall: + dists="$(DISTFILES.common)"; \ + for file in $$dists; do \ + rm -f $(gettextsrcdir)/$$file; \ + done + + info dvi: + + $(OBJECTS): ../config.h libgettext.h + bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h + dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h + + tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) + here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES) + + id: ID + + ID: $(HEADERS) $(SOURCES) + here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES) + + + mostlyclean: + rm -f *.a *.o *.lo core core.* + + clean: mostlyclean + + distclean: clean + rm -f Makefile ID TAGS po2msg.sed po2tbl.sed + + maintainer-clean: distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + + + # GNU gettext needs not contain the file `VERSION' but contains some + # other files which should not be distributed in other packages. + distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) + dist distdir: Makefile $(DISTFILES) + if test "$(PACKAGE)" = gettext; then \ + additional="$(DISTFILES.gettext)"; \ + else \ + additional="$(DISTFILES.normal)"; \ + fi; \ + for file in $(DISTFILES.common) $$additional; do \ + ln $(srcdir)/$$file $(distdir) 2> /dev/null \ + || cp -p $(srcdir)/$$file $(distdir); \ + done + + dist-libc: + tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc + + Makefile: Makefile.in ../config.status + cd .. \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + # The dependency for intlh.inst is different in gettext and all other + # packages. Because we cannot you GNU make features we have to solve + # the problem while rewriting Makefile.in. + @GT_YES@intlh.inst: intlh.inst.in ../config.status + @GT_YES@ cd .. \ + @GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ + @GT_YES@ $(SHELL) ./config.status + @GT_NO@.PHONY: intlh.inst + @GT_NO@intlh.inst: + + # Tell versions [3.59,3.63) of GNU make not to export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/VERSION gtkali-0.9.5_jp/intl/VERSION *** gtkali-0.9.5/intl/VERSION Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/VERSION Fri Jun 16 10:50:02 2000 *************** *** 0 **** --- 1 ---- + GNU gettext library from gettext-0.10.35 diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/bindtextdom.c gtkali-0.9.5_jp/intl/bindtextdom.c *** gtkali-0.9.5/intl/bindtextdom.c Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/bindtextdom.c Fri Jun 16 10:50:02 2000 *************** *** 0 **** --- 1,203 ---- + /* Implementation of the bindtextdomain(3) function + Copyright (C) 1995, 1996, 1997, 1998 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + #ifdef HAVE_CONFIG_H + # include + #endif + + #if defined STDC_HEADERS || defined _LIBC + # include + #else + # ifdef HAVE_MALLOC_H + # include + # else + void free (); + # endif + #endif + + #if defined HAVE_STRING_H || defined _LIBC + # include + #else + # include + # ifndef memcpy + # define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) + # endif + #endif + + #ifdef _LIBC + # include + #else + # include "libgettext.h" + #endif + #include "gettext.h" + #include "gettextP.h" + + /* @@ end of prolog @@ */ + + /* Contains the default location of the message catalogs. */ + extern const char _nl_default_dirname[]; + + /* List with bindings of specific domains. */ + extern struct binding *_nl_domain_bindings; + + + /* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ + #ifdef _LIBC + # define BINDTEXTDOMAIN __bindtextdomain + # ifndef strdup + # define strdup(str) __strdup (str) + # endif + #else + # define BINDTEXTDOMAIN bindtextdomain__ + #endif + + /* Specify that the DOMAINNAME message catalog will be found + in DIRNAME rather than in the system locale data base. */ + char * + BINDTEXTDOMAIN (domainname, dirname) + const char *domainname; + const char *dirname; + { + struct binding *binding; + + /* Some sanity checks. */ + if (domainname == NULL || domainname[0] == '\0') + return NULL; + + for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) + { + int compare = strcmp (domainname, binding->domainname); + if (compare == 0) + /* We found it! */ + break; + if (compare < 0) + { + /* It is not in the list. */ + binding = NULL; + break; + } + } + + if (dirname == NULL) + /* The current binding has be to returned. */ + return binding == NULL ? (char *) _nl_default_dirname : binding->dirname; + + if (binding != NULL) + { + /* The domain is already bound. If the new value and the old + one are equal we simply do nothing. Otherwise replace the + old binding. */ + if (strcmp (dirname, binding->dirname) != 0) + { + char *new_dirname; + + if (strcmp (dirname, _nl_default_dirname) == 0) + new_dirname = (char *) _nl_default_dirname; + else + { + #if defined _LIBC || defined HAVE_STRDUP + new_dirname = strdup (dirname); + if (new_dirname == NULL) + return NULL; + #else + size_t len = strlen (dirname) + 1; + new_dirname = (char *) malloc (len); + if (new_dirname == NULL) + return NULL; + + memcpy (new_dirname, dirname, len); + #endif + } + + if (binding->dirname != _nl_default_dirname) + free (binding->dirname); + + binding->dirname = new_dirname; + } + } + else + { + /* We have to create a new binding. */ + #if !defined _LIBC && !defined HAVE_STRDUP + size_t len; + #endif + struct binding *new_binding = + (struct binding *) malloc (sizeof (*new_binding)); + + if (new_binding == NULL) + return NULL; + + #if defined _LIBC || defined HAVE_STRDUP + new_binding->domainname = strdup (domainname); + if (new_binding->domainname == NULL) + return NULL; + #else + len = strlen (domainname) + 1; + new_binding->domainname = (char *) malloc (len); + if (new_binding->domainname == NULL) + return NULL; + memcpy (new_binding->domainname, domainname, len); + #endif + + if (strcmp (dirname, _nl_default_dirname) == 0) + new_binding->dirname = (char *) _nl_default_dirname; + else + { + #if defined _LIBC || defined HAVE_STRDUP + new_binding->dirname = strdup (dirname); + if (new_binding->dirname == NULL) + return NULL; + #else + len = strlen (dirname) + 1; + new_binding->dirname = (char *) malloc (len); + if (new_binding->dirname == NULL) + return NULL; + memcpy (new_binding->dirname, dirname, len); + #endif + } + + /* Now enqueue it. */ + if (_nl_domain_bindings == NULL + || strcmp (domainname, _nl_domain_bindings->domainname) < 0) + { + new_binding->next = _nl_domain_bindings; + _nl_domain_bindings = new_binding; + } + else + { + binding = _nl_domain_bindings; + while (binding->next != NULL + && strcmp (domainname, binding->next->domainname) > 0) + binding = binding->next; + + new_binding->next = binding->next; + binding->next = new_binding; + } + + binding = new_binding; + } + + return binding->dirname; + } + + #ifdef _LIBC + /* Alias for function name in GNU C Library. */ + weak_alias (__bindtextdomain, bindtextdomain); + #endif diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/cat-compat.c gtkali-0.9.5_jp/intl/cat-compat.c *** gtkali-0.9.5/intl/cat-compat.c Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/cat-compat.c Fri Jun 16 10:50:02 2000 *************** *** 0 **** --- 1,262 ---- + /* Compatibility code for gettext-using-catgets interface. + Copyright (C) 1995, 1997 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + #ifdef HAVE_CONFIG_H + # include + #endif + + #include + + #ifdef STDC_HEADERS + # include + # include + #else + char *getenv (); + # ifdef HAVE_MALLOC_H + # include + # endif + #endif + + #ifdef HAVE_NL_TYPES_H + # include + #endif + + #include "libgettext.h" + + /* @@ end of prolog @@ */ + + /* XPG3 defines the result of `setlocale (category, NULL)' as: + ``Directs `setlocale()' to query `category' and return the current + setting of `local'.'' + However it does not specify the exact format. And even worse: POSIX + defines this not at all. So we can use this feature only on selected + system (e.g. those using GNU C Library). */ + #ifdef _LIBC + # define HAVE_LOCALE_NULL + #endif + + /* The catalog descriptor. */ + static nl_catd catalog = (nl_catd) -1; + + /* Name of the default catalog. */ + static const char default_catalog_name[] = "messages"; + + /* Name of currently used catalog. */ + static const char *catalog_name = default_catalog_name; + + /* Get ID for given string. If not found return -1. */ + static int msg_to_cat_id PARAMS ((const char *msg)); + + /* Substitution for systems lacking this function in their C library. */ + #if !_LIBC && !HAVE_STPCPY + static char *stpcpy PARAMS ((char *dest, const char *src)); + #endif + + + /* Set currently used domain/catalog. */ + char * + textdomain (domainname) + const char *domainname; + { + nl_catd new_catalog; + char *new_name; + size_t new_name_len; + char *lang; + + #if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES \ + && defined HAVE_LOCALE_NULL + lang = setlocale (LC_MESSAGES, NULL); + #else + lang = getenv ("LC_ALL"); + if (lang == NULL || lang[0] == '\0') + { + lang = getenv ("LC_MESSAGES"); + if (lang == NULL || lang[0] == '\0') + lang = getenv ("LANG"); + } + #endif + if (lang == NULL || lang[0] == '\0') + lang = "C"; + + /* See whether name of currently used domain is asked. */ + if (domainname == NULL) + return (char *) catalog_name; + + if (domainname[0] == '\0') + domainname = default_catalog_name; + + /* Compute length of added path element. */ + new_name_len = sizeof (LOCALEDIR) - 1 + 1 + strlen (lang) + + sizeof ("/LC_MESSAGES/") - 1 + sizeof (PACKAGE) - 1 + + sizeof (".cat"); + + new_name = (char *) malloc (new_name_len); + if (new_name == NULL) + return NULL; + + strcpy (new_name, PACKAGE); + new_catalog = catopen (new_name, 0); + + if (new_catalog == (nl_catd) -1) + { + /* NLSPATH search didn't work, try absolute path */ + sprintf (new_name, "%s/%s/LC_MESSAGES/%s.cat", LOCALEDIR, lang, + PACKAGE); + new_catalog = catopen (new_name, 0); + + if (new_catalog == (nl_catd) -1) + { + free (new_name); + return (char *) catalog_name; + } + } + + /* Close old catalog. */ + if (catalog != (nl_catd) -1) + catclose (catalog); + if (catalog_name != default_catalog_name) + free ((char *) catalog_name); + + catalog = new_catalog; + catalog_name = new_name; + + return (char *) catalog_name; + } + + char * + bindtextdomain (domainname, dirname) + const char *domainname; + const char *dirname; + { + #if HAVE_SETENV || HAVE_PUTENV + char *old_val, *new_val, *cp; + size_t new_val_len; + + /* This does not make much sense here but to be compatible do it. */ + if (domainname == NULL) + return NULL; + + /* Compute length of added path element. If we use setenv we don't need + the first byts for NLSPATH=, but why complicate the code for this + peanuts. */ + new_val_len = sizeof ("NLSPATH=") - 1 + strlen (dirname) + + sizeof ("/%L/LC_MESSAGES/%N.cat"); + + old_val = getenv ("NLSPATH"); + if (old_val == NULL || old_val[0] == '\0') + { + old_val = NULL; + new_val_len += 1 + sizeof (LOCALEDIR) - 1 + + sizeof ("/%L/LC_MESSAGES/%N.cat"); + } + else + new_val_len += strlen (old_val); + + new_val = (char *) malloc (new_val_len); + if (new_val == NULL) + return NULL; + + # if HAVE_SETENV + cp = new_val; + # else + cp = stpcpy (new_val, "NLSPATH="); + # endif + + cp = stpcpy (cp, dirname); + cp = stpcpy (cp, "/%L/LC_MESSAGES/%N.cat:"); + + if (old_val == NULL) + { + # if __STDC__ + stpcpy (cp, LOCALEDIR "/%L/LC_MESSAGES/%N.cat"); + # else + + cp = stpcpy (cp, LOCALEDIR); + stpcpy (cp, "/%L/LC_MESSAGES/%N.cat"); + # endif + } + else + stpcpy (cp, old_val); + + # if HAVE_SETENV + setenv ("NLSPATH", new_val, 1); + free (new_val); + # else + putenv (new_val); + /* Do *not* free the environment entry we just entered. It is used + from now on. */ + # endif + + #endif + + return (char *) domainname; + } + + #undef gettext + char * + gettext (msg) + const char *msg; + { + int msgid; + + if (msg == NULL || catalog == (nl_catd) -1) + return (char *) msg; + + /* Get the message from the catalog. We always use set number 1. + The message ID is computed by the function `msg_to_cat_id' + which works on the table generated by `po-to-tbl'. */ + msgid = msg_to_cat_id (msg); + if (msgid == -1) + return (char *) msg; + + return catgets (catalog, 1, msgid, (char *) msg); + } + + /* Look through the table `_msg_tbl' which has `_msg_tbl_length' entries + for the one equal to msg. If it is found return the ID. In case when + the string is not found return -1. */ + static int + msg_to_cat_id (msg) + const char *msg; + { + int cnt; + + for (cnt = 0; cnt < _msg_tbl_length; ++cnt) + if (strcmp (msg, _msg_tbl[cnt]._msg) == 0) + return _msg_tbl[cnt]._msg_number; + + return -1; + } + + + /* @@ begin of epilog @@ */ + + /* We don't want libintl.a to depend on any other library. So we + avoid the non-standard function stpcpy. In GNU C Library this + function is available, though. Also allow the symbol HAVE_STPCPY + to be defined. */ + #if !_LIBC && !HAVE_STPCPY + static char * + stpcpy (dest, src) + char *dest; + const char *src; + { + while ((*dest++ = *src++) != '\0') + /* Do nothing. */ ; + return dest - 1; + } + #endif diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/dcgettext.c gtkali-0.9.5_jp/intl/dcgettext.c *** gtkali-0.9.5/intl/dcgettext.c Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/dcgettext.c Fri Jun 16 10:50:03 2000 *************** *** 0 **** --- 1,624 ---- + /* Implementation of the dcgettext(3) function. + Copyright (C) 1995, 1996, 1997, 1998 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + #ifdef HAVE_CONFIG_H + # include + #endif + + #include + + #ifdef __GNUC__ + # define alloca __builtin_alloca + # define HAVE_ALLOCA 1 + #else + # if defined HAVE_ALLOCA_H || defined _LIBC + # include + # else + # ifdef _AIX + #pragma alloca + # else + # ifndef alloca + char *alloca (); + # endif + # endif + # endif + #endif + + #include + #ifndef errno + extern int errno; + #endif + #ifndef __set_errno + # define __set_errno(val) errno = (val) + #endif + + #if defined STDC_HEADERS || defined _LIBC + # include + #else + char *getenv (); + # ifdef HAVE_MALLOC_H + # include + # else + void free (); + # endif + #endif + + #if defined HAVE_STRING_H || defined _LIBC + # ifndef _GNU_SOURCE + # define _GNU_SOURCE 1 + # endif + # include + #else + # include + #endif + #if !HAVE_STRCHR && !defined _LIBC + # ifndef strchr + # define strchr index + # endif + #endif + + #if defined HAVE_UNISTD_H || defined _LIBC + # include + #endif + + #include "gettext.h" + #include "gettextP.h" + #ifdef _LIBC + # include + #else + # include "libgettext.h" + #endif + #include "hash-string.h" + + /* @@ end of prolog @@ */ + + #ifdef _LIBC + /* Rename the non ANSI C functions. This is required by the standard + because some ANSI C functions will require linking with this object + file and the name space must not be polluted. */ + # define getcwd __getcwd + # ifndef stpcpy + # define stpcpy __stpcpy + # endif + #else + # if !defined HAVE_GETCWD + char *getwd (); + # define getcwd(buf, max) getwd (buf) + # else + char *getcwd (); + # endif + # ifndef HAVE_STPCPY + static char *stpcpy PARAMS ((char *dest, const char *src)); + # endif + #endif + + /* Amount to increase buffer size by in each try. */ + #define PATH_INCR 32 + + /* The following is from pathmax.h. */ + /* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define + PATH_MAX but might cause redefinition warnings when sys/param.h is + later included (as on MORE/BSD 4.3). */ + #if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__)) + # include + #endif + + #ifndef _POSIX_PATH_MAX + # define _POSIX_PATH_MAX 255 + #endif + + #if !defined(PATH_MAX) && defined(_PC_PATH_MAX) + # define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX)) + #endif + + /* Don't include sys/param.h if it already has been. */ + #if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN) + # include + #endif + + #if !defined(PATH_MAX) && defined(MAXPATHLEN) + # define PATH_MAX MAXPATHLEN + #endif + + #ifndef PATH_MAX + # define PATH_MAX _POSIX_PATH_MAX + #endif + + /* XPG3 defines the result of `setlocale (category, NULL)' as: + ``Directs `setlocale()' to query `category' and return the current + setting of `local'.'' + However it does not specify the exact format. And even worse: POSIX + defines this not at all. So we can use this feature only on selected + system (e.g. those using GNU C Library). */ + #ifdef _LIBC + # define HAVE_LOCALE_NULL + #endif + + /* Name of the default domain used for gettext(3) prior any call to + textdomain(3). The default value for this is "messages". */ + const char _nl_default_default_domain[] = "messages"; + + /* Value used as the default domain for gettext(3). */ + const char *_nl_current_default_domain = _nl_default_default_domain; + + /* Contains the default location of the message catalogs. */ + const char _nl_default_dirname[] = GNULOCALEDIR; + + /* List with bindings of specific domains created by bindtextdomain() + calls. */ + struct binding *_nl_domain_bindings; + + /* Prototypes for local functions. */ + static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file, + const char *msgid)) internal_function; + static const char *category_to_name PARAMS ((int category)) internal_function; + static const char *guess_category_value PARAMS ((int category, + const char *categoryname)) + internal_function; + + + /* For those loosing systems which don't have `alloca' we have to add + some additional code emulating it. */ + #ifdef HAVE_ALLOCA + /* Nothing has to be done. */ + # define ADD_BLOCK(list, address) /* nothing */ + # define FREE_BLOCKS(list) /* nothing */ + #else + struct block_list + { + void *address; + struct block_list *next; + }; + # define ADD_BLOCK(list, addr) \ + do { \ + struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ + /* If we cannot get a free block we cannot add the new element to \ + the list. */ \ + if (newp != NULL) { \ + newp->address = (addr); \ + newp->next = (list); \ + (list) = newp; \ + } \ + } while (0) + # define FREE_BLOCKS(list) \ + do { \ + while (list != NULL) { \ + struct block_list *old = list; \ + list = list->next; \ + free (old); \ + } \ + } while (0) + # undef alloca + # define alloca(size) (malloc (size)) + #endif /* have alloca */ + + + /* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ + #ifdef _LIBC + # define DCGETTEXT __dcgettext + #else + # define DCGETTEXT dcgettext__ + #endif + + /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY + locale. */ + char * + DCGETTEXT (domainname, msgid, category) + const char *domainname; + const char *msgid; + int category; + { + #ifndef HAVE_ALLOCA + struct block_list *block_list = NULL; + #endif + struct loaded_l10nfile *domain; + struct binding *binding; + const char *categoryname; + const char *categoryvalue; + char *dirname, *xdomainname; + char *single_locale; + char *retval; + int saved_errno = errno; + + /* If no real MSGID is given return NULL. */ + if (msgid == NULL) + return NULL; + + /* If DOMAINNAME is NULL, we are interested in the default domain. If + CATEGORY is not LC_MESSAGES this might not make much sense but the + defintion left this undefined. */ + if (domainname == NULL) + domainname = _nl_current_default_domain; + + /* First find matching binding. */ + for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) + { + int compare = strcmp (domainname, binding->domainname); + if (compare == 0) + /* We found it! */ + break; + if (compare < 0) + { + /* It is not in the list. */ + binding = NULL; + break; + } + } + + if (binding == NULL) + dirname = (char *) _nl_default_dirname; + else if (binding->dirname[0] == '/') + dirname = binding->dirname; + else + { + /* We have a relative path. Make it absolute now. */ + size_t dirname_len = strlen (binding->dirname) + 1; + size_t path_max; + char *ret; + + path_max = (unsigned) PATH_MAX; + path_max += 2; /* The getcwd docs say to do this. */ + + dirname = (char *) alloca (path_max + dirname_len); + ADD_BLOCK (block_list, dirname); + + __set_errno (0); + while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE) + { + path_max += PATH_INCR; + dirname = (char *) alloca (path_max + dirname_len); + ADD_BLOCK (block_list, dirname); + __set_errno (0); + } + + if (ret == NULL) + { + /* We cannot get the current working directory. Don't signal an + error but simply return the default string. */ + FREE_BLOCKS (block_list); + __set_errno (saved_errno); + return (char *) msgid; + } + + stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname); + } + + /* Now determine the symbolic name of CATEGORY and its value. */ + categoryname = category_to_name (category); + categoryvalue = guess_category_value (category, categoryname); + + xdomainname = (char *) alloca (strlen (categoryname) + + strlen (domainname) + 5); + ADD_BLOCK (block_list, xdomainname); + + stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"), + domainname), + ".mo"); + + /* Creating working area. */ + single_locale = (char *) alloca (strlen (categoryvalue) + 1); + ADD_BLOCK (block_list, single_locale); + + + /* Search for the given string. This is a loop because we perhaps + got an ordered list of languages to consider for th translation. */ + while (1) + { + /* Make CATEGORYVALUE point to the next element of the list. */ + while (categoryvalue[0] != '\0' && categoryvalue[0] == ':') + ++categoryvalue; + if (categoryvalue[0] == '\0') + { + /* The whole contents of CATEGORYVALUE has been searched but + no valid entry has been found. We solve this situation + by implicitly appending a "C" entry, i.e. no translation + will take place. */ + single_locale[0] = 'C'; + single_locale[1] = '\0'; + } + else + { + char *cp = single_locale; + while (categoryvalue[0] != '\0' && categoryvalue[0] != ':') + *cp++ = *categoryvalue++; + *cp = '\0'; + } + + /* If the current locale value is C (or POSIX) we don't load a + domain. Return the MSGID. */ + if (strcmp (single_locale, "C") == 0 + || strcmp (single_locale, "POSIX") == 0) + { + FREE_BLOCKS (block_list); + __set_errno (saved_errno); + return (char *) msgid; + } + + + /* Find structure describing the message catalog matching the + DOMAINNAME and CATEGORY. */ + domain = _nl_find_domain (dirname, single_locale, xdomainname); + + if (domain != NULL) + { + retval = find_msg (domain, msgid); + + if (retval == NULL) + { + int cnt; + + for (cnt = 0; domain->successor[cnt] != NULL; ++cnt) + { + retval = find_msg (domain->successor[cnt], msgid); + + if (retval != NULL) + break; + } + } + + if (retval != NULL) + { + FREE_BLOCKS (block_list); + __set_errno (saved_errno); + return retval; + } + } + } + /* NOTREACHED */ + } + + #ifdef _LIBC + /* Alias for function name in GNU C Library. */ + weak_alias (__dcgettext, dcgettext); + #endif + + + static char * + internal_function + find_msg (domain_file, msgid) + struct loaded_l10nfile *domain_file; + const char *msgid; + { + size_t top, act, bottom; + struct loaded_domain *domain; + + if (domain_file->decided == 0) + _nl_load_domain (domain_file); + + if (domain_file->data == NULL) + return NULL; + + domain = (struct loaded_domain *) domain_file->data; + + /* Locate the MSGID and its translation. */ + if (domain->hash_size > 2 && domain->hash_tab != NULL) + { + /* Use the hashing table. */ + nls_uint32 len = strlen (msgid); + nls_uint32 hash_val = hash_string (msgid); + nls_uint32 idx = hash_val % domain->hash_size; + nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2)); + nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]); + + if (nstr == 0) + /* Hash table entry is empty. */ + return NULL; + + if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len + && strcmp (msgid, + domain->data + W (domain->must_swap, + domain->orig_tab[nstr - 1].offset)) == 0) + return (char *) domain->data + W (domain->must_swap, + domain->trans_tab[nstr - 1].offset); + + while (1) + { + if (idx >= domain->hash_size - incr) + idx -= domain->hash_size - incr; + else + idx += incr; + + nstr = W (domain->must_swap, domain->hash_tab[idx]); + if (nstr == 0) + /* Hash table entry is empty. */ + return NULL; + + if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len + && strcmp (msgid, + domain->data + W (domain->must_swap, + domain->orig_tab[nstr - 1].offset)) + == 0) + return (char *) domain->data + + W (domain->must_swap, domain->trans_tab[nstr - 1].offset); + } + /* NOTREACHED */ + } + + /* Now we try the default method: binary search in the sorted + array of messages. */ + bottom = 0; + top = domain->nstrings; + while (bottom < top) + { + int cmp_val; + + act = (bottom + top) / 2; + cmp_val = strcmp (msgid, domain->data + + W (domain->must_swap, + domain->orig_tab[act].offset)); + if (cmp_val < 0) + top = act; + else if (cmp_val > 0) + bottom = act + 1; + else + break; + } + + /* If an translation is found return this. */ + return bottom >= top ? NULL : (char *) domain->data + + W (domain->must_swap, + domain->trans_tab[act].offset); + } + + + /* Return string representation of locale CATEGORY. */ + static const char * + internal_function + category_to_name (category) + int category; + { + const char *retval; + + switch (category) + { + #ifdef LC_COLLATE + case LC_COLLATE: + retval = "LC_COLLATE"; + break; + #endif + #ifdef LC_CTYPE + case LC_CTYPE: + retval = "LC_CTYPE"; + break; + #endif + #ifdef LC_MONETARY + case LC_MONETARY: + retval = "LC_MONETARY"; + break; + #endif + #ifdef LC_NUMERIC + case LC_NUMERIC: + retval = "LC_NUMERIC"; + break; + #endif + #ifdef LC_TIME + case LC_TIME: + retval = "LC_TIME"; + break; + #endif + #ifdef LC_MESSAGES + case LC_MESSAGES: + retval = "LC_MESSAGES"; + break; + #endif + #ifdef LC_RESPONSE + case LC_RESPONSE: + retval = "LC_RESPONSE"; + break; + #endif + #ifdef LC_ALL + case LC_ALL: + /* This might not make sense but is perhaps better than any other + value. */ + retval = "LC_ALL"; + break; + #endif + default: + /* If you have a better idea for a default value let me know. */ + retval = "LC_XXX"; + } + + return retval; + } + + /* Guess value of current locale from value of the environment variables. */ + static const char * + internal_function + guess_category_value (category, categoryname) + int category; + const char *categoryname; + { + const char *retval; + + /* The highest priority value is the `LANGUAGE' environment + variable. This is a GNU extension. */ + retval = getenv ("LANGUAGE"); + if (retval != NULL && retval[0] != '\0') + return retval; + + /* `LANGUAGE' is not set. So we have to proceed with the POSIX + methods of looking to `LC_ALL', `LC_xxx', and `LANG'. On some + systems this can be done by the `setlocale' function itself. */ + #if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL + return setlocale (category, NULL); + #else + /* Setting of LC_ALL overwrites all other. */ + retval = getenv ("LC_ALL"); + if (retval != NULL && retval[0] != '\0') + return retval; + + /* Next comes the name of the desired category. */ + retval = getenv (categoryname); + if (retval != NULL && retval[0] != '\0') + return retval; + + /* Last possibility is the LANG environment variable. */ + retval = getenv ("LANG"); + if (retval != NULL && retval[0] != '\0') + return retval; + + /* We use C as the default domain. POSIX says this is implementation + defined. */ + return "C"; + #endif + } + + /* @@ begin of epilog @@ */ + + /* We don't want libintl.a to depend on any other library. So we + avoid the non-standard function stpcpy. In GNU C Library this + function is available, though. Also allow the symbol HAVE_STPCPY + to be defined. */ + #if !_LIBC && !HAVE_STPCPY + static char * + stpcpy (dest, src) + char *dest; + const char *src; + { + while ((*dest++ = *src++) != '\0') + /* Do nothing. */ ; + return dest - 1; + } + #endif + + + #ifdef _LIBC + /* If we want to free all resources we have to do some work at + program's end. */ + static void __attribute__ ((unused)) + free_mem (void) + { + struct binding *runp; + + for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next) + { + free (runp->domainname); + if (runp->dirname != _nl_default_dirname) + /* Yes, this is a pointer comparison. */ + free (runp->dirname); + } + + if (_nl_current_default_domain != _nl_default_default_domain) + /* Yes, again a pointer comparison. */ + free ((char *) _nl_current_default_domain); + } + + text_set_element (__libc_subfreeres, free_mem); + #endif diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/dgettext.c gtkali-0.9.5_jp/intl/dgettext.c *** gtkali-0.9.5/intl/dgettext.c Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/dgettext.c Fri Jun 16 10:50:03 2000 *************** *** 0 **** --- 1,59 ---- + /* Implementation of the dgettext(3) function + Copyright (C) 1995, 1996, 1997 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + #ifdef HAVE_CONFIG_H + # include + #endif + + #if defined HAVE_LOCALE_H || defined _LIBC + # include + #endif + + #ifdef _LIBC + # include + #else + # include "libgettext.h" + #endif + + /* @@ end of prolog @@ */ + + /* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ + #ifdef _LIBC + # define DGETTEXT __dgettext + # define DCGETTEXT __dcgettext + #else + # define DGETTEXT dgettext__ + # define DCGETTEXT dcgettext__ + #endif + + /* Look up MSGID in the DOMAINNAME message catalog of the current + LC_MESSAGES locale. */ + char * + DGETTEXT (domainname, msgid) + const char *domainname; + const char *msgid; + { + return DCGETTEXT (domainname, msgid, LC_MESSAGES); + } + + #ifdef _LIBC + /* Alias for function name in GNU C Library. */ + weak_alias (__dgettext, dgettext); + #endif diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/explodename.c gtkali-0.9.5_jp/intl/explodename.c *** gtkali-0.9.5/intl/explodename.c Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/explodename.c Fri Jun 16 10:50:03 2000 *************** *** 0 **** --- 1,188 ---- + /* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Contributed by Ulrich Drepper , 1995. + + 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + #ifdef HAVE_CONFIG_H + # include + #endif + + #if defined STDC_HEADERS || defined _LIBC + # include + #endif + + #if defined HAVE_STRING_H || defined _LIBC + # include + #else + # include + #endif + #include + + #include "loadinfo.h" + + /* On some strange systems still no definition of NULL is found. Sigh! */ + #ifndef NULL + # if defined __STDC__ && __STDC__ + # define NULL ((void *) 0) + # else + # define NULL 0 + # endif + #endif + + /* @@ end of prolog @@ */ + + int + _nl_explode_name (name, language, modifier, territory, codeset, + normalized_codeset, special, sponsor, revision) + char *name; + const char **language; + const char **modifier; + const char **territory; + const char **codeset; + const char **normalized_codeset; + const char **special; + const char **sponsor; + const char **revision; + { + enum { undecided, xpg, cen } syntax; + char *cp; + int mask; + + *modifier = NULL; + *territory = NULL; + *codeset = NULL; + *normalized_codeset = NULL; + *special = NULL; + *sponsor = NULL; + *revision = NULL; + + /* Now we determine the single parts of the locale name. First + look for the language. Termination symbols are `_' and `@' if + we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ + mask = 0; + syntax = undecided; + *language = cp = name; + while (cp[0] != '\0' && cp[0] != '_' && cp[0] != '@' + && cp[0] != '+' && cp[0] != ',') + ++cp; + + if (*language == cp) + /* This does not make sense: language has to be specified. Use + this entry as it is without exploding. Perhaps it is an alias. */ + cp = strchr (*language, '\0'); + else if (cp[0] == '_') + { + /* Next is the territory. */ + cp[0] = '\0'; + *territory = ++cp; + + while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@' + && cp[0] != '+' && cp[0] != ',' && cp[0] != '_') + ++cp; + + mask |= TERRITORY; + + if (cp[0] == '.') + { + /* Next is the codeset. */ + syntax = xpg; + cp[0] = '\0'; + *codeset = ++cp; + + while (cp[0] != '\0' && cp[0] != '@') + ++cp; + + mask |= XPG_CODESET; + + if (*codeset != cp && (*codeset)[0] != '\0') + { + *normalized_codeset = _nl_normalize_codeset (*codeset, + cp - *codeset); + if (strcmp (*codeset, *normalized_codeset) == 0) + free ((char *) *normalized_codeset); + else + mask |= XPG_NORM_CODESET; + } + } + } + + if (cp[0] == '@' || (syntax != xpg && cp[0] == '+')) + { + /* Next is the modifier. */ + syntax = cp[0] == '@' ? xpg : cen; + cp[0] = '\0'; + *modifier = ++cp; + + while (syntax == cen && cp[0] != '\0' && cp[0] != '+' + && cp[0] != ',' && cp[0] != '_') + ++cp; + + mask |= XPG_MODIFIER | CEN_AUDIENCE; + } + + if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_')) + { + syntax = cen; + + if (cp[0] == '+') + { + /* Next is special application (CEN syntax). */ + cp[0] = '\0'; + *special = ++cp; + + while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_') + ++cp; + + mask |= CEN_SPECIAL; + } + + if (cp[0] == ',') + { + /* Next is sponsor (CEN syntax). */ + cp[0] = '\0'; + *sponsor = ++cp; + + while (cp[0] != '\0' && cp[0] != '_') + ++cp; + + mask |= CEN_SPONSOR; + } + + if (cp[0] == '_') + { + /* Next is revision (CEN syntax). */ + cp[0] = '\0'; + *revision = ++cp; + + mask |= CEN_REVISION; + } + } + + /* For CEN syntax values it might be important to have the + separator character in the file name, not for XPG syntax. */ + if (syntax == xpg) + { + if (*territory != NULL && (*territory)[0] == '\0') + mask &= ~TERRITORY; + + if (*codeset != NULL && (*codeset)[0] == '\0') + mask &= ~XPG_CODESET; + + if (*modifier != NULL && (*modifier)[0] == '\0') + mask &= ~XPG_MODIFIER; + } + + return mask; + } diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/finddomain.c gtkali-0.9.5_jp/intl/finddomain.c *** gtkali-0.9.5/intl/finddomain.c Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/finddomain.c Fri Jun 16 10:50:03 2000 *************** *** 0 **** --- 1,216 ---- + /* Handle list of needed message catalogs + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Written by Ulrich Drepper , 1995. + + 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + #ifdef HAVE_CONFIG_H + # include + #endif + + #include + #include + #include + #include + + #if defined STDC_HEADERS || defined _LIBC + # include + #else + # ifdef HAVE_MALLOC_H + # include + # else + void free (); + # endif + #endif + + #if defined HAVE_STRING_H || defined _LIBC + # include + #else + # include + # ifndef memcpy + # define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) + # endif + #endif + #if !HAVE_STRCHR && !defined _LIBC + # ifndef strchr + # define strchr index + # endif + #endif + + #if defined HAVE_UNISTD_H || defined _LIBC + # include + #endif + + #include "gettext.h" + #include "gettextP.h" + #ifdef _LIBC + # include + #else + # include "libgettext.h" + #endif + + /* @@ end of prolog @@ */ + /* List of already loaded domains. */ + static struct loaded_l10nfile *_nl_loaded_domains; + + + /* Return a data structure describing the message catalog described by + the DOMAINNAME and CATEGORY parameters with respect to the currently + established bindings. */ + struct loaded_l10nfile * + internal_function + _nl_find_domain (dirname, locale, domainname) + const char *dirname; + char *locale; + const char *domainname; + { + struct loaded_l10nfile *retval; + const char *language; + const char *modifier; + const char *territory; + const char *codeset; + const char *normalized_codeset; + const char *special; + const char *sponsor; + const char *revision; + const char *alias_value; + int mask; + + /* LOCALE can consist of up to four recognized parts for the XPG syntax: + + language[_territory[.codeset]][@modifier] + + and six parts for the CEN syntax: + + language[_territory][+audience][+special][,[sponsor][_revision]] + + Beside the first part all of them are allowed to be missing. If + the full specified locale is not found, the less specific one are + looked for. The various parts will be stripped off according to + the following order: + (1) revision + (2) sponsor + (3) special + (4) codeset + (5) normalized codeset + (6) territory + (7) audience/modifier + */ + + /* If we have already tested for this locale entry there has to + be one data set in the list of loaded domains. */ + retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, + strlen (dirname) + 1, 0, locale, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, domainname, 0); + if (retval != NULL) + { + /* We know something about this locale. */ + int cnt; + + if (retval->decided == 0) + _nl_load_domain (retval); + + if (retval->data != NULL) + return retval; + + for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) + { + if (retval->successor[cnt]->decided == 0) + _nl_load_domain (retval->successor[cnt]); + + if (retval->successor[cnt]->data != NULL) + break; + } + return cnt >= 0 ? retval : NULL; + /* NOTREACHED */ + } + + /* See whether the locale value is an alias. If yes its value + *overwrites* the alias name. No test for the original value is + done. */ + alias_value = _nl_expand_alias (locale); + if (alias_value != NULL) + { + #if defined _LIBC || defined HAVE_STRDUP + locale = strdup (alias_value); + if (locale == NULL) + return NULL; + #else + size_t len = strlen (alias_value) + 1; + locale = (char *) malloc (len); + if (locale == NULL) + return NULL; + + memcpy (locale, alias_value, len); + #endif + } + + /* Now we determine the single parts of the locale name. First + look for the language. Termination symbols are `_' and `@' if + we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ + mask = _nl_explode_name (locale, &language, &modifier, &territory, + &codeset, &normalized_codeset, &special, + &sponsor, &revision); + + /* Create all possible locale entries which might be interested in + generalization. */ + retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, + strlen (dirname) + 1, mask, language, territory, + codeset, normalized_codeset, modifier, special, + sponsor, revision, domainname, 1); + if (retval == NULL) + /* This means we are out of core. */ + return NULL; + + if (retval->decided == 0) + _nl_load_domain (retval); + if (retval->data == NULL) + { + int cnt; + for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) + { + if (retval->successor[cnt]->decided == 0) + _nl_load_domain (retval->successor[cnt]); + if (retval->successor[cnt]->data != NULL) + break; + } + } + + /* The room for an alias was dynamically allocated. Free it now. */ + if (alias_value != NULL) + free (locale); + + return retval; + } + + + #ifdef _LIBC + static void __attribute__ ((unused)) + free_mem (void) + { + struct loaded_l10nfile *runp = _nl_loaded_domains; + + while (runp != NULL) + { + struct loaded_l10nfile *here = runp; + if (runp->data != NULL) + _nl_unload_domain ((struct loaded_domain *) runp->data); + runp = runp->next; + free (here); + } + } + + text_set_element (__libc_subfreeres, free_mem); + #endif diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/gettext.c gtkali-0.9.5_jp/intl/gettext.c *** gtkali-0.9.5/intl/gettext.c Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/gettext.c Fri Jun 16 10:50:03 2000 *************** *** 0 **** --- 1,70 ---- + /* Implementation of gettext(3) function. + Copyright (C) 1995, 1997 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + #ifdef HAVE_CONFIG_H + # include + #endif + + #ifdef _LIBC + # define __need_NULL + # include + #else + # ifdef STDC_HEADERS + # include /* Just for NULL. */ + # else + # ifdef HAVE_STRING_H + # include + # else + # define NULL ((void *) 0) + # endif + # endif + #endif + + #ifdef _LIBC + # include + #else + # include "libgettext.h" + #endif + + /* @@ end of prolog @@ */ + + /* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ + #ifdef _LIBC + # define GETTEXT __gettext + # define DGETTEXT __dgettext + #else + # define GETTEXT gettext__ + # define DGETTEXT dgettext__ + #endif + + /* Look up MSGID in the current default message catalog for the current + LC_MESSAGES locale. If not found, returns MSGID itself (the default + text). */ + char * + GETTEXT (msgid) + const char *msgid; + { + return DGETTEXT (NULL, msgid); + } + + #ifdef _LIBC + /* Alias for function name in GNU C Library. */ + weak_alias (__gettext, gettext); + #endif diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/gettext.h gtkali-0.9.5_jp/intl/gettext.h *** gtkali-0.9.5/intl/gettext.h Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/gettext.h Fri Jun 16 10:50:03 2000 *************** *** 0 **** --- 1,105 ---- + /* Internal header for GNU gettext internationalization functions. + Copyright (C) 1995, 1997 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + + #ifndef _GETTEXT_H + #define _GETTEXT_H 1 + + #include + + #if HAVE_LIMITS_H || _LIBC + # include + #endif + + /* @@ end of prolog @@ */ + + /* The magic number of the GNU message catalog format. */ + #define _MAGIC 0x950412de + #define _MAGIC_SWAPPED 0xde120495 + + /* Revision number of the currently used .mo (binary) file format. */ + #define MO_REVISION_NUMBER 0 + + /* The following contortions are an attempt to use the C preprocessor + to determine an unsigned integral type that is 32 bits wide. An + alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but + doing that would require that the configure script compile and *run* + the resulting executable. Locally running cross-compiled executables + is usually not possible. */ + + #if __STDC__ + # define UINT_MAX_32_BITS 4294967295U + #else + # define UINT_MAX_32_BITS 0xFFFFFFFF + #endif + + /* If UINT_MAX isn't defined, assume it's a 32-bit type. + This should be valid for all systems GNU cares about because + that doesn't include 16-bit systems, and only modern systems + (that certainly have ) have 64+-bit integral types. */ + + #ifndef UINT_MAX + # define UINT_MAX UINT_MAX_32_BITS + #endif + + #if UINT_MAX == UINT_MAX_32_BITS + typedef unsigned nls_uint32; + #else + # if USHRT_MAX == UINT_MAX_32_BITS + typedef unsigned short nls_uint32; + # else + # if ULONG_MAX == UINT_MAX_32_BITS + typedef unsigned long nls_uint32; + # else + /* The following line is intended to throw an error. Using #error is + not portable enough. */ + "Cannot determine unsigned 32-bit data type." + # endif + # endif + #endif + + + /* Header for binary .mo file format. */ + struct mo_file_header + { + /* The magic number. */ + nls_uint32 magic; + /* The revision number of the file format. */ + nls_uint32 revision; + /* The number of strings pairs. */ + nls_uint32 nstrings; + /* Offset of table with start offsets of original strings. */ + nls_uint32 orig_tab_offset; + /* Offset of table with start offsets of translation strings. */ + nls_uint32 trans_tab_offset; + /* Size of hashing table. */ + nls_uint32 hash_tab_size; + /* Offset of first hashing entry. */ + nls_uint32 hash_tab_offset; + }; + + struct string_desc + { + /* Length of addressed string. */ + nls_uint32 length; + /* Offset of string in file. */ + nls_uint32 offset; + }; + + /* @@ begin of epilog @@ */ + + #endif /* gettext.h */ diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/gettextP.h gtkali-0.9.5_jp/intl/gettextP.h *** gtkali-0.9.5/intl/gettextP.h Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/gettextP.h Fri Jun 16 10:50:03 2000 *************** *** 0 **** --- 1,89 ---- + /* Header describing internals of gettext library + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Written by Ulrich Drepper , 1995. + + 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + #ifndef _GETTEXTP_H + #define _GETTEXTP_H + + #include "loadinfo.h" + + /* @@ end of prolog @@ */ + + #ifndef PARAMS + # if __STDC__ + # define PARAMS(args) args + # else + # define PARAMS(args) () + # endif + #endif + + #ifndef internal_function + # define internal_function + #endif + + #ifndef W + # define W(flag, data) ((flag) ? SWAP (data) : (data)) + #endif + + + #ifdef _LIBC + # include + # define SWAP(i) bswap_32 (i) + #else + static nls_uint32 SWAP PARAMS ((nls_uint32 i)); + + static inline nls_uint32 + SWAP (i) + nls_uint32 i; + { + return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24); + } + #endif + + + struct loaded_domain + { + const char *data; + int use_mmap; + size_t mmap_size; + int must_swap; + nls_uint32 nstrings; + struct string_desc *orig_tab; + struct string_desc *trans_tab; + nls_uint32 hash_size; + nls_uint32 *hash_tab; + }; + + struct binding + { + struct binding *next; + char *domainname; + char *dirname; + }; + + struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname, + char *__locale, + const char *__domainname)) + internal_function; + void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain)) + internal_function; + void _nl_unload_domain PARAMS ((struct loaded_domain *__domain)) + internal_function; + + /* @@ begin of epilog @@ */ + + #endif /* gettextP.h */ diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/hash-string.h gtkali-0.9.5_jp/intl/hash-string.h *** gtkali-0.9.5/intl/hash-string.h Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/hash-string.h Fri Jun 16 10:50:03 2000 *************** *** 0 **** --- 1,59 ---- + /* Implements a string hashing function. + Copyright (C) 1995, 1997 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + + /* @@ end of prolog @@ */ + + #ifndef PARAMS + # if __STDC__ + # define PARAMS(Args) Args + # else + # define PARAMS(Args) () + # endif + #endif + + /* We assume to have `unsigned long int' value with at least 32 bits. */ + #define HASHWORDBITS 32 + + + /* Defines the so called `hashpjw' function by P.J. Weinberger + [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools, + 1986, 1987 Bell Telephone Laboratories, Inc.] */ + static unsigned long hash_string PARAMS ((const char *__str_param)); + + static inline unsigned long + hash_string (str_param) + const char *str_param; + { + unsigned long int hval, g; + const char *str = str_param; + + /* Compute the hash value for the given string. */ + hval = 0; + while (*str != '\0') + { + hval <<= 4; + hval += (unsigned long) *str++; + g = hval & ((unsigned long) 0xf << (HASHWORDBITS - 4)); + if (g != 0) + { + hval ^= g >> (HASHWORDBITS - 8); + hval ^= g; + } + } + return hval; + } diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/intl-compat.c gtkali-0.9.5_jp/intl/intl-compat.c *** gtkali-0.9.5/intl/intl-compat.c Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/intl-compat.c Fri Jun 16 10:50:03 2000 *************** *** 0 **** --- 1,76 ---- + /* intl-compat.c - Stub functions to call gettext functions from GNU gettext + Library. + Copyright (C) 1995 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + #ifdef HAVE_CONFIG_H + # include + #endif + + #include "libgettext.h" + + /* @@ end of prolog @@ */ + + + #undef gettext + #undef dgettext + #undef dcgettext + #undef textdomain + #undef bindtextdomain + + + char * + bindtextdomain (domainname, dirname) + const char *domainname; + const char *dirname; + { + return bindtextdomain__ (domainname, dirname); + } + + + char * + dcgettext (domainname, msgid, category) + const char *domainname; + const char *msgid; + int category; + { + return dcgettext__ (domainname, msgid, category); + } + + + char * + dgettext (domainname, msgid) + const char *domainname; + const char *msgid; + { + return dgettext__ (domainname, msgid); + } + + + char * + gettext (msgid) + const char *msgid; + { + return gettext__ (msgid); + } + + + char * + textdomain (domainname) + const char *domainname; + { + return textdomain__ (domainname); + } diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/l10nflist.c gtkali-0.9.5_jp/intl/l10nflist.c *** gtkali-0.9.5/intl/l10nflist.c Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/l10nflist.c Fri Jun 16 10:50:03 2000 *************** *** 0 **** --- 1,411 ---- + /* Handle list of needed message catalogs + Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Contributed by Ulrich Drepper , 1995. + + 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + #ifdef HAVE_CONFIG_H + # include + #endif + + + #if defined HAVE_STRING_H || defined _LIBC + # ifndef _GNU_SOURCE + # define _GNU_SOURCE 1 + # endif + # include + #else + # include + # ifndef memcpy + # define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) + # endif + #endif + #if !HAVE_STRCHR && !defined _LIBC + # ifndef strchr + # define strchr index + # endif + #endif + + #if defined _LIBC || defined HAVE_ARGZ_H + # include + #endif + #include + #include + + #if defined STDC_HEADERS || defined _LIBC + # include + #endif + + #include "loadinfo.h" + + /* On some strange systems still no definition of NULL is found. Sigh! */ + #ifndef NULL + # if defined __STDC__ && __STDC__ + # define NULL ((void *) 0) + # else + # define NULL 0 + # endif + #endif + + /* @@ end of prolog @@ */ + + #ifdef _LIBC + /* Rename the non ANSI C functions. This is required by the standard + because some ANSI C functions will require linking with this object + file and the name space must not be polluted. */ + # ifndef stpcpy + # define stpcpy(dest, src) __stpcpy(dest, src) + # endif + #else + # ifndef HAVE_STPCPY + static char *stpcpy PARAMS ((char *dest, const char *src)); + # endif + #endif + + /* Define function which are usually not available. */ + + #if !defined _LIBC && !defined HAVE___ARGZ_COUNT + /* Returns the number of strings in ARGZ. */ + static size_t argz_count__ PARAMS ((const char *argz, size_t len)); + + static size_t + argz_count__ (argz, len) + const char *argz; + size_t len; + { + size_t count = 0; + while (len > 0) + { + size_t part_len = strlen (argz); + argz += part_len + 1; + len -= part_len + 1; + count++; + } + return count; + } + # undef __argz_count + # define __argz_count(argz, len) argz_count__ (argz, len) + #endif /* !_LIBC && !HAVE___ARGZ_COUNT */ + + #if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY + /* Make '\0' separated arg vector ARGZ printable by converting all the '\0's + except the last into the character SEP. */ + static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep)); + + static void + argz_stringify__ (argz, len, sep) + char *argz; + size_t len; + int sep; + { + while (len > 0) + { + size_t part_len = strlen (argz); + argz += part_len; + len -= part_len + 1; + if (len > 0) + *argz++ = sep; + } + } + # undef __argz_stringify + # define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep) + #endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */ + + #if !defined _LIBC && !defined HAVE___ARGZ_NEXT + static char *argz_next__ PARAMS ((char *argz, size_t argz_len, + const char *entry)); + + static char * + argz_next__ (argz, argz_len, entry) + char *argz; + size_t argz_len; + const char *entry; + { + if (entry) + { + if (entry < argz + argz_len) + entry = strchr (entry, '\0') + 1; + + return entry >= argz + argz_len ? NULL : (char *) entry; + } + else + if (argz_len > 0) + return argz; + else + return 0; + } + # undef __argz_next + # define __argz_next(argz, len, entry) argz_next__ (argz, len, entry) + #endif /* !_LIBC && !HAVE___ARGZ_NEXT */ + + + /* Return number of bits set in X. */ + static int pop PARAMS ((int x)); + + static inline int + pop (x) + int x; + { + /* We assume that no more than 16 bits are used. */ + x = ((x & ~0x5555) >> 1) + (x & 0x5555); + x = ((x & ~0x3333) >> 2) + (x & 0x3333); + x = ((x >> 4) + x) & 0x0f0f; + x = ((x >> 8) + x) & 0xff; + + return x; + } + + + struct loaded_l10nfile * + _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, + territory, codeset, normalized_codeset, modifier, special, + sponsor, revision, filename, do_allocate) + struct loaded_l10nfile **l10nfile_list; + const char *dirlist; + size_t dirlist_len; + int mask; + const char *language; + const char *territory; + const char *codeset; + const char *normalized_codeset; + const char *modifier; + const char *special; + const char *sponsor; + const char *revision; + const char *filename; + int do_allocate; + { + char *abs_filename; + struct loaded_l10nfile *last = NULL; + struct loaded_l10nfile *retval; + char *cp; + size_t entries; + int cnt; + + /* Allocate room for the full file name. */ + abs_filename = (char *) malloc (dirlist_len + + strlen (language) + + ((mask & TERRITORY) != 0 + ? strlen (territory) + 1 : 0) + + ((mask & XPG_CODESET) != 0 + ? strlen (codeset) + 1 : 0) + + ((mask & XPG_NORM_CODESET) != 0 + ? strlen (normalized_codeset) + 1 : 0) + + (((mask & XPG_MODIFIER) != 0 + || (mask & CEN_AUDIENCE) != 0) + ? strlen (modifier) + 1 : 0) + + ((mask & CEN_SPECIAL) != 0 + ? strlen (special) + 1 : 0) + + (((mask & CEN_SPONSOR) != 0 + || (mask & CEN_REVISION) != 0) + ? (1 + ((mask & CEN_SPONSOR) != 0 + ? strlen (sponsor) + 1 : 0) + + ((mask & CEN_REVISION) != 0 + ? strlen (revision) + 1 : 0)) : 0) + + 1 + strlen (filename) + 1); + + if (abs_filename == NULL) + return NULL; + + retval = NULL; + last = NULL; + + /* Construct file name. */ + memcpy (abs_filename, dirlist, dirlist_len); + __argz_stringify (abs_filename, dirlist_len, ':'); + cp = abs_filename + (dirlist_len - 1); + *cp++ = '/'; + cp = stpcpy (cp, language); + + if ((mask & TERRITORY) != 0) + { + *cp++ = '_'; + cp = stpcpy (cp, territory); + } + if ((mask & XPG_CODESET) != 0) + { + *cp++ = '.'; + cp = stpcpy (cp, codeset); + } + if ((mask & XPG_NORM_CODESET) != 0) + { + *cp++ = '.'; + cp = stpcpy (cp, normalized_codeset); + } + if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0) + { + /* This component can be part of both syntaces but has different + leading characters. For CEN we use `+', else `@'. */ + *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@'; + cp = stpcpy (cp, modifier); + } + if ((mask & CEN_SPECIAL) != 0) + { + *cp++ = '+'; + cp = stpcpy (cp, special); + } + if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0) + { + *cp++ = ','; + if ((mask & CEN_SPONSOR) != 0) + cp = stpcpy (cp, sponsor); + if ((mask & CEN_REVISION) != 0) + { + *cp++ = '_'; + cp = stpcpy (cp, revision); + } + } + + *cp++ = '/'; + stpcpy (cp, filename); + + /* Look in list of already loaded domains whether it is already + available. */ + last = NULL; + for (retval = *l10nfile_list; retval != NULL; retval = retval->next) + if (retval->filename != NULL) + { + int compare = strcmp (retval->filename, abs_filename); + if (compare == 0) + /* We found it! */ + break; + if (compare < 0) + { + /* It's not in the list. */ + retval = NULL; + break; + } + + last = retval; + } + + if (retval != NULL || do_allocate == 0) + { + free (abs_filename); + return retval; + } + + retval = (struct loaded_l10nfile *) + malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len) + * (1 << pop (mask)) + * sizeof (struct loaded_l10nfile *))); + if (retval == NULL) + return NULL; + + retval->filename = abs_filename; + retval->decided = (__argz_count (dirlist, dirlist_len) != 1 + || ((mask & XPG_CODESET) != 0 + && (mask & XPG_NORM_CODESET) != 0)); + retval->data = NULL; + + if (last == NULL) + { + retval->next = *l10nfile_list; + *l10nfile_list = retval; + } + else + { + retval->next = last->next; + last->next = retval; + } + + entries = 0; + /* If the DIRLIST is a real list the RETVAL entry corresponds not to + a real file. So we have to use the DIRLIST separation mechanism + of the inner loop. */ + cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask; + for (; cnt >= 0; --cnt) + if ((cnt & ~mask) == 0 + && ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0) + && ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0)) + { + /* Iterate over all elements of the DIRLIST. */ + char *dir = NULL; + + while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir)) + != NULL) + retval->successor[entries++] + = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt, + language, territory, codeset, + normalized_codeset, modifier, special, + sponsor, revision, filename, 1); + } + retval->successor[entries] = NULL; + + return retval; + } + + /* Normalize codeset name. There is no standard for the codeset + names. Normalization allows the user to use any of the common + names. */ + const char * + _nl_normalize_codeset (codeset, name_len) + const unsigned char *codeset; + size_t name_len; + { + int len = 0; + int only_digit = 1; + char *retval; + char *wp; + size_t cnt; + + for (cnt = 0; cnt < name_len; ++cnt) + if (isalnum (codeset[cnt])) + { + ++len; + + if (isalpha (codeset[cnt])) + only_digit = 0; + } + + retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1); + + if (retval != NULL) + { + if (only_digit) + wp = stpcpy (retval, "iso"); + else + wp = retval; + + for (cnt = 0; cnt < name_len; ++cnt) + if (isalpha (codeset[cnt])) + *wp++ = tolower (codeset[cnt]); + else if (isdigit (codeset[cnt])) + *wp++ = codeset[cnt]; + + *wp = '\0'; + } + + return (const char *) retval; + } + + + /* @@ begin of epilog @@ */ + + /* We don't want libintl.a to depend on any other library. So we + avoid the non-standard function stpcpy. In GNU C Library this + function is available, though. Also allow the symbol HAVE_STPCPY + to be defined. */ + #if !_LIBC && !HAVE_STPCPY + static char * + stpcpy (dest, src) + char *dest; + const char *src; + { + while ((*dest++ = *src++) != '\0') + /* Do nothing. */ ; + return dest - 1; + } + #endif diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/libgettext.h gtkali-0.9.5_jp/intl/libgettext.h *** gtkali-0.9.5/intl/libgettext.h Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/libgettext.h Fri Jun 16 10:50:03 2000 *************** *** 0 **** --- 1,182 ---- + /* Message catalogs for internationalization. + Copyright (C) 1995, 1996, 1997, 1998 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + /* Because on some systems (e.g. Solaris) we sometimes have to include + the systems libintl.h as well as this file we have more complex + include protection above. But the systems header might perhaps also + define _LIBINTL_H and therefore we have to protect the definition here. */ + + #if !defined _LIBINTL_H || !defined _LIBGETTEXT_H + #ifndef _LIBINTL_H + # define _LIBINTL_H 1 + #endif + #define _LIBGETTEXT_H 1 + + /* We define an additional symbol to signal that we use the GNU + implementation of gettext. */ + #define __USE_GNU_GETTEXT 1 + + #include + + #if HAVE_LOCALE_H + # include + #endif + + + #ifdef __cplusplus + extern "C" { + #endif + + /* @@ end of prolog @@ */ + + #ifndef PARAMS + # if __STDC__ || defined __cplusplus + # define PARAMS(args) args + # else + # define PARAMS(args) () + # endif + #endif + + #ifndef NULL + # if !defined __cplusplus || defined __GNUC__ + # define NULL ((void *) 0) + # else + # define NULL (0) + # endif + #endif + + #if !HAVE_LC_MESSAGES + /* This value determines the behaviour of the gettext() and dgettext() + function. But some system does not have this defined. Define it + to a default value. */ + # define LC_MESSAGES (-1) + #endif + + + /* Declarations for gettext-using-catgets interface. Derived from + Jim Meyering's libintl.h. */ + struct _msg_ent + { + const char *_msg; + int _msg_number; + }; + + + #if HAVE_CATGETS + /* These two variables are defined in the automatically by po-to-tbl.sed + generated file `cat-id-tbl.c'. */ + extern const struct _msg_ent _msg_tbl[]; + extern int _msg_tbl_length; + #endif + + + /* For automatical extraction of messages sometimes no real + translation is needed. Instead the string itself is the result. */ + #define gettext_noop(Str) (Str) + + /* Look up MSGID in the current default message catalog for the current + LC_MESSAGES locale. If not found, returns MSGID itself (the default + text). */ + extern char *gettext PARAMS ((const char *__msgid)); + extern char *gettext__ PARAMS ((const char *__msgid)); + + /* Look up MSGID in the DOMAINNAME message catalog for the current + LC_MESSAGES locale. */ + extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid)); + extern char *dgettext__ PARAMS ((const char *__domainname, + const char *__msgid)); + + /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY + locale. */ + extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid, + int __category)); + extern char *dcgettext__ PARAMS ((const char *__domainname, + const char *__msgid, int __category)); + + + /* Set the current default message catalog to DOMAINNAME. + If DOMAINNAME is null, return the current default. + If DOMAINNAME is "", reset to the default of "messages". */ + extern char *textdomain PARAMS ((const char *__domainname)); + extern char *textdomain__ PARAMS ((const char *__domainname)); + + /* Specify that the DOMAINNAME message catalog will be found + in DIRNAME rather than in the system locale data base. */ + extern char *bindtextdomain PARAMS ((const char *__domainname, + const char *__dirname)); + extern char *bindtextdomain__ PARAMS ((const char *__domainname, + const char *__dirname)); + + #if ENABLE_NLS + + /* Solaris 2.3 has the gettext function but dcgettext is missing. + So we omit this optimization for Solaris 2.3. BTW, Solaris 2.4 + has dcgettext. */ + # if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT) + + # define gettext(Msgid) \ + dgettext (NULL, Msgid) + + # define dgettext(Domainname, Msgid) \ + dcgettext (Domainname, Msgid, LC_MESSAGES) + + # if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7 + /* This global variable is defined in loadmsgcat.c. We need a sign, + whether a new catalog was loaded, which can be associated with all + translations. */ + extern int _nl_msg_cat_cntr; + + # define dcgettext(Domainname, Msgid, Category) \ + (__extension__ \ + ({ \ + char *__result; \ + if (__builtin_constant_p (Msgid)) \ + { \ + static char *__translation__; \ + static int __catalog_counter__; \ + if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr) \ + { \ + __translation__ = \ + dcgettext__ (Domainname, Msgid, Category); \ + __catalog_counter__ = _nl_msg_cat_cntr; \ + } \ + __result = __translation__; \ + } \ + else \ + __result = dcgettext__ (Domainname, Msgid, Category); \ + __result; \ + })) + # endif + # endif + + #else + + # define gettext(Msgid) (Msgid) + # define dgettext(Domainname, Msgid) (Msgid) + # define dcgettext(Domainname, Msgid, Category) (Msgid) + # define textdomain(Domainname) ((char *) Domainname) + # define bindtextdomain(Domainname, Dirname) ((char *) Dirname) + + #endif + + /* @@ begin of epilog @@ */ + + #ifdef __cplusplus + } + #endif + + #endif diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/linux-msg.sed gtkali-0.9.5_jp/intl/linux-msg.sed *** gtkali-0.9.5/intl/linux-msg.sed Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/linux-msg.sed Fri Jun 16 10:50:03 2000 *************** *** 0 **** --- 1,100 ---- + # po2msg.sed - Convert Uniforum style .po file to Linux style .msg file + # Copyright (C) 1995 Free Software Foundation, Inc. + # Ulrich Drepper , 1995. + # + # 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 + # the Free Software Foundation; either version 2, or (at your option) + # any later version. + # + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + # + # + # The first directive in the .msg should be the definition of the + # message set number. We use always set number 1. + # + 1 { + i\ + $set 1 # Automatically created by po2msg.sed + h + s/.*/0/ + x + } + # + # Mitch's old catalog format does not allow comments. + # + # We copy the original message as a comment into the .msg file. + # + /^msgid/ { + s/msgid[ ]*"// + # + # This does not work now with the new format. + # /"$/! { + # s/\\$// + # s/$/ ... (more lines following)"/ + # } + x + # The following nice solution is by + # Bruno + td + # Increment a decimal number in pattern space. + # First hide trailing `9' digits. + :d + s/9\(_*\)$/_\1/ + td + # Assure at least one digit is available. + s/^\(_*\)$/0\1/ + # Increment the last digit. + s/8\(_*\)$/9\1/ + s/7\(_*\)$/8\1/ + s/6\(_*\)$/7\1/ + s/5\(_*\)$/6\1/ + s/4\(_*\)$/5\1/ + s/3\(_*\)$/4\1/ + s/2\(_*\)$/3\1/ + s/1\(_*\)$/2\1/ + s/0\(_*\)$/1\1/ + # Convert the hidden `9' digits to `0's. + s/_/0/g + x + G + s/\(.*\)"\n\([0-9]*\)/$ #\2 Original Message:(\1)/p + } + # + # The .msg file contains, other then the .po file, only the translations + # but each given a unique ID. Starting from 1 and incrementing by 1 for + # each message we assign them to the messages. + # It is important that the .po file used to generate the cat-id-tbl.c file + # (with po-to-tbl) is the same as the one used here. (At least the order + # of declarations must not be changed.) + # + /^msgstr/ { + s/msgstr[ ]*"\(.*\)"/# \1/ + # Clear substitution flag. + tb + # Append the next line. + :b + N + # Look whether second part is continuation line. + s/\(.*\n\)"\(.*\)"/\1\2/ + # Yes, then branch. + ta + P + D + # Note that D includes a jump to the start!! + # We found a continuation line. But before printing insert '\'. + :a + s/\(.*\)\(\n.*\)/\1\\\2/ + P + # We cannot use D here. + s/.*\n\(.*\)/\1/ + tb + } + d diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/loadinfo.h gtkali-0.9.5_jp/intl/loadinfo.h *** gtkali-0.9.5/intl/loadinfo.h Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/loadinfo.h Fri Jun 16 10:50:03 2000 *************** *** 0 **** --- 1,76 ---- + /* Copyright (C) 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1996. + + 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + #ifndef PARAMS + # if __STDC__ + # define PARAMS(args) args + # else + # define PARAMS(args) () + # endif + #endif + + /* Encoding of locale name parts. */ + #define CEN_REVISION 1 + #define CEN_SPONSOR 2 + #define CEN_SPECIAL 4 + #define XPG_NORM_CODESET 8 + #define XPG_CODESET 16 + #define TERRITORY 32 + #define CEN_AUDIENCE 64 + #define XPG_MODIFIER 128 + + #define CEN_SPECIFIC (CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE) + #define XPG_SPECIFIC (XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER) + + + struct loaded_l10nfile + { + const char *filename; + int decided; + + const void *data; + + struct loaded_l10nfile *next; + struct loaded_l10nfile *successor[1]; + }; + + + extern const char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset, + size_t name_len)); + + extern struct loaded_l10nfile * + _nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list, + const char *dirlist, size_t dirlist_len, int mask, + const char *language, const char *territory, + const char *codeset, + const char *normalized_codeset, + const char *modifier, const char *special, + const char *sponsor, const char *revision, + const char *filename, int do_allocate)); + + + extern const char *_nl_expand_alias PARAMS ((const char *name)); + + extern int _nl_explode_name PARAMS ((char *name, const char **language, + const char **modifier, + const char **territory, + const char **codeset, + const char **normalized_codeset, + const char **special, + const char **sponsor, + const char **revision)); diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/loadmsgcat.c gtkali-0.9.5_jp/intl/loadmsgcat.c *** gtkali-0.9.5/intl/loadmsgcat.c Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/loadmsgcat.c Fri Jun 16 10:50:03 2000 *************** *** 0 **** --- 1,222 ---- + /* Load needed message catalogs. + Copyright (C) 1995, 1996, 1997, 1998 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + #ifdef HAVE_CONFIG_H + # include + #endif + + #include + #include + #include + + #if defined STDC_HEADERS || defined _LIBC + # include + #endif + + #if defined HAVE_UNISTD_H || defined _LIBC + # include + #endif + + #if (defined HAVE_MMAP && defined HAVE_MUNMAP) || defined _LIBC + # include + #endif + + #include "gettext.h" + #include "gettextP.h" + + /* @@ end of prolog @@ */ + + #ifdef _LIBC + /* Rename the non ISO C functions. This is required by the standard + because some ISO C functions will require linking with this object + file and the name space must not be polluted. */ + # define open __open + # define close __close + # define read __read + # define mmap __mmap + # define munmap __munmap + #endif + + /* We need a sign, whether a new catalog was loaded, which can be associated + with all translations. This is important if the translations are + cached by one of GCC's features. */ + int _nl_msg_cat_cntr = 0; + + + /* Load the message catalogs specified by FILENAME. If it is no valid + message catalog do nothing. */ + void + internal_function + _nl_load_domain (domain_file) + struct loaded_l10nfile *domain_file; + { + int fd; + size_t size; + struct stat st; + struct mo_file_header *data = (struct mo_file_header *) -1; + #if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ + || defined _LIBC + int use_mmap = 0; + #endif + struct loaded_domain *domain; + + domain_file->decided = 1; + domain_file->data = NULL; + + /* If the record does not represent a valid locale the FILENAME + might be NULL. This can happen when according to the given + specification the locale file name is different for XPG and CEN + syntax. */ + if (domain_file->filename == NULL) + return; + + /* Try to open the addressed file. */ + fd = open (domain_file->filename, O_RDONLY); + if (fd == -1) + return; + + /* We must know about the size of the file. */ + if (fstat (fd, &st) != 0 + || (size = (size_t) st.st_size) != st.st_size + || size < sizeof (struct mo_file_header)) + { + /* Something went wrong. */ + close (fd); + return; + } + + #if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ + || defined _LIBC + /* Now we are ready to load the file. If mmap() is available we try + this first. If not available or it failed we try to load it. */ + data = (struct mo_file_header *) mmap (NULL, size, PROT_READ, + MAP_PRIVATE, fd, 0); + + if (data != (struct mo_file_header *) -1) + { + /* mmap() call was successful. */ + close (fd); + use_mmap = 1; + } + #endif + + /* If the data is not yet available (i.e. mmap'ed) we try to load + it manually. */ + if (data == (struct mo_file_header *) -1) + { + size_t to_read; + char *read_ptr; + + data = (struct mo_file_header *) malloc (size); + if (data == NULL) + return; + + to_read = size; + read_ptr = (char *) data; + do + { + long int nb = (long int) read (fd, read_ptr, to_read); + if (nb == -1) + { + close (fd); + return; + } + + read_ptr += nb; + to_read -= nb; + } + while (to_read > 0); + + close (fd); + } + + /* Using the magic number we can test whether it really is a message + catalog file. */ + if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED) + { + /* The magic number is wrong: not a message catalog file. */ + #if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ + || defined _LIBC + if (use_mmap) + munmap ((caddr_t) data, size); + else + #endif + free (data); + return; + } + + domain_file->data + = (struct loaded_domain *) malloc (sizeof (struct loaded_domain)); + if (domain_file->data == NULL) + return; + + domain = (struct loaded_domain *) domain_file->data; + domain->data = (char *) data; + #if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ + || defined _LIBC + domain->use_mmap = use_mmap; + #endif + domain->mmap_size = size; + domain->must_swap = data->magic != _MAGIC; + + /* Fill in the information about the available tables. */ + switch (W (domain->must_swap, data->revision)) + { + case 0: + domain->nstrings = W (domain->must_swap, data->nstrings); + domain->orig_tab = (struct string_desc *) + ((char *) data + W (domain->must_swap, data->orig_tab_offset)); + domain->trans_tab = (struct string_desc *) + ((char *) data + W (domain->must_swap, data->trans_tab_offset)); + domain->hash_size = W (domain->must_swap, data->hash_tab_size); + domain->hash_tab = (nls_uint32 *) + ((char *) data + W (domain->must_swap, data->hash_tab_offset)); + break; + default: + /* This is an illegal revision. */ + #if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ + || defined _LIBC + if (use_mmap) + munmap ((caddr_t) data, size); + else + #endif + free (data); + free (domain); + domain_file->data = NULL; + return; + } + + /* Show that one domain is changed. This might make some cached + translations invalid. */ + ++_nl_msg_cat_cntr; + } + + + #ifdef _LIBC + void + internal_function + _nl_unload_domain (domain) + struct loaded_domain *domain; + { + if (domain->use_mmap) + munmap ((caddr_t) domain->data, domain->mmap_size); + else + free ((void *) domain->data); + + free (domain); + } + #endif diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/localealias.c gtkali-0.9.5_jp/intl/localealias.c *** gtkali-0.9.5/intl/localealias.c Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/localealias.c Fri Jun 16 10:50:03 2000 *************** *** 0 **** --- 1,424 ---- + /* Handle aliases for locale names. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Written by Ulrich Drepper , 1995. + + 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + #ifdef HAVE_CONFIG_H + # include + #endif + + #include + #include + #include + + #ifdef __GNUC__ + # define alloca __builtin_alloca + # define HAVE_ALLOCA 1 + #else + # if defined HAVE_ALLOCA_H || defined _LIBC + # include + # else + # ifdef _AIX + #pragma alloca + # else + # ifndef alloca + char *alloca (); + # endif + # endif + # endif + #endif + + #if defined STDC_HEADERS || defined _LIBC + # include + #else + char *getenv (); + # ifdef HAVE_MALLOC_H + # include + # else + void free (); + # endif + #endif + + #if defined HAVE_STRING_H || defined _LIBC + # ifndef _GNU_SOURCE + # define _GNU_SOURCE 1 + # endif + # include + #else + # include + # ifndef memcpy + # define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) + # endif + #endif + #if !HAVE_STRCHR && !defined _LIBC + # ifndef strchr + # define strchr index + # endif + #endif + + #include "gettext.h" + #include "gettextP.h" + + /* @@ end of prolog @@ */ + + #ifdef _LIBC + /* Rename the non ANSI C functions. This is required by the standard + because some ANSI C functions will require linking with this object + file and the name space must not be polluted. */ + # define strcasecmp __strcasecmp + + # define mempcpy __mempcpy + # define HAVE_MEMPCPY 1 + + /* We need locking here since we can be called from different places. */ + # include + + __libc_lock_define_initialized (static, lock); + #endif + + + /* For those loosing systems which don't have `alloca' we have to add + some additional code emulating it. */ + #ifdef HAVE_ALLOCA + /* Nothing has to be done. */ + # define ADD_BLOCK(list, address) /* nothing */ + # define FREE_BLOCKS(list) /* nothing */ + #else + struct block_list + { + void *address; + struct block_list *next; + }; + # define ADD_BLOCK(list, addr) \ + do { \ + struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ + /* If we cannot get a free block we cannot add the new element to \ + the list. */ \ + if (newp != NULL) { \ + newp->address = (addr); \ + newp->next = (list); \ + (list) = newp; \ + } \ + } while (0) + # define FREE_BLOCKS(list) \ + do { \ + while (list != NULL) { \ + struct block_list *old = list; \ + list = list->next; \ + free (old); \ + } \ + } while (0) + # undef alloca + # define alloca(size) (malloc (size)) + #endif /* have alloca */ + + + struct alias_map + { + const char *alias; + const char *value; + }; + + + static char *string_space = NULL; + static size_t string_space_act = 0; + static size_t string_space_max = 0; + static struct alias_map *map; + static size_t nmap = 0; + static size_t maxmap = 0; + + + /* Prototypes for local functions. */ + static size_t read_alias_file PARAMS ((const char *fname, int fname_len)) + internal_function; + static void extend_alias_table PARAMS ((void)); + static int alias_compare PARAMS ((const struct alias_map *map1, + const struct alias_map *map2)); + + + const char * + _nl_expand_alias (name) + const char *name; + { + static const char *locale_alias_path = LOCALE_ALIAS_PATH; + struct alias_map *retval; + const char *result = NULL; + size_t added; + + #ifdef _LIBC + __libc_lock_lock (lock); + #endif + + do + { + struct alias_map item; + + item.alias = name; + + if (nmap > 0) + retval = (struct alias_map *) bsearch (&item, map, nmap, + sizeof (struct alias_map), + (int (*) PARAMS ((const void *, + const void *)) + ) alias_compare); + else + retval = NULL; + + /* We really found an alias. Return the value. */ + if (retval != NULL) + { + result = retval->value; + break; + } + + /* Perhaps we can find another alias file. */ + added = 0; + while (added == 0 && locale_alias_path[0] != '\0') + { + const char *start; + + while (locale_alias_path[0] == ':') + ++locale_alias_path; + start = locale_alias_path; + + while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':') + ++locale_alias_path; + + if (start < locale_alias_path) + added = read_alias_file (start, locale_alias_path - start); + } + } + while (added != 0); + + #ifdef _LIBC + __libc_lock_unlock (lock); + #endif + + return result; + } + + + static size_t + internal_function + read_alias_file (fname, fname_len) + const char *fname; + int fname_len; + { + #ifndef HAVE_ALLOCA + struct block_list *block_list = NULL; + #endif + FILE *fp; + char *full_fname; + size_t added; + static const char aliasfile[] = "/locale.alias"; + + full_fname = (char *) alloca (fname_len + sizeof aliasfile); + ADD_BLOCK (block_list, full_fname); + #ifdef HAVE_MEMPCPY + mempcpy (mempcpy (full_fname, fname, fname_len), + aliasfile, sizeof aliasfile); + #else + memcpy (full_fname, fname, fname_len); + memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile); + #endif + + fp = fopen (full_fname, "r"); + if (fp == NULL) + { + FREE_BLOCKS (block_list); + return 0; + } + + added = 0; + while (!feof (fp)) + { + /* It is a reasonable approach to use a fix buffer here because + a) we are only interested in the first two fields + b) these fields must be usable as file names and so must not + be that long + */ + unsigned char buf[BUFSIZ]; + unsigned char *alias; + unsigned char *value; + unsigned char *cp; + + if (fgets (buf, sizeof buf, fp) == NULL) + /* EOF reached. */ + break; + + /* Possibly not the whole line fits into the buffer. Ignore + the rest of the line. */ + if (strchr (buf, '\n') == NULL) + { + char altbuf[BUFSIZ]; + do + if (fgets (altbuf, sizeof altbuf, fp) == NULL) + /* Make sure the inner loop will be left. The outer loop + will exit at the `feof' test. */ + break; + while (strchr (altbuf, '\n') == NULL); + } + + cp = buf; + /* Ignore leading white space. */ + while (isspace (cp[0])) + ++cp; + + /* A leading '#' signals a comment line. */ + if (cp[0] != '\0' && cp[0] != '#') + { + alias = cp++; + while (cp[0] != '\0' && !isspace (cp[0])) + ++cp; + /* Terminate alias name. */ + if (cp[0] != '\0') + *cp++ = '\0'; + + /* Now look for the beginning of the value. */ + while (isspace (cp[0])) + ++cp; + + if (cp[0] != '\0') + { + size_t alias_len; + size_t value_len; + + value = cp++; + while (cp[0] != '\0' && !isspace (cp[0])) + ++cp; + /* Terminate value. */ + if (cp[0] == '\n') + { + /* This has to be done to make the following test + for the end of line possible. We are looking for + the terminating '\n' which do not overwrite here. */ + *cp++ = '\0'; + *cp = '\n'; + } + else if (cp[0] != '\0') + *cp++ = '\0'; + + if (nmap >= maxmap) + extend_alias_table (); + + alias_len = strlen (alias) + 1; + value_len = strlen (value) + 1; + + if (string_space_act + alias_len + value_len > string_space_max) + { + /* Increase size of memory pool. */ + size_t new_size = (string_space_max + + (alias_len + value_len > 1024 + ? alias_len + value_len : 1024)); + char *new_pool = (char *) realloc (string_space, new_size); + if (new_pool == NULL) + { + FREE_BLOCKS (block_list); + return added; + } + string_space = new_pool; + string_space_max = new_size; + } + + map[nmap].alias = memcpy (&string_space[string_space_act], + alias, alias_len); + string_space_act += alias_len; + + map[nmap].value = memcpy (&string_space[string_space_act], + value, value_len); + string_space_act += value_len; + + ++nmap; + ++added; + } + } + } + + /* Should we test for ferror()? I think we have to silently ignore + errors. --drepper */ + fclose (fp); + + if (added > 0) + qsort (map, nmap, sizeof (struct alias_map), + (int (*) PARAMS ((const void *, const void *))) alias_compare); + + FREE_BLOCKS (block_list); + return added; + } + + + static void + extend_alias_table () + { + size_t new_size; + struct alias_map *new_map; + + new_size = maxmap == 0 ? 100 : 2 * maxmap; + new_map = (struct alias_map *) realloc (map, (new_size + * sizeof (struct alias_map))); + if (new_map == NULL) + /* Simply don't extend: we don't have any more core. */ + return; + + map = new_map; + maxmap = new_size; + } + + + #ifdef _LIBC + static void __attribute__ ((unused)) + free_mem (void) + { + if (string_space != NULL) + free (string_space); + if (map != NULL) + free (map); + } + text_set_element (__libc_subfreeres, free_mem); + #endif + + + static int + alias_compare (map1, map2) + const struct alias_map *map1; + const struct alias_map *map2; + { + #if defined _LIBC || defined HAVE_STRCASECMP + return strcasecmp (map1->alias, map2->alias); + #else + const unsigned char *p1 = (const unsigned char *) map1->alias; + const unsigned char *p2 = (const unsigned char *) map2->alias; + unsigned char c1, c2; + + if (p1 == p2) + return 0; + + do + { + /* I know this seems to be odd but the tolower() function in + some systems libc cannot handle nonalpha characters. */ + c1 = isupper (*p1) ? tolower (*p1) : *p1; + c2 = isupper (*p2) ? tolower (*p2) : *p2; + if (c1 == '\0') + break; + ++p1; + ++p2; + } + while (c1 == c2); + + return c1 - c2; + #endif + } diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/po2tbl.sed gtkali-0.9.5_jp/intl/po2tbl.sed *** gtkali-0.9.5/intl/po2tbl.sed Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/po2tbl.sed Fri Jun 16 22:03:49 2000 *************** *** 0 **** --- 1,60 ---- + 1 { + i\ + /* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot. */\ + \ + #if HAVE_CONFIG_H\ + # include \ + #endif\ + \ + #include "libgettext.h"\ + \ + const struct _msg_ent _msg_tbl[] = { + h + s/.*/0/ + x + } + /^msgid/ { + s/msgid[ ]*\(".*"\)/ {\1/ + tb + :b + N + s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/ + ta + s/\(.*\)\n.*/\1/ + bc + :a + s/\(.*\)\(\n.*\)/\1\\\2/ + P + s/.*\n\(.*\)/\1/ + tb + :c + x + td + :d + s/9\(_*\)$/_\1/ + td + s/^\(_*\)$/0\1/ + s/8\(_*\)$/9\1/ + s/7\(_*\)$/8\1/ + s/6\(_*\)$/7\1/ + s/5\(_*\)$/6\1/ + s/4\(_*\)$/5\1/ + s/3\(_*\)$/4\1/ + s/2\(_*\)$/3\1/ + s/1\(_*\)$/2\1/ + s/0\(_*\)$/1\1/ + s/_/0/g + x + G + s/\(.*\)\n\([0-9]*\)/\1, \2},/ + s/\(.*\)"$/\1/ + p + } + $ { + i\ + };\ + + g + s/0*\(.*\)/int _msg_tbl_length = \1;/p + } + d diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/po2tbl.sed.in gtkali-0.9.5_jp/intl/po2tbl.sed.in *** gtkali-0.9.5/intl/po2tbl.sed.in Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/po2tbl.sed.in Fri Jun 16 10:50:03 2000 *************** *** 0 **** --- 1,102 ---- + # po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets + # Copyright (C) 1995 Free Software Foundation, Inc. + # Ulrich Drepper , 1995. + # + # 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 + # the Free Software Foundation; either version 2, or (at your option) + # any later version. + # + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + # + 1 { + i\ + /* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot. */\ + \ + #if HAVE_CONFIG_H\ + # include \ + #endif\ + \ + #include "libgettext.h"\ + \ + const struct _msg_ent _msg_tbl[] = { + h + s/.*/0/ + x + } + # + # Write msgid entries in C array form. + # + /^msgid/ { + s/msgid[ ]*\(".*"\)/ {\1/ + tb + # Append the next line + :b + N + # Look whether second part is continuation line. + s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/ + # Yes, then branch. + ta + # Because we assume that the input file correctly formed the line + # just read cannot be again be a msgid line. So it's safe to ignore + # it. + s/\(.*\)\n.*/\1/ + bc + # We found a continuation line. But before printing insert '\'. + :a + s/\(.*\)\(\n.*\)/\1\\\2/ + P + # We cannot use D here. + s/.*\n\(.*\)/\1/ + # Some buggy seds do not clear the `successful substitution since last ``t''' + # flag on `N', so we do a `t' here to clear it. + tb + # Not reached + :c + x + # The following nice solution is by + # Bruno + td + # Increment a decimal number in pattern space. + # First hide trailing `9' digits. + :d + s/9\(_*\)$/_\1/ + td + # Assure at least one digit is available. + s/^\(_*\)$/0\1/ + # Increment the last digit. + s/8\(_*\)$/9\1/ + s/7\(_*\)$/8\1/ + s/6\(_*\)$/7\1/ + s/5\(_*\)$/6\1/ + s/4\(_*\)$/5\1/ + s/3\(_*\)$/4\1/ + s/2\(_*\)$/3\1/ + s/1\(_*\)$/2\1/ + s/0\(_*\)$/1\1/ + # Convert the hidden `9' digits to `0's. + s/_/0/g + x + G + s/\(.*\)\n\([0-9]*\)/\1, \2},/ + s/\(.*\)"$/\1/ + p + } + # + # Last line. + # + $ { + i\ + };\ + + g + s/0*\(.*\)/int _msg_tbl_length = \1;/p + } + d diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/textdomain.c gtkali-0.9.5_jp/intl/textdomain.c *** gtkali-0.9.5/intl/textdomain.c Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/textdomain.c Fri Jun 16 10:50:03 2000 *************** *** 0 **** --- 1,108 ---- + /* Implementation of the textdomain(3) function. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Written by Ulrich Drepper , 1995. + + 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + #ifdef HAVE_CONFIG_H + # include + #endif + + #if defined STDC_HEADERS || defined _LIBC + # include + #endif + + #if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC + # include + #else + # include + # ifndef memcpy + # define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) + # endif + #endif + + #ifdef _LIBC + # include + #else + # include "libgettext.h" + #endif + + /* @@ end of prolog @@ */ + + /* Name of the default text domain. */ + extern const char _nl_default_default_domain[]; + + /* Default text domain in which entries for gettext(3) are to be found. */ + extern const char *_nl_current_default_domain; + + + /* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ + #ifdef _LIBC + # define TEXTDOMAIN __textdomain + # ifndef strdup + # define strdup(str) __strdup (str) + # endif + #else + # define TEXTDOMAIN textdomain__ + #endif + + /* Set the current default message catalog to DOMAINNAME. + If DOMAINNAME is null, return the current default. + If DOMAINNAME is "", reset to the default of "messages". */ + char * + TEXTDOMAIN (domainname) + const char *domainname; + { + char *old; + + /* A NULL pointer requests the current setting. */ + if (domainname == NULL) + return (char *) _nl_current_default_domain; + + old = (char *) _nl_current_default_domain; + + /* If domain name is the null string set to default domain "messages". */ + if (domainname[0] == '\0' + || strcmp (domainname, _nl_default_default_domain) == 0) + _nl_current_default_domain = _nl_default_default_domain; + else + { + /* If the following malloc fails `_nl_current_default_domain' + will be NULL. This value will be returned and so signals we + are out of core. */ + #if defined _LIBC || defined HAVE_STRDUP + _nl_current_default_domain = strdup (domainname); + #else + size_t len = strlen (domainname) + 1; + char *cp = (char *) malloc (len); + if (cp != NULL) + memcpy (cp, domainname, len); + _nl_current_default_domain = cp; + #endif + } + + if (old != _nl_default_default_domain) + free (old); + + return (char *) _nl_current_default_domain; + } + + #ifdef _LIBC + /* Alias for function name in GNU C Library. */ + weak_alias (__textdomain, textdomain); + #endif diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/intl/xopen-msg.sed gtkali-0.9.5_jp/intl/xopen-msg.sed *** gtkali-0.9.5/intl/xopen-msg.sed Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/intl/xopen-msg.sed Fri Jun 16 10:50:03 2000 *************** *** 0 **** --- 1,104 ---- + # po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file + # Copyright (C) 1995 Free Software Foundation, Inc. + # Ulrich Drepper , 1995. + # + # 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 + # the Free Software Foundation; either version 2, or (at your option) + # any later version. + # + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + # + # + # The first directive in the .msg should be the definition of the + # message set number. We use always set number 1. + # + 1 { + i\ + $set 1 # Automatically created by po2msg.sed + h + s/.*/0/ + x + } + # + # We copy all comments into the .msg file. Perhaps they can help. + # + /^#/ s/^#[ ]*/$ /p + # + # We copy the original message as a comment into the .msg file. + # + /^msgid/ { + # Does not work now + # /"$/! { + # s/\\$// + # s/$/ ... (more lines following)"/ + # } + s/^msgid[ ]*"\(.*\)"$/$ Original Message: \1/ + p + } + # + # The .msg file contains, other then the .po file, only the translations + # but each given a unique ID. Starting from 1 and incrementing by 1 for + # each message we assign them to the messages. + # It is important that the .po file used to generate the cat-id-tbl.c file + # (with po-to-tbl) is the same as the one used here. (At least the order + # of declarations must not be changed.) + # + /^msgstr/ { + s/msgstr[ ]*"\(.*\)"/\1/ + x + # The following nice solution is by + # Bruno + td + # Increment a decimal number in pattern space. + # First hide trailing `9' digits. + :d + s/9\(_*\)$/_\1/ + td + # Assure at least one digit is available. + s/^\(_*\)$/0\1/ + # Increment the last digit. + s/8\(_*\)$/9\1/ + s/7\(_*\)$/8\1/ + s/6\(_*\)$/7\1/ + s/5\(_*\)$/6\1/ + s/4\(_*\)$/5\1/ + s/3\(_*\)$/4\1/ + s/2\(_*\)$/3\1/ + s/1\(_*\)$/2\1/ + s/0\(_*\)$/1\1/ + # Convert the hidden `9' digits to `0's. + s/_/0/g + x + # Bring the line in the format ` ' + G + s/^[^\n]*$/& / + s/\(.*\)\n\([0-9]*\)/\2 \1/ + # Clear flag from last substitution. + tb + # Append the next line. + :b + N + # Look whether second part is a continuation line. + s/\(.*\n\)"\(.*\)"/\1\2/ + # Yes, then branch. + ta + P + D + # Note that `D' includes a jump to the start!! + # We found a continuation line. But before printing insert '\'. + :a + s/\(.*\)\(\n.*\)/\1\\\2/ + P + # We cannot use the sed command `D' here + s/.*\n\(.*\)/\1/ + tb + } + d diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/libjcode/ChangeLog gtkali-0.9.5_jp/libjcode/ChangeLog *** gtkali-0.9.5/libjcode/ChangeLog Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/libjcode/ChangeLog Fri Jun 16 10:41:48 2000 *************** *** 0 **** --- 1,22 ---- + Mon Jul 26 1999 Yasuyuki Furukawa + + * jstdio.c (new) + ¥á¥â¥ê´ÉÍý¤òµ¤¤Ë¤»¤º¤ËÍøÍѤǤ­¤ë + jcode_printf, jcode_scanf ¤Ê¤É¤ÎÆþ½ÐÎÏ´Ø¿ô¤ÎÄɲà + * libjcode.c (modify) + EUC¤«¤éJIS¤Ø¤ÎÊÑ´¹¤·¤¿ºÝ¡¢JIS¤Î´Á»ú¥â¡¼¥É¤Î¤Þ¤Þ½ªÎ»¤¹¤ë¤³¤È¤¬¤¢¤Ã + ¤¿¤Î¤Ç¥¢¥¹¥­¡¼¥â¡¼¥É¤Ç½ªÎ»¤¹¤ë¤è¤¦¤ËÄûÀµ + + XXX Feb XX 1999 Yasuyuki Furukawa + + * detect.c (modify) + SJIS/EUCȽÄê¤Î¶¯²½(PerlÈÇjcode.pl¤ÈƱ¤¸¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍÑ) + + * libjcode.c (modify) + ¥á¥â¥ê´ÉÍýÊý¿Ë¤ÎÊѹ¹ + toStringsAuto¤ÎÄɲà + + XXX Dec XX 1999 Kuramitsu Kimio + + * ChangeLog: Started ChangeLog + ÁÒ¸÷ ·¯Ïº¤µ¤ó¥ª¥ê¥¸¥Ê¥ëÀ½ºî diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/libjcode/Doc/rfc1468.txt gtkali-0.9.5_jp/libjcode/Doc/rfc1468.txt *** gtkali-0.9.5/libjcode/Doc/rfc1468.txt Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/libjcode/Doc/rfc1468.txt Fri Jun 16 10:41:48 2000 *************** *** 0 **** --- 1,339 ---- + + + + + + + Network Working Group J. Murai + Request for Comments: 1468 Keio University + M. Crispin + Panda Programming + E. van der Poel + June 1993 + + + Japanese Character Encoding for Internet Messages + + Status of this Memo + + This memo provides information for the Internet community. It does + not specify an Internet standard. Distribution of this memo is + unlimited. + + Introduction + + This document describes the encoding used in electronic mail [RFC822] + and network news [RFC1036] messages in several Japanese networks. It + was first specified by and used in JUNET [JUNET]. The encoding is now + also widely used in Japanese IP communities. + + The name given to this encoding is "ISO-2022-JP", which is intended + to be used in the "charset" parameter field of MIME headers (see + [MIME1] and [MIME2]). + + Description + + The text starts in ASCII [ASCII], and switches to Japanese characters + through an escape sequence. For example, the escape sequence ESC $ B + (three bytes, hexadecimal values: 1B 24 42) indicates that the bytes + following this escape sequence are Japanese characters, which are + encoded in two bytes each. To switch back to ASCII, the escape + sequence ESC ( B is used. + + The following table gives the escape sequences and the character sets + used in ISO-2022-JP messages. The ISOREG number is the registration + number in ISO's registry [ISOREG]. + + Esc Seq Character Set ISOREG + + ESC ( B ASCII 6 + ESC ( J JIS X 0201-1976 ("Roman" set) 14 + ESC $ @ JIS X 0208-1978 42 + ESC $ B JIS X 0208-1983 87 + + Note that JIS X 0208 was called JIS C 6226 until the name was changed + + + + Murai, Crispin & van der Poel [Page 1] + + RFC 1468 Japanese Character Encoding for Internet Messages June 1993 + + + on March 1st, 1987. Likewise, JIS C 6220 was renamed JIS X 0201. + + The "Roman" character set of JIS X 0201 [JISX0201] is identical to + ASCII except for backslash () and tilde (~). The backslash is + replaced by the Yen sign, and the tilde is replaced by overline. This + set is Japan's national variant of ISO 646 [ISO646]. + + The JIS X 0208 [JISX0208] character sets consist of Kanji, Hiragana, + Katakana and some other symbols and characters. Each character takes + up two bytes. + + For further details about the JIS Japanese national character set + standards, refer to [JISX0201] and [JISX0208]. For further + information about the escape sequences, see [ISO2022] and [ISOREG]. + + If there are JIS X 0208 characters on a line, there must be a switch + to ASCII or to the "Roman" set of JIS X 0201 before the end of the + line (i.e., before the CRLF). This means that the next line starts in + the character set that was switched to before the end of the previous + line. + + Also, the text must end in ASCII. + + Other restrictions are given in the Formal Syntax below. + + Formal Syntax + + The notational conventions used here are identical to those used in + RFC 822 [RFC822]. + + The * (asterisk) convention is as follows: + + l*m something + + meaning at least l and at most m somethings, with l and m taking + default values of 0 and infinity, respectively. + + + message = headers 1*( CRLF *single-byte-char *segment + single-byte-seq *single-byte-char ) + ; see also [MIME1] "body-part" + ; note: must end in ASCII + + headers = + + segment = single-byte-segment / double-byte-segment + + single-byte-segment = single-byte-seq 1*single-byte-char + + + + Murai, Crispin & van der Poel [Page 2] + + RFC 1468 Japanese Character Encoding for Internet Messages June 1993 + + + double-byte-segment = double-byte-seq 1*( one-of-94 one-of-94 ) + + single-byte-seq = ESC "(" ( "B" / "J" ) + + double-byte-seq = ESC "$" ( "@" / "B" ) + + CRLF = CR LF + + ; ( Octal, Decimal.) + + ESC = ; ( 33, 27.) + + SI = ; ( 17, 15.) + + SO = ; ( 16, 14.) + + CR = ; ( 15, 13.) + + LF = ; ( 12, 10.) + + one-of-94 = ; (41-176, 33.-126.) + + 7BIT = ; ( 0-177, 0.-127.) + + single-byte-char = + + MIME Considerations + + The name given to the JUNET character encoding is "ISO-2022-JP". This + name is intended to be used in MIME messages as follows: + + Content-Type: text/plain; charset=iso-2022-jp + + The ISO-2022-JP encoding is already in 7-bit form, so it is not + necessary to use a Content-Transfer-Encoding header. It should be + noted that applying the Base64 or Quoted-Printable encoding will + render the message unreadable in current JUNET software. + + ISO-2022-JP may also be used in MIME Part 2 headers. The "B" + encoding should be used with ISO-2022-JP text. + + Background Information + + The JUNET encoding was described in the JUNET User's Guide [JUNET] + (JUNET Riyou No Tebiki Dai Ippan). + + The encoding is based on the particular usage of ISO 2022 announced + + + + Murai, Crispin & van der Poel [Page 3] + + RFC 1468 Japanese Character Encoding for Internet Messages June 1993 + + + by 4/1 (see [ISO2022] for details). However, the escape sequence + normally used for this announcement is not included in ISO-2022-JP + messages. + + The Kana set of JIS X 0201 is not used in ISO-2022-JP messages. + + In the past, some systems erroneously used the escape sequence ESC ( + H in JUNET messages. This escape sequence is officially registered + for a Swedish character set [ISOREG], and should not be used in ISO- + 2022-JP messages. + + Some systems do not distinguish between ESC ( B and ESC ( J or + between ESC $ @ and ESC $ B for display. However, when relaying a + message to another system, the escape sequences must not be altered + in any way. + + The human user (not implementor) should try to keep lines within 80 + display columns, or, preferably, within 75 (or so) columns, to allow + insertion of ">" at the beginning of each line in excerpts. Each JIS + X 0208 character takes up two columns, and the escape sequences do + not take up any columns. The implementor is reminded that JIS X 0208 + characters take up two bytes and should not be split in the middle to + break lines for displaying, etc. + + The JIS X 0208 standard was revised in 1990, to add two characters at + the end of the table. Although ISO 2022 specifies special additional + escape sequences to indicate the use of revised character sets, it is + suggested here not to make use of this special escape sequence in + ISO-2022-JP text, even if the two characters added to JIS X 0208 in + 1990 are used. + + For further information about Japanese character encodings such as PC + codes, FTP locations of implementations, etc, see "Electronic + Handling of Japanese Text" [JPN.INF]. + + References + + [ASCII] American National Standards Institute, "Coded character set + -- 7-bit American national standard code for information + interchange", ANSI X3.4-1986. + + [ISO646] International Organization for Standardization (ISO), + "Information technology -- ISO 7-bit coded character set for + information interchange", International Standard, Ref. No. ISO/IEC + 646:1991. + + [ISO2022] International Organization for Standardization (ISO), + "Information processing -- ISO 7-bit and 8-bit coded character sets + + + + Murai, Crispin & van der Poel [Page 4] + + RFC 1468 Japanese Character Encoding for Internet Messages June 1993 + + + -- Code extension techniques", International Standard, Ref. No. ISO + 2022-1986 (E). + + [ISOREG] International Organization for Standardization (ISO), + "International Register of Coded Character Sets To Be Used With + Escape Sequences". + + [JISX0201] Japanese Standards Association, "Code for Information + Interchange", JIS X 0201-1976. + + [JISX0208] Japanese Standards Association, "Code of the Japanese + graphic character set for information interchange", JIS X 0208-1978, + -1983 and -1990. + + [JPN.INF] Ken R. Lunde , "Electronic Handling of + Japanese Text", March 1992, + msi.umn.edu(128.101.24.1):pub/lunde/japan[123].inf + + [JUNET] JUNET Riyou No Tebiki Sakusei Iin Kai (JUNET User's Guide + Drafting Committee), "JUNET Riyou No Tebiki (Dai Ippan)" ("JUNET + User's Guide (First Edition)"), February 1988. + + [MIME1] Borenstein N., and N. Freed, "MIME (Multipurpose + Internet Mail Extensions): Mechanisms for Specifying and + Describing the Format of Internet Message Bodies", RFC 1341, + Bellcore, Innosoft, June 1992. + + [MIME2] Moore, K., "Representation of Non-ASCII Text in Internet + Message Headers", RFC 1342, University of Tennessee, June 1992. + + [RFC822] Crocker, D., "Standard for the Format of ARPA Internet + Text Messages", STD 11, RFC 822, UDEL, August 1982. + + [RFC1036] Horton M., and R. Adams, "Standard for Interchange of USENET + Messages", RFC 1036, AT&T Bell Laboratories, Center for Seismic + Studies, December 1987. + + Acknowledgements + + Many people assisted in drafting this document. The authors wish to + thank in particular Akira Kato, Masahiro Sekiguchi and Ken'ichi + Handa. + + Security Considerations + + Security issues are not discussed in this memo. + + + + + + Murai, Crispin & van der Poel [Page 5] + + RFC 1468 Japanese Character Encoding for Internet Messages June 1993 + + + Authors' Addresses + + Jun Murai + Keio University + 5322 Endo, Fujisawa + Kanagawa 252 Japan + + Fax: +81 466 49 1101 + EMail: jun@wide.ad.jp + + + Mark Crispin + Panda Programming + 6158 Lariat Loop NE + Bainbridge Island, WA 98110-2098 + USA + + Phone: +1 206 842 2385 + EMail: MRC@PANDA.COM + + + Erik M. van der Poel + A-105 Park Avenue + 4-4-10 Ohta, Kisarazu + Chiba 292 Japan + + Phone: +81 438 22 5836 + Fax: +81 438 22 5837 + EMail: erik@poel.juice.or.jp + + + + + + + + + + + + + + + + + + + + + + + Murai, Crispin & van der Poel [Page 6] + \ No newline at end of file diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/libjcode/Doc/rfc1554.txt gtkali-0.9.5_jp/libjcode/Doc/rfc1554.txt *** gtkali-0.9.5/libjcode/Doc/rfc1554.txt Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/libjcode/Doc/rfc1554.txt Fri Jun 16 10:41:48 2000 *************** *** 0 **** --- 1,339 ---- + + + + + + + Network Working Group M. Ohta + Request for Comments: 1554 Tokyo Institute of Technology + Category: Informational K. Handa + ETL + December 1993 + + + ISO-2022-JP-2: Multilingual Extension of ISO-2022-JP + + Status of this Memo + + This memo provides information for the Internet community. This memo + does not specify an Internet standard of any kind. Distribution of + this memo is unlimited. + + Introduction + + This memo describes a text encoding scheme: "ISO-2022-JP-2", which is + used experimentally for electronic mail [RFC822] and network news + [RFC1036] messages in several Japanese networks. The encoding is a + multilingual extension of "ISO-2022-JP", the existing encoding for + Japanese [2022JP]. The encoding is supported by an Emacs based + multilingual text editor: MULE [MULE]. + + The name, "ISO-2022-JP-2", is intended to be used in the "charset" + parameter field of MIME headers (see [MIME1] and [MIME2]). + + Description + + The text with "ISO-2022-JP-2" starts in ASCII [ASCII], and switches + to other character sets of ISO 2022 [ISO2022] through limited + combinations of escape sequences. All the characters are encoded + with 7 bits only. + + At the beginning of text, the existence of an announcer sequence: + "ESC 2/0 4/1 ESC 2/0 4/6 ESC 2/0 5/10" is (though omitted) assumed. + Thus, characters of 94 character sets are designated to G0 and + invoked as GL. C1 control characters are represented with 7 bits. + Characters of 96 character sets are designated to G2 and invoked with + SS2 (single shift two, "ESC 4/14" or "ESC N"). + + For example, the escape sequence "ESC 2/4 2/8 4/3" or "ESC $ ( C" + indicates that the bytes following the escape sequence are Korean KSC + characters, which are encoded in two bytes each. The escape sequence + "ESC 2/14 4/1" or "ESC . A" indicates that ISO 8859-1 is designated + to G2. After the designation, the single shifted sequence "ESC 4/14 + 4/1" or "ESC N A" is interpreted to represent a character "A with + acute". + + + + Ohta & Handa [Page 1] + + RFC 1554 Multilingual Extension of ISO-2022-JP December 1993 + + + The following table gives the escape sequences and the character sets + used in "ISO-2022-JP-2" messages. The reg# is the registration number + in ISO's registry [ISOREG]. + + 94 character sets + reg# character set ESC sequence designated to + ------------------------------------------------------------------ + 6 ASCII ESC 2/8 4/2 ESC ( B G0 + 42 JIS X 0208-1978 ESC 2/4 4/0 ESC $ @ G0 + 87 JIS X 0208-1983 ESC 2/4 4/2 ESC $ B G0 + 14 JIS X 0201-Roman ESC 2/8 4/10 ESC ( J G0 + 58 GB2312-1980 ESC 2/4 4/1 ESC $ A G0 + 149 KSC5601-1987 ESC 2/4 2/8 4/3 ESC $ ( C G0 + 159 JIS X 0212-1990 ESC 2/4 2/8 4/4 ESC $ ( D G0 + + 96 character sets + reg# character set ESC sequence designated to + ------------------------------------------------------------------ + 100 ISO8859-1 ESC 2/14 4/1 ESC . A G2 + 126 ISO8859-7(Greek) ESC 2/14 4/6 ESC . F G2 + + For further information about the character sets and the escape + sequences, see [ISO2022] and [ISOREG]. + + If there is any G0 designation in text, there must be a switch to + ASCII or to JIS X 0201-Roman before a space character (but not + necessarily before "ESC 4/14 2/0" or "ESC N ' '") or control + characters such as tab or CRLF. This means that the next line starts + in the character set that was switched to before the end of the + previous line. Though the designation to JIS X 0201-Roman is allowed + for backward compatibility to "ISO-2022-JP", its use is discouraged. + Applications such as pagers and editors which randomly seek within a + text file encoded with "ISO-2022-JP-2" may assume that all the lines + begin with ASCII, not with JIS X 0201-Roman. + + At the beginning of a line, information on G2 designation of the + previous line is cleared. New designation must be given before a + character in 96 character sets is used in the line. + + The text must end in ASCII designated to G0. + + As the "ISO-2022-JP", and thus, "ISO-2022-JP-2", is designed to + represent English and modern Japanese, left-to-right directionality + is assumed if the text is displayed horizontally. + + Users of "ISO-2022-JP-2" must be aware that some common transport + such as old Bnews can not relay a 7-bit value 7/15 (decimal 127), + which is used to encode, say, "y with diaeresis" of ISO 8859-1. + + + + Ohta & Handa [Page 2] + + RFC 1554 Multilingual Extension of ISO-2022-JP December 1993 + + + Other restrictions are given in the Formal Syntax section below. + + Formal Syntax + + The notational conventions used here are identical to those used in + STD 11, RFC 822 [RFC822]. + + The * (asterisk) convention is as follows: + + l*m something + + meaning at least l and at most m somethings, with l and m taking + default values of 0 and infinity, respectively. + + message = headers 1*(CRLF text) + ; see also [MIME1] "body-part" + ; note: must end in ASCII + + text = *(single-byte-char / + g2-desig-seq / + single-shift-char) + [*segment + reset-seq + *(single-byte-char / + g2-desig-seq / + single-shift-char ) ] + ; note: g2-desig-seq must + ; precede single-shift-char + + headers = + + segment = single-byte-segment / double-byte-segment + + single-byte-segment = single-byte-seq + *(single-byte-char / + g2-desig-seq / + single-shift-char ) + + double-byte-segment = double-byte-seq + *((one-of-94 one-of-94) / + g2-desig-seq / + single-shift-char ) + + reset-seq = ESC "(" ( "B" / "J" ) + + single-byte-seq = ESC "(" ( "B" / "J" ) + + double-byte-seq = (ESC "$" ( "@" / "A" / "B" )) / + + + + Ohta & Handa [Page 3] + + RFC 1554 Multilingual Extension of ISO-2022-JP December 1993 + + + (ESC "$" "(" ( "C" / "D" )) + + g2-desig-seq = ESC "." ( "A" / "F" ) + + single-shift-seq = ESC "N" + + single-shift-char = single-shift-seq one-of-96 + + CRLF = CR LF + + ; ( Octal, Decimal.) + + ESC = ; ( 33, 27.) + + SI = ; ( 17, 15.) + + SO = ; ( 16, 14.) + + CR = ; ( 15, 13.) + + LF = ; ( 12, 10.) + + one-of-94 = ; (41-176, 33.-126.) + + one-of-96 = ; (40-177, 32.-127.) + + 7BIT = ; ( 0-177, 0.-127.) + + single-byte-char = + + MIME Considerations + + The name given to the character encoding is "ISO-2022-JP-2". This + name is intended to be used in MIME messages as follows: + + Content-Type: text/plain; charset=iso-2022-jp-2 + + The "ISO-2022-JP-2" encoding is already in 7-bit form, so it is not + necessary to use a Content-Transfer-Encoding header. It should be + noted that applying the Base64 or Quoted-Printable encoding will + render the message unreadable in non-MIME-compliant software. + + "ISO-2022-JP-2" may also be used in MIME headers. Both "B" and "Q" + encoding could be useful with "ISO-2022-JP-2" text. + + + + + + + Ohta & Handa [Page 4] + + RFC 1554 Multilingual Extension of ISO-2022-JP December 1993 + + + References + + [ASCII] American National Standards Institute, "Coded character set + -- 7-bit American national standard code for information + interchange", ANSI X3.4-1986. + + + [ISO2022] International Organization for Standardization (ISO), + "Information processing -- ISO 7-bit and 8-bit coded + character sets -- Code extension techniques", + International Standard, Ref. No. ISO 2022-1986 (E). + + [ISOREG] International Organization for Standardization (ISO), + "International Register of Coded Character Sets To Be Used + With Escape Sequences". + + [MIME1] Borenstein, N., and N. Freed, "MIME (Multipurpose Internet + Mail Extensions) Part One: Mechanisms for Specifying and + Describing the Format of Internet Message Bodies", RFC 1521, + September 1993. + + [MIME2] Moore, K., "MIME (Multipurpose Internet Mail Extensions) Part + Two: Message Header Extensions for Non-ASCII Text", RFC 1522, + September 1993. + + [RFC822] Crocker, D., "Standard for the Format of ARPA Internet Text + Messages", STD 11, RFC 1522, UDEL, August 1982. + + [RFC1036] Horton M., and R. Adams, "Standard for Interchange of + USENET Messages", RFC 1036, AT&T Bell Laboratories, Center + for Seismic Studies, December 1987. + + [2022JP] Murai, J., Crispin, M., and E. van der Poel, "Japanese + Character Encoding for Internet Messages", RFC 1468, June + 1993. + + [MULE] Nishikimi, M., Handa, K., and S. Tomura, "Mule: MULtilingual + Enhancement to GNU Emacs", Proc. of INET'93, August, 1993. + + Acknowledgements + + This memo is the result of discussion between various people in a + news group: fj.kanji and is reviewed by a mailing list: jp-msg + @iij.ad.jp. The Authors wish to thank in particular Prof. Eiichi + Wada for his suggestions based on profound knowledge in ISO 2022 and + related standards. + + + + + + Ohta & Handa [Page 5] + + RFC 1554 Multilingual Extension of ISO-2022-JP December 1993 + + + Security Considerations + + Security issues are not discussed in this memo. + + Authors' Addresses + + Masataka Ohta + Tokyo Institute of Technology + 2-12-1, O-okayama, Meguro-ku, + Tokyo 152, JAPAN + + Phone: +81-3-5499-7084 + Fax: +81-3-3729-1940 + EMail: mohta@cc.titech.ac.jp + + + Ken'ichi Handa + Electrotechnical Laboratory + Umezono 1-1-4, Tsukuba, + Ibaraki 305, JAPAN + + Phone: +81-298-58-5916 + Fax: +81-298-58-5918 + EMail: handa@etl.go.jp + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ohta & Handa [Page 6] + \ No newline at end of file diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/libjcode/Makefile.in gtkali-0.9.5_jp/libjcode/Makefile.in *** gtkali-0.9.5/libjcode/Makefile.in Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/libjcode/Makefile.in Fri Jun 16 15:12:20 2000 *************** *** 0 **** --- 1,132 ---- + # Makefile for directory with libjcode + # 1999, Yasuyuki Furukawa + # + # 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 + # the Free Software Foundation; either version 2, or (at your option) + # any later version. + # + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ + + SHELL = /bin/sh + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + top_builddir = .. + VPATH = @srcdir@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ + libdir = $(exec_prefix)/lib + includedir = $(prefix)/include + datadir = $(prefix)/@datadir@ + subdir = libjcode + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + + l = + + AR = ar + CC = @CC@ + LIBTOOL = @LIBTOOL@ + RANLIB = @RANLIB@ + + DEFS = @DEFS@ + CPPFLAGS = @CPPFLAGS@ + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ + + COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) + CCLD = $(CC) + LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ + + HEADERS = jlib.h jlibconfig.h + SOURCES = $(COMSRCS) detect.c libjcode.c jstdio.c + OBJECTS = detect.$lo libjcode.$lo jstdio.$lo + DISTFILES.common = README ChangeLog \ + Doc/rfc1468.txt Doc/rfc1554.txt \ + Makefile.in $(HEADERS) $(SOURCES) + + .SUFFIXES: + .SUFFIXES: .c .o .lo + .c.o: + $(COMPILE) $< + .c.lo: + $(LIBTOOL) --mode=compile $(COMPILE) $< + + INCLUDES = -I.. -I. -I$(top_srcdir)/libjcode -I$(top_srcdir)/lib + + #all: all-@COMPILE_LIBJCODE@ + all: all-yes + + all-yes: libjcode.$la + all-no: + + libjcode.a: $(OBJECTS) + rm -f $@ + $(AR) cru $@ $(OBJECTS) + # $(RANLIB) $@ + + libjcode.la: $(OBJECTS) + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \ + -version-info 1:0 -rpath $(libdir) + + sample: all sample.$lo + $(LINK) $(OBJECTS) sample.$lo -ljcode -L.libs -L. + + check: all + + # This installation is ignored. + + install: install-exec install-data + install-exec: all + + install-data: all + + # Define this as empty until I found a useful application. + installcheck: + + uninstall: + + info dvi: + + tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) + here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES) + + id: ID + + ID: $(HEADERS) $(SOURCES) + here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES) + + + mostlyclean: + rm -f *.a *.o *.lo core core.* + + clean: mostlyclean + + distclean: clean + rm -f Makefile ID TAGS + + maintainer-clean: distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + + Makefile: Makefile.in ../config.status + cd .. \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + .NOEXPORT: diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/libjcode/README gtkali-0.9.5_jp/libjcode/README *** gtkali-0.9.5/libjcode/README Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/libjcode/README Fri Jun 16 10:41:48 2000 *************** *** 0 **** --- 1,158 ---- + libjcode ¥é¥¤¥Ö¥é¥ê¥Ñ¥Ã¥±¡¼¥¸ 1.00 ÈÇ/ 1996 + + ¤´Â¸ÃΤÎÄ̤ꡢÆüËܸì¤òɽ¤¹¤¿¤á¤Îʸ»ú¥³¡¼¥É¤Ï¡¢JIS(ISO-2022)¡¢EUC¡¢SJIS ¤Î + £³¼ïÎब¤è¤¯»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï¡¢¥Ñ¥½¥³¥ó´Ö¤ÇSJIS¤Îʸ¾Ï¤ò¤ä¤ê¼è¤ê¤¹¤ë»þ + ¤Ï¡¢²¿¤Ë¤âÌäÂê¤Î¤Ê¤¤ÏäǤ·¤¿¡£¤·¤«¤·¡¢WWW ¤Î¤è¤¦¤Ê¥¤¥ó¥¿¡¼¥Í¥Ã¥È»þÂå¤Ë¤Ê¤ë + ¤È¡¢ÍÍ¡¹¤Êʸ»ú¥³¡¼¥É¤¬º®ºß¤·¤Æ¤·¤Þ¤¤¡¢Â礭¤Êº®Íð¤ò¾·¤¯·ë²Ì¤Ë¤Ê¤ê¤Þ¤¹¡£ + + ¤½¤ó¤ÊÃæ¤Ç¿¤¯¤Î¥×¥í¥°¥é¥Þ¡¼¤¬ÆüËܸ쥳¡¼¥É½èÍý¤ÎÈÑ»¨¤µ¤Î櫤˴٤é¤Ê¤¯¤ÆºÑ¤à + ¤è¤¦¤Ë¤Þ¤È¤á¤¿¤Î¤¬¡¢¤³¤Î C¸À¸ìÍѤΠlibjcode ¥é¥¤¥Ö¥é¥ê¤Ç¤¹¡£ + + -- libjcode ¥Ñ¥Ã¥±¡¼¥¸¤ÎÆÃħ ------------------------------------------------ + + 1. ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤Ç¤ÎÍøÍѤòÁ°Äó¤È¤·¤¿ÆüËܸ쥳¡¼¥ÉÊÑ´¹¥é¥¤¥Ö¥é¥ê + 2. SJIS Ⱦ³Ñ¥«¥Ê¤òÁ´³Ñ¤ËÊÑ´¹²Äǽ + + -- ¥Ñ¥Ã¥±¡¼¥¸¤ÎÃæ¿È --------------------------------------------------------- + + / + README ¤³¤Î¥Õ¥¡¥¤¥ë + Makefile Unix ÈÇ Makefile + config.h ÀßÄêÍÑ #include ¥Õ¥¡¥¤¥ë + libjcode.c JIS¡¢SJIS¡¢EUC¤ÎÊÑ´¹ + detect.c ¥³¡¼¥ÉȽÄêÍÑ + sample.c ´Êñ¤Ê¥µ¥ó¥×¥ë¥×¥í¥°¥é¥à + jlib.h ¥é¥¤¥Ö¥é¥êÍÑ #include ¥Õ¥¡¥¤¥ë + + Doc/ + rfc1468.txt RFC1468 + "Japanese Character Encoding for Internet Messages." + rfc1554.txt RFC1554 + "ISO-2022-JP-2: Multilingual Extension of ISO-2022-JP" + + -- ÍøÍѾå¤ÎÃí°Õ ------------------------------------------------------------- + + libjcode ¤Ï¡¢´°Á´¤Ë¥Õ¥ê¡¼¤Ê¥é¥¤¥Ö¥é¥ê¤Ç¤¹¡£¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤Ë¤ª¤±¤ëÆüËܸì´Ä¶­ + ¤Î²þÁ±¤òºÇ½ªÌÜɸ¤Ë¤·¤Æ¤ª¤ê¤Þ¤¹¡£ÆüËܸ쥳¡¼¥É¤ÎÊÑ´¹¤ò¹Ô¤¤¤¿¤¤Êý¤Ê¤éï¤Ç¤â¡¢ + ¼«Í³¤Ë²þÎɤ·¤Æ¡¢¼«Ê¬¤Î¥×¥í¥°¥é¥à¤Ë¹ç¤ï¤»¤ÆÁȤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ + + ¤¿¤À¤·¡¢ÍøÍѤˤ¹¤ë¾ì¹ç¤Ï¼¡¤Î¾ò·ï¤ò¼é¤Ã¤Æ¤¯¤À¤µ¤¤¡£ + + 1. libjcode ¤òÍøÍѤ·¤¿¤¿¤á¤ËÇ¡²¿¤Ê¤ë»³²¤¬À¸¤¸¤Æ¤âºî¼Ô¤Ë¤Ï°ìÀÚ¤ÎÀÕǤ¤ò + ¼è¤ê¤Þ¤»¤ó¡£ + 2. ¹ñΩÂç³Ø¤Î¥³¥ó¥Ô¥å¡¼¥¿»ñ¸»¤ò»È¤Ã¤Æ¤¤¤ë¤Î¤Ç¡¢Ãøºî¸¢É½¼¨¡¢ + (C) Kuramitsu Kimio, Tokyo Univ. 1996-97 + ¤òÇ°¤Î¤¿¤á¤Ë»Ä¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£ + + ¥é¥¤¥Ö¥é¥êÍøÍÑÃæ¤Ë¥Ð¥°¤òȯ¸«¤·Ä¾¤µ¤ì¤¿Êý¡¢¤è¤ê¸úΨ¤Î¤è¤ê¥¢¥ë¥´¥ê¥º¥à¤ò¼ÂÁõ + ¤Ê¤µ¤Ã¤¿Êý¤Ï¡¢¤½¤ì¤òºî¼Ô¤ËÁ÷¤Ã¤Æ失¤ë¤È¡¢libjcode ¤È¤·¤Æ¤â¤è¤ê¿®ÍêÀ­¤Î¹â¤¤ + ¥é¥¤¥Ö¥é¥ê¤Ø¤ÈÀ®Ä¹¤Ç¤­¤Þ¤¹¡£¤è¤í¤·¤¯¤ª´ê¤¤¤·¤Þ¤¹¡£ + + ¤Þ¤¿¡¢libjcode¤òÁȤ߹þ¤ó¤À¥½¥Õ¥È¥¦¥¨¥¢¤Î̾Á°¤â¶µ¤¨¤Æ¤¤¤¿¤À¤±¤ë¤È¡¢¼ÂºÝ¤Î¼Â + ÁõÎã¤È¤·¤Æ¡¢¾Ò²ð¤·¤¿¤¤¤È»×¤¤¤Þ¤¹¡£ + + -- »È¤¤Êý ------------------------------------------------------------------- + + 1. ¤Þ¤º¡¢make ¤Ë¤è¤Ã¤Æ¡¢libjcode.a ¥é¥¤¥Ö¥é¥ê¤òºî¤ê¤Þ¤¹¡£ + config.h ¤òľ¤¹¤³¤È¤Ç¡¢Â¿¾¯µ¡Ç½¤òÊѤ¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¤¬¡¢¥½¡¼¥¹¥³¡¼¥É + ¤òÆɤó¤ÀÊý¤¬Áᤤ¤Ç¤·¤ç¤¦¡£ + + 2. ¥µ¥ó¥×¥ë¥×¥í¥°¥é¥à sample.c ¤È Makefile ¤ò¸«¤ë¤È¡¢¤³¤Î¥é¥¤¥Ö¥é¥ê¤ò¤É¤Î + ¤è¤¦¤ËÁȤ߹þ¤à¤«»²¹Í¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ + + -- Æ°ºî³Îǧ´Ä¶­ ------------------------------------------------------------- + + ANSI C ¥³¥ó¥Ñ¥¤¥é¤ò»È¤Ã¤Æ¤¤¤ì¤Ð¡¢ÉáÄ̤˥³¥ó¥Ñ¥¤¥ë¤Ç¤­¤ë¤Ï¤º¤Ç¤¹¡£ + + Solaris 2.5 (Sparc) with gcc 2.7.2 + Linux 2.0 with gcc 2.7.2 + + -- ¥é¥¤¥Ö¥é¥ê¤Î°ìÍ÷ --------------------------------------------------------- + + ÉáÄ̤˻Ȥ¨¤ë¥é¥¤¥Ö¥é¥ê´Ø¿ô¤Ï¡¢jlib.h ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë¤Ë½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£ºÇ½é + ¤Ë #include "jlib.h" ¤òÄɲä·¤Þ¤¹¡£ + + #define ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÆâÍÆ + + #define ASCII ASCII ¥³¡¼¥É + #define JIS iso-2022-jp ¥³¡¼¥É + #define EUC x-euc-jp ¥³¡¼¥É + #define SJIS x-sjis ¥³¡¼¥É + + ´Ø¿ô: + + extern int detectKanjiCode(char *str); + + ʸ»úÎó str ¤Î¥³¡¼¥É¤òȽÄꤷ¤Þ¤¹¡£ + ÊÖ¤êÃͤϡ¢ASCII, JIS, EUC, SJIS ¤Î¤É¤ì¤«¤Ç¤¹¡£ + + extern char *toStringJIS(char *str); + + ʸ»úÎó str ¤òJIS ¥³¡¼¥É¤ËÊÑ´¹¤·¤Þ¤¹¡£ + + extern char *toStringEUC(char *str); + + ʸ»úÎó str ¤òEUC ¥³¡¼¥É¤ËÊÑ´¹¤·¤Þ¤¹¡£ + + extern char *toStringSJIS(char *str); + + ʸ»úÎó str ¤òSJIS ¥³¡¼¥É¤ËÊÑ´¹¤·¤Þ¤¹¡£ + + -- ÃΤé¤ì¤Æ¤¤¤ëÌäÂêÅÀ ------------------------------------------------------- + + Ⱦ³ÑSJIS¤¬´Þ¤Þ¤ì¤¿¥Æ¥­¥¹¥È¤òÁÛÄꤷ¤Æ¤¤¤ë¤Î¤Ç¡¢EUC ¤È SJIS ¤Î¼«Æ°È½Ä꤬ + ¤«¤Ê¤ê¼å¤¤¡£ + + -- º£¸å¤ÎͽÄê --------------------------------------------------------------- + + ³Î¼Â¤Ë¤ä¤í¤¦¤È»×¤Ã¤Æ¤¤¤ë¤³¤È¡£ + JIS X 0212-1990 (¯¾Î Êä½õ´Á»ú)¤ÎÊÑ´¹¤ËÂбþ + MIME ¥Ø¥Ã¥À¤Î¥¨¥ó¥³¡¼¥É/¥Ç¥³¡¼¥É + + ¤Ç¤­¤¿¤é¤ä¤ê¤¿¤¤¤³¤È(CGI ¸þ¤±¥é¥¤¥Ö¥é¥ê) + Á´³Ñ --> Ⱦ³Ñ + (Îã £æ£ï£ï¡÷£í£á£é£ì¡¥£ã£ï£í --> foo@mail.com) + Ê¿²¾Ì¾ <--> ¥«¥¿¥«¥Ê + ROMAN »ú --> ¤«¤Ê + (Kuramitsu --> ¤¯¤é¤ß¤Ä) + + Ä©À路¤¿¤¤¤³¤È¡£ + SJIS ¤È ISO-8859-1(laten) ¤Î¼«Æ°¼±ÊÌ + + Æ»µÁŪ¤ËǺ¤à¤È¤³¤í + Unicode ¤Ø¤ÎÂбþ + + + -- Îò»Ë --------------------------------------------------------------------- + + libjcode ¤òºî¤ëľÀܤΤ­¤Ã¤«¤±¤È¤Ê¤Ã¤¿¤Î¤Ï¡¢Thomus Boutell Ãø¤Î + "CGI Programming with C and Perl"(Addison-Wesley)¤ËÉÕ°¤¹¤ë¥µ¥ó¥×¥ëCGI¥×¥í + ¥°¥é¥à¤òÆüËܸì¤ÎÆþÎϤò¼õ¤±ÉÕ¤±¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë¡¢´Á»ú¥³¡¼¥ÉÊÑ´¹¤Ë¿¨¤ì¤ëɬ + Í×À­¤¬¤¢¤ê¤Þ¤·¤¿¡£¤È¤³¤í¤¬¡¢PerlÍѤˤÏÍ¥¤ì¤¿´Á»úÊÑ´¹¤Î¥é¥¤¥Ö¥é¥ê¤¬Â¸ºß¤·¤Þ + ¤·¤¿¤¬¡¢»ÄÇ°¤Ê¤¬¤éCÈǤˤϡ¢Í¥¤ì¤¿¥é¥¤¥Ö¥é¥ê¤¬¼ê¤ËÆþ¤ì¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç + ¤·¤¿¡£ + + ¤½¤³¤Ç¡¢Ken Lunde Ãø¤Î¡ÖÆüËܸì¾ðÊó½èÍý¡×(O'Reilly)¤ò»²¹Í¤Ë¥é¥¤¥Ö¥é¥êºîÀ®¤ò + »Ï¤á¤ë¤³¤È¤Ë¤·¤Þ¤·¤¿¡£ + + 1996/12/10 ¥Û¡¼¥à¥Ú¡¼¥¸¾å¤Ç¸ø³«³«»Ï¡£ + http://www.lib.m.u-tokyo.ac.jp/~kiki/libjcode/ + + 1996/12/19 "CGI Programming with C and Perl5"¤ÎÆüËܸìÈÇÉÕÏ¿CD-ROMÉÕÏ¿ + ¤È¤·¤Æ¡¢libjcode-1.00 ÇÛÉÛ³«»Ï + + -- ¼Õ¼­ --------------------------------------------------------------------- + + ºä¼¸¦µæ¼¼¤ÎÀèÇڤǤ¢¤ëÀîȨ ÂÀ°ì(kawabata@is.s.u-tokyo.ac.jp)¤µ¤ó¤Ë¤Ï¡¢ÆüËÜ + ¸ì½èÍý¤È¤¤¤¦¶¹¤¤´ÑÅÀ¤Ë¤È¤é¤ï¤ì¤º¡¢¹­¤¯Â¿¹ñ¸ì´Ä¶­¤ä½èÍý¤Ë¤Ä¤¤¤ÆÍÍ¡¹¤Ê½õ¸À¤ä + ¥¢¥É¥Ð¥¤¥¹¤ò¤·¤Æ夭¤Þ¤·¤¿¡£¤Þ¤¿¡¢Ëܥ饤¥Ö¥é¥ê¼Â¸½¤Î¤¿¤á¤Î¥Ð¥°¼è¤ê¤â¼êÅÁ¤Ã + ¤Æ夭¤Þ¤·¤¿¡£ + + --- + Ëܥ饤¥Ö¥é¥ê¤ò³èÍѤ·¤Æ¿¤¯¤ÎCGI¥×¥í¥°¥é¥à¤äWindows/Macintosh ÍѤΥե꡼¥¦ + ¥¨¥¢¡¢¤Þ¤¿¾¦ÍÑ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÎÆüËܸìÈǤ¬Àµ¤·¤¯´Á»ú¥³¡¼¥É¤ò°·¤¨¤ë¤è¤¦¤Ë + ¤Ê¤Ã¤Æ失¤ì¤ì¤Ð¡¢¹¬¤¤¤Ç¤¹¡£ + + 1996ǯ 12·î + ÁÒ¸÷ ·¯Ïº / Kuramitsu Kimio + kiki@is.s.u-tokyo.ac.jp diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/libjcode/detect.c gtkali-0.9.5_jp/libjcode/detect.c *** gtkali-0.9.5/libjcode/detect.c Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/libjcode/detect.c Fri Jun 16 10:41:48 2000 *************** *** 0 **** --- 1,204 ---- + /* + * detect.c - libjcode ¥³¡¼¥É¼«Æ°È½Äê¥ë¡¼¥Á¥ó + * (C) Kuramitsu Kimio, Tokyo Univ. 1996-97 + * + * Ken Lunde Ãø ¡ÖÆüËܸì¾ðÊó½èÍý¡× ¤È jconv.c ¤ò»²¹Í¤Ëºî¤ê + * ¤Þ¤·¤¿¡£ + * CGI ¥×¥í¥°¥é¥à¤Ç¤ÎÍøÍѤò¹Í¤¨¤Æ¡¢¤Ò¤é¤¬¤Ê¡¢¤«¤¿¤«¤Ê¤ÎÊÂ¤Ó + * ¤Ë¤è¤ëSJIS, EUC ¤Î¿äÄꥢ¥ë¥´¥ê¥º¥àÅù¤ò²Ã¤¨¤Æ¤¢¤ê¤Þ¤¹¡£ + * + * ¹¹¿·ÍúÎò + * - jcode.pl¤ÎSJIS/EUCȽÄê¤Ë¥³¡¼¥É¤òÍѤ¤¤¿ + * Yasuyuki Furukawa (yasu@on.cs.keio.ac.jp) + */ + + #include + #include "config.h" + #include "jlibconfig.h" + + static int _detect(unsigned char *str, int expected); + static int _detect_euc_or_sjis(unsigned char *str); + void printDetectCode(int detected); + int detectKanjiCode(char *str); + + + /* ------------------------------------------------------ ´Á»ú¥³¡¼¥É¤Î¼±ÊÌ --*/ + + static int _detect(unsigned char *str, int expected) + { + register int c; + + while((c = (int)*str)!= '\0') { + + /* JIS ¥³¡¼¥É¤ÎȽÄê */ + if(c == ESC) { + if((c = (int)*(++str)) == '\0') return expected; + if (c == '$') { + if((c = (int)*(++str)) == '\0') return expected; + /* ESC $ B --> ¿·JIS + ESC $ @ --> µìJIS */ + if (c == 'B' || c == '@') return JIS; + } + #ifdef NECKANJI + if (c == 'K') + return NEC; /* ESC K --> NEC JIS */ + #endif + str++; + continue; + } + + /* SJIS ¤Ë°ì°Õ¤Ë·èÄê */ + if ((c >= 129 && c <= 141) || (c >= 143 && c <= 159)) + return SJIS; + /* SS2 */ + if (c == SS2) { + if((c = (int)*(++str)) == '\0') return expected; + if ((c >= 64 && c <= 126) || (c >= 128 && c <= 160) || + (c >= 224 && c <= 252)) return SJIS; + if (c >= 161 && c <= 223) expected = EUCORSJIS; + str++; + continue; + } + + if (c >= 161 && c <= 223) { + if((c = (int)*(++str)) == '\0') return expected; + + if (c >= 240 && c <= 254) + return EUC; + if (c >= 161 && c <= 223) { + expected = EUCORSJIS; + str++; + continue; + } + if (c <= 159) return SJIS; + if (c >= 240 && c <= 254) return EUC; + + if (c >= 224 && c <= 239) { + expected = EUCORSJIS; + while (c >= 64) { + if (c >= 129) { + if (c <= 141 || (c >= 143 && c <= 159)) + return SJIS; + else if (c >= 253 && c <= 254) { + return EUC; + } + } + if((c = (int)*(++str)) == '\0') return EUCORSJIS; + } + str++; + continue; + } + + if (c >= 224 && c <= 239) { + if((c = (int)*(++str)) == '\0') return expected; + if ((c >= 64 && c <= 126) || (c >= 128 && c <= 160)) + return SJIS; + if (c >= 253 && c <= 254) return EUC; + if (c >= 161 && c <= 252) + expected = EUCORSJIS; + } + } + str++; + } + return expected; + } + + /* ---------------------------------------------------SJIS ¤« EUC ¤ÎȽÄê -- */ + /* ÆüËܸì¤ÎÆÃħ(¤Ò¤é¤¬¤Ê¡¢¥«¥¿¥«¥Ê)¤«¤éȽÄꤹ¤ë¤¿¤á¡¢ + ȽÄê¥ß¥¹¤¬È¯À¸¤¹¤ë¾ì¹ç¤â¤¢¤ê¤Þ¤¹¡£ */ + + static int _detect_euc_or_sjis(unsigned char *str) { + int c1, c2; + int euc_c = 0, sjis_c = 0; + unsigned char *ptr; + static int expected = EUCORSJIS; + + #ifdef USE_CACHE_KANA_NARABI + if (expected != EUCORSJIS) + return expected; + #endif + + ptr = str, c2 = 0; + while ((c1 = (int)*ptr++) != '\0') { + if ((c2 > 0x80 && c2 < 0xa0) && (c2 >= 0xe0 && c2 < 0xfd) && + (c1 >= 0x40 && c1 < 0x7f) && (c1 >= 0x80 && c1 < 0xfd)) + sjis_c++, c1 = *ptr++; + c2 = c1; + } + if (sjis_c == 0) + expected = EUC; + else { + ptr = str, c2 = 0; + while ((c1 = (int)*ptr++) != '\0') { + if ((c2 > 0xa0 && c2 < 0xff) && + (c1 > 0xa0 && c1 < 0xff)) + euc_c++, c1 = *ptr++; + c2 = c1; + } + if (sjis_c > euc_c) + expected = SJIS; + else + expected = EUC; + } + return expected; + } + + /* ---------------------------------------------------------- Public ´Ø¿ô -- */ + + + #ifdef DEBUG + void printDetectCode(int detected) { + switch(detected) { + case ASCII: + fprintf(stderr, "ASCII/JIS-Roman characters(94 printable)\n"); + break; + case JIS: + fprintf(stderr, "JIS(iso-2022-jp)\n"); + break; + case EUC: + fprintf(stderr, "EUC(x-euc-jp)\n"); + break; + case SJIS: + fprintf(stderr, "SJIS(x-sjis)\n"); + break; + case NEW: + fprintf(stderr, "JIS X 0208-1990\n"); + break; + case OLD: + fprintf(stderr, "JIS X 0208-1978\n"); + break; + case EUCORSJIS: + fprintf(stderr, "EUC or SJIS\n"); + break; + default: + printf("Another Codes!!\n"); + } + } + #endif + + int detectKanjiCode(char *str) + { + static int detected = ASCII; + + if(!str) return (0); + + /* JIS, EUC, SJIS, EUCORSJIS ¤ÎȽÄê */ + detected = _detect((unsigned char *)str, ASCII); + + /* ¿·JIS, µìJIS, NEC JIS ¤Î¾ì¹ç¡¢JIS ¤ËÊѹ¹¤¹¤ë */ + if(detected == NEW || detected == OLD || detected == NEC) + return JIS; + + /* SJIS ¤« EUC ¤Î¶èÊ̤ò¥«¥Ê¤ÎʤӤ«¤é¿äÄꤹ¤ë */ + if(detected == EUCORSJIS) + #ifdef KANA_NARABI + detected = _detect_euc_or_sjis((unsigned char *)str); + #else + detected = EUC; /* ¥Ç¥Õ¥©¥ë¥È EUC */ + #endif + #ifdef DEBUG + printDetectCode(detected); + #endif + + return detected; + } diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/libjcode/jlib.h gtkali-0.9.5_jp/libjcode/jlib.h *** gtkali-0.9.5/libjcode/jlib.h Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/libjcode/jlib.h Fri Jun 16 10:41:48 2000 *************** *** 0 **** --- 1,28 ---- + /* + * jlib.h -- jlib.c ÍѤΥإåÀ¥Õ¥¡¥¤¥ë by. ÁÒ¸÷ ·¯Ïº + * + * jlib.c ¤òÍøÍѤ¹¤ë¾ì¹ç¤Ï¡¢include ¤·¤Æ¤¯¤À¤µ¤¤¡£ + * + */ + + #define ASCII 0 + #define JIS 1 + #define EUC 2 + #define SJIS 3 + #define AUTO -1 + + extern int detectKanjiCode(char *str); + extern char *toStringJIS(char *str); + extern char *toStringEUC(char *str); + extern char *toStringSJIS(char *str); + extern char *toStringAuto(char *str); + + extern int jconv_printf(int code, char *fmt, ...); + extern int jconv_fprintf(int code, FILE *fp, char *fmt, ...); + extern int jconv_sprintf(int code, char *buf, char *fmt, ...); + extern int jconv_snprintf(int code, char *buf, int len, char *fmt, ...); + + extern int jconv_scanf(int code, char *fmt, ...); + extern int jconv_fscanf(int code, FILE *fp, char *fmt, ...); + extern int jconv_sscanf(int code, char *buf, char *fmt, ...); + diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/libjcode/jlibconfig.h gtkali-0.9.5_jp/libjcode/jlibconfig.h *** gtkali-0.9.5/libjcode/jlibconfig.h Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/libjcode/jlibconfig.h Fri Jun 16 10:41:48 2000 *************** *** 0 **** --- 1,42 ---- + /* + * config.h + */ + + #define ASCII 0 + #define JIS 1 + #define EUC 2 + #define SJIS 3 + #define NEW 4 + #define OLD 5 + #define NEC 6 + #define EUCORSJIS 7 + #define NUL 0 + #define LF 10 + #define FF 12 + #define CR 13 + #define ESC 27 + #define SS2 142 + #define TRUE 1 + #define FALSE 0 + + /* Ⱦ³Ñ¥«¥Ê(SJIS) ¤ò¶¯À©Åª¤ËÁ´³Ñ¥«¥Ê¤ËÊѹ¹¤¹¤ë */ + #undef NO_HANKAKU_SJIS + + /* ¤Ò¤é¤¬¤Ê¡¢¥«¥¿¥«¥Ê¤ÎʤӤ«¤é EUC , SJIS ¤ò¿äÄꤹ¤ë */ + #define KANA_NARABI + + /* EUC , SJIS ¤ò¿äÄê¤ò»Ï¤á¤Î°ìÅÙ¤·¤«¹Ô¤Ê¤ï¤Ê¤¤ */ + /* (¥Õ¥¡¥¤¥ë¤ò°ì¤Ä¤·¤«¤Ò¤é¤«¤Ê¤¤¤Ê¤éÍ­¸ú¤Ç¤¤¤¤) */ + #undef USE_CACHE_KANA_NARABI + + /* strdup´Ø¿ô¤¬¥·¥¹¥Æ¥à¤Ë¤¢¤ì¤Ðdefine */ + #define HAVE_STRDUP 1 + + /* ¥Ç¥Ð¥Ã¥¯ÍѤδؿô¤òÍ­¸ú¤Ë¤¹¤ë */ + #undef DEBUG + + /* ¥í¥±¡¼¥ë̾(Âçʸ»ú¡¢¾®Ê¸»ú¤Ï¶èÊ̤µ¤ì¤Ê¤¤) */ + #define SJIS_LOCALE_NAME "ja_JP.SJIS", "ja_JP.PCK" + #define JIS_LOCALE_NAME "ja_JP.JIS", "ja_JP.jis7" + #define EUC_LOCALE_NAME "ja_JP.ujis", "ja_JP.EUC",\ + "ja_JP.eucJP", "ja_JP", "japanese", "ja" diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/libjcode/jstdio.c gtkali-0.9.5_jp/libjcode/jstdio.c *** gtkali-0.9.5/libjcode/jstdio.c Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/libjcode/jstdio.c Fri Jun 16 10:41:48 2000 *************** *** 0 **** --- 1,279 ---- + #include + #include + #include + #include + #include "jlib.h" + #define STACKSIZ 32 + + typedef struct { + int str_stack_num; + char *str_stackbuf[STACKSIZ]; + char **str_stack; + } jconv_stack; + + char *push_jconv_stack(jconv_stack *st, int code, char *str) + { + char *jstr = NULL; + + if (st->str_stack_num < STACKSIZ) { + switch (code) { + case JIS: jstr = toStringJIS(str); break; + case EUC: jstr = toStringEUC(str); break; + case SJIS: jstr = toStringSJIS(str); break; + default: jstr = toStringAuto(str); break; + } + if (jstr) { + *(st->str_stack++) = jstr; + st->str_stack_num++; + } + } + + return jstr; + } + + int pop_jconv_stack(jconv_stack *st) + { + if (st->str_stack_num > 0) { + free(*(--st->str_stack)); + st->str_stack_num--; + return 1; + } + return 0; + } + + jconv_stack *create_jconv_stack() + { + jconv_stack* st = (jconv_stack *)malloc(sizeof(jconv_stack)); + + st->str_stack = st->str_stackbuf; + st->str_stack_num = 0; + return st; + } + + void delete_jconv_stack(jconv_stack *st) + { + if (st) { + while (pop_jconv_stack(st)); + free(st); + } + } + + #define jconv_va_end(ap) \ + { \ + va_end(ap); \ + } + + + #define jconv_va_start(code, st, ap, fmt) \ + { \ + char *fmt_ptr = fmt; \ + unsigned char c; \ + int i; \ + double d; \ + char *s; \ + va_start(ap, fmt); \ + while ((c = *fmt_ptr++)) { \ + if (c == '%') { \ + int flag = 0; \ + while ((c = *fmt_ptr++)) { \ + if (flag == 0) { \ + if ( c == '%') \ + break; \ + if (c == '-' || c == '+' || c == ' ') \ + continue; \ + } \ + flag = 1; \ + if (isdigit(c) || c == '.') \ + continue; \ + if (isalpha(c)) \ + break; \ + } \ + switch (c) \ + { \ + case 'd': case 'i': case 'o': case 'x': case 'X': \ + i = va_arg(ap, int); break; \ + case 'e': case 'E': case 'f': case 'g': \ + d = va_arg(ap, double); break; \ + case 'c': \ + c = va_arg(ap, char); break; \ + case 's': \ + { \ + char **str_ptr = (char**)ap, *jstr; \ + jstr = push_jconv_stack(st, code, *str_ptr); \ + if (jstr) *str_ptr = jstr; \ + } \ + s = va_arg(ap, char*); break; \ + } \ + } \ + } \ + va_end(ap); \ + } \ + va_start(ap,fmt); + + + static void jconv_va_arg_convert(int code, int n, va_list ap, char *fmt) + { + char *fmt_ptr = fmt; + unsigned char c; + int i; + double d; + char *s; + + while ((c = *fmt_ptr++) && n >0) { + if (c == '%') { + int flag = 0; + while ((c = *fmt_ptr++)) { + if (flag == 0) { + if ( c == '%') + break; + if (c == '-' || c == '+' || c == ' ') + continue; + } + flag = 1; + if (isdigit(c) || c == '.') + continue; + if (isalpha(c)) + break; + } + switch (c) + { + case 'd': case 'i': case 'o': case 'x': case 'X': + i = *va_arg(ap, int*); n--; break; + case 'e': case 'E': case 'f': case 'g': + d = *va_arg(ap, double*); n--; break; + case 'c': + c = *va_arg(ap, char*); n--; break; + case 's': + { + char **str_ptr = (char**)ap, *jstr; + switch(code) { + case JIS: jstr = toStringJIS(*str_ptr); break; + case EUC: jstr = toStringEUC(*str_ptr); break; + case SJIS: jstr = toStringSJIS(*str_ptr); break; + default: jstr = toStringAuto(*str_ptr); break; + } + if (jstr) { + strcpy(*str_ptr, jstr); + free(jstr); + } + s = va_arg(ap, char*); n--; break; + } + } + } + } + } + + int jconv_printf(int code, char *fmt, ...) + { + va_list ap; + int n; + char *jfmt; + jconv_stack *st = create_jconv_stack(); + + jfmt = push_jconv_stack(st, code, fmt); + + jconv_va_start(code, st, ap, fmt); + n = vprintf (jfmt, ap); + jconv_va_end(ap); + + delete_jconv_stack(st); + + return n; + } + + int jconv_fprintf(int code, FILE *fp, char *fmt, ...) + { + va_list ap; + int n; + char *jfmt; + jconv_stack *st = create_jconv_stack(); + + jfmt = push_jconv_stack(st, code, fmt); + + jconv_va_start(code, st, ap, fmt); + n = vfprintf (fp, jfmt, ap); + jconv_va_end(ap); + + delete_jconv_stack(st); + + return n; + } + + int jconv_snprintf(int code, char *buf, int len, char *fmt, ...) + { + va_list ap; + int n; + char *jfmt; + jconv_stack *st = create_jconv_stack(); + + jfmt = push_jconv_stack(st, code, fmt); + + jconv_va_start(code, st, ap, fmt); + n = vsnprintf (buf, len, jfmt, ap); + jconv_va_end(ap); + + delete_jconv_stack(st); + + return n; + } + + int jconv_sprintf(int code, char *buf, char *fmt, ...) + { + va_list ap; + int n; + char *jfmt; + jconv_stack *st = create_jconv_stack(); + + jfmt = push_jconv_stack(st, code, fmt); + + jconv_va_start(code, st, ap, fmt); + n = vsprintf (buf, jfmt, ap); + jconv_va_end(ap); + + delete_jconv_stack(st); + + return n; + } + + int jconv_scanf(int code, char *fmt, ...) + { + va_list ap; + int n; + + va_start(ap, fmt); + n = vscanf (fmt, ap); + va_end(ap); + + va_start(ap, fmt); + jconv_va_arg_convert(code, n, ap, fmt); + va_end(ap); + + return n; + } + + int jconv_fscanf(int code, FILE *fp, char *fmt, ...) + { + va_list ap; + int n; + + va_start(ap, fmt); + n = vfscanf (fp, fmt, ap); + jconv_va_arg_convert(code, n, ap, fmt); + va_end(ap); + + return n; + } + + int jconv_sscanf(int code, char *buf, char *fmt, ...) + { + va_list ap; + int n; + + va_start(ap, fmt); + n = vsscanf (buf, fmt, ap); + jconv_va_arg_convert(code, n, ap, fmt); + va_end(ap); + + return n; + } + diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/libjcode/libjcode.c gtkali-0.9.5_jp/libjcode/libjcode.c *** gtkali-0.9.5/libjcode/libjcode.c Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/libjcode/libjcode.c Fri Jun 16 10:41:48 2000 *************** *** 0 **** --- 1,564 ---- + /* + * libjcode.c -- ´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥ê 1.0 ÈÇ + * (C) Kuramitsu Kimio, Tokyo Univ. 1996-97 + * + * ¤³¤Î¥é¥¤¥Ö¥é¥ê¤Ï¡¢CGI Programming with C and Perl ¤Î¤¿¤á¤Ë + * Ken Lunde Ãø ¡ÖÆüËܸì¾ðÊó½èÍý¡× (O'llery) ¤ò»²¹Í¤Ë¤·¤Æ¡¢ + * ¥¹¥È¥ê¡¼¥àÍѤÀ¤Ã¤¿jconv.c ¤ò¡¢¥¹¥È¥ê¥ó¥°Âбþ¤Ë¤·¤Æ¥é¥¤¥Ö¥é¥ê²½ + * ¤·¤Þ¤·¤¿¡£ + * ¤¿¤À¤·¡¢CGI (INTERNET)¤Ç¤ÎÍøÍѤò¹Í¤¨¤Æ¡¢Êѹ¹¤·¤Æ¤¢¤ê¤Þ¤¹¡£ + */ + + #include + #include + #include + #include + #include "jlib.h" + #include "config.h" + #include "jlibconfig.h" + + extern int detectKanjiCode(char *str); + static unsigned char *_to_jis(unsigned char *str); + static unsigned char *_to_ascii(unsigned char *str); + static void _jis_shift(int *p1, int *p2); + static void _sjis_shift(int *p1, int *p2); + #ifdef NO_HANKAKU_SJIS + static unsigned char *_sjis_han2zen(unsigned char *str, int *p1, int *p2); + #endif + static void _shift2seven(unsigned char *str, unsigned char *str2); + static void _shift2euc(unsigned char *str, unsigned char *str2); + static void _shift_self(unsigned char *str, unsigned char *str2); + static void _euc2seven(unsigned char *str, unsigned char *str2); + static void _euc2shift(unsigned char *str, unsigned char *str2); + static unsigned char *_skip_esc(unsigned char *str, int *esc_in); + static void _seven2shift(unsigned char *str, unsigned char *str2); + static void _seven2euc(unsigned char *str, unsigned char *str2); + + + + #define CHAROUT(ch) *str2 = (unsigned char)(ch); str2++; + + #ifndef HAVE_STRDUP + #define strdup(str) _strdup(str) + static char *_str_dup(unsigned char *buf) { + + unsigned char *p, *str; + if((str = (char *)malloc(strlen(buf) + 1)) == NULL) { + fprintf(stderr, "Can't malloc string buffer\n"); + exit(2); + } + + p = (unsigned char *)str; + + while(*buf) + *p++ = *buf++; + + *p = '\0'; + + return str; + } + #endif + + /* --------------------------------------- JIS(ISO-2022) ¥³¡¼¥É¤ØÀÚ¤êÂؤ¨ -- */ + + static unsigned char *_to_jis(unsigned char *str) { + *str = (unsigned char)ESC; str++; + *str = (unsigned char)'$'; str++; + *str = (unsigned char)'B'; str++; + return str; + } + + /* ----------------------------------------------- ASCII ¥³¡¼¥É¤ØÀÚ¤êÂؤ¨ -- */ + + /* ESC ( B ¤È ESC ( J ¤Î°ã¤¤¡£ + ËÜÍè¤Ï¡¢ ESC ( J ¤¬Àµ¤·¤¤JIS-Roman ÂηϤǤ¢¤ë¤¬¡¢ + ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤Î¾å¤Ç¤Ï¡¢±Ñ¿ô»ú¤ÏASCII ¤ÎÊý¤¬¼«Á³¤«¤È»×¤ï¤ì¤ë¡£ + \ µ­¹æ¤È ~µ­¹æ¤¬°ã¤¦¤À¤±¤Ç¤¢¤ë¡£ */ + + static unsigned char *_to_ascii(unsigned char *str) { + *str = (unsigned char)ESC; str++; + *str = (unsigned char)'('; str++; + *str = (unsigned char)'B'; str++; + return str; + } + + /* -------------------------------------- JIS ¥³¡¼¥É ¤ò SJIS¤È¤·¤Æ¥·¥Õ¥È -- */ + + static void _jis_shift(int *p1, int *p2) + { + unsigned char c1 = *p1; + unsigned char c2 = *p2; + int rowOffset = c1 < 95 ? 112 : 176; + int cellOffset = c1 % 2 ? (c2 > 95 ? 32 : 31) : 126; + + *p1 = ((c1 + 1) >> 1) + rowOffset; + *p2 += cellOffset; + } + + /* --------------------------------- SJIS ¥³¡¼¥É¤òJIS ¥³¡¼¥É¤È¤·¤Æ¥·¥Õ¥È -- */ + + static void _sjis_shift(int *p1, int *p2) + { + unsigned char c1 = *p1; + unsigned char c2 = *p2; + int adjust = c2 < 159; + int rowOffset = c1 < 160 ? 112 : 176; + int cellOffset = adjust ? (c2 > 127 ? 32 : 31) : 126; + + *p1 = ((c1 - rowOffset) << 1) - adjust; + *p2 -= cellOffset; + } + + /* ---------------------------------------------- SJIS Ⱦ³Ñ¤òÁ´³Ñ¤ËÊÑ´¹ -- */ + #ifdef NO_HANKAKU_SJIS + #define HANKATA(a) (a >= 161 && a <= 223) + #define ISMARU(a) (a >= 202 && a <= 206) + #define ISNIGORI(a) ((a >= 182 && a <= 196) || (a >= 202 && a <= 206) || (a == 179)) + + static int stable[][2] = { + {129,66},{129,117},{129,118},{129,65},{129,69},{131,146},{131,64}, + {131,66},{131,68},{131,70},{131,72},{131,131},{131,133},{131,135}, + {131,98},{129,91},{131,65},{131,67},{131,69},{131,71},{131,73}, + {131,74},{131,76},{131,78},{131,80},{131,82},{131,84},{131,86}, + {131,88},{131,90},{131,92},{131,94},{131,96},{131,99},{131,101}, + {131,103},{131,105},{131,106},{131,107},{131,108},{131,109}, + {131,110},{131,113},{131,116},{131,119},{131,122},{131,125}, + {131,126},{131,128},{131,129},{131,130},{131,132},{131,134}, + {131,136},{131,137},{131,138},{131,139},{131,140},{131,141}, + {131,143},{131,147},{129,74},{129,75}}; + + static unsigned char *_sjis_han2zen(unsigned char *str, int *p1, int *p2) + { + register int c1, c2; + + c1 = (int)*str; str++; + *p1 = stable[c1 - 161][0]; + *p2 = stable[c1 - 161][1]; + + /* Âù²»¡¢È¾Âù²»¤Î½èÍý */ + c2 = (int)*str; + if (c2 == 222 && ISNIGORI(c1)) { + if ((*p2 >= 74 && *p2 <= 103) || (*p2 >= 110 && *p2 <= 122)) + (*p2)++; + else if (*p1 == 131 && *p2 == 69) + *p2 = 148; + str++; + } + + if (c2 == 223 && ISMARU(c1) && (*p2 >= 110 && *p2 <= 122) ) { + *p2 += 2; + str++; + } + return str++; + } + #endif /* NO_HANKAKU_SJIS */ + + /* -------------------------------------------------- SJIS ¥³¡¼¥É¤òÊÑ´¹ -- */ + + #define SJIS1(A) ((A >= 129 && A <= 159) || (A >= 224 && A <= 239)) + #define SJIS2(A) (A >= 64 && A <= 252) + + static void _shift2seven(unsigned char *str, unsigned char *str2) + { + int p1,p2,esc_in = FALSE; + + while ((p1 = (int)*str) != '\0') { + + if (SJIS1(p1)) { + if((p2 = (int)*(++str)) == '\0') break; + if (SJIS2(p2)) { + _sjis_shift(&p1,&p2); + if (!esc_in) { + esc_in = TRUE; + str2 = _to_jis(str2); + } + } + CHAROUT(p1); + CHAROUT(p2); + str++; + continue; + } + + #ifdef NO_HANKAKU_SJIS + /* Ⱦ³Ñ SJIS ¤Ï¡¢¶¯À©Åª¤ËÁ´³Ñ¤ËÊѤ¨¤ë */ + if (HANKATA(p1)) { + str = _sjis_han2zen(str, &p1, &p2); + _sjis_shift(&p1,&p2); + if (!esc_in) { + esc_in = TRUE; + str2 = _to_jis(str2); + } + CHAROUT(p1); + CHAROUT(p2); + continue; + } + #endif + + if (esc_in) { + /* LF / CR ¤Î¾ì¹ç¤Ï¡¢Àµ¾ï¤Ë¥¨¥¹¥±¡¼¥×¥¢¥¦¥È¤µ¤ì¤ë */ + esc_in = FALSE; + str2 = _to_ascii(str2); + } + CHAROUT(p1); + str++; + } + + if (esc_in) + str2 = _to_ascii(str2); + *str2='\0'; + } + + /* --------------------------------------------- SJIS ¤ò EUC ¤ËÊÑ´¹¤¹¤ë -- */ + + static void _shift2euc(unsigned char *str, unsigned char *str2) + { + int p1,p2; + + while ((p1 = (int)*str) != '\0') { + if (SJIS1(p1)) { + if((p2 = (int)*(++str)) == '\0') break; + if (SJIS2(p2)) { + _sjis_shift(&p1,&p2); + p1 += 128; + p2 += 128; + } + CHAROUT(p1); + CHAROUT(p2); + str++; + continue; + } + + #ifdef NO_HANKAKU_SJIS + /* Ⱦ³Ñ SJIS ¤Ï¡¢¶¯À©Åª¤ËÁ´³Ñ¤ËÊѤ¨¤ë */ + if (HANKATA(p1)) { + str = _sjis_han2zen(str,&p1,&p2); + _sjis_shift(&p1,&p2); + p1 += 128; + p2 += 128; + CHAROUT(p1); + CHAROUT(p2); + continue; + } + #endif + CHAROUT(p1); + str++; + } + *str2='\0'; + } + + /* ------------------------------------------------- Ⱦ³Ñ SJIS ¤ò¼è¤ê½ü¤¯ -- */ + + static void _shift_self(unsigned char *str, unsigned char *str2) + { + int p1; + #ifdef NO_HANKAKU_SJIS + int p2; + #endif + + while ((p1 = (int)*str) != '\0') { + #ifdef NO_HANKAKU_SJIS + /* Ⱦ³Ñ SJIS ¤Ï¡¢¶¯À©Åª¤ËÁ´³Ñ¤ËÊѤ¨¤ë */ + if (HANKATA(p1)) { + str = _sjis_han2zen(str, &p1, &p2); + CHAROUT(p1); + CHAROUT(p2); + continue; + } + #endif + CHAROUT(p1); + str++; + } + *str2='\0'; + } + + /* ------------------------------------------------------EUC ¤«¤é JIS ¤Ø -- */ + + #define ISEUC(A) (A >= 161 && A <= 254) + + static void _euc2seven(unsigned char *str, unsigned char *str2) + { + int p1, p2, esc_in = FALSE; + + while ((p1 = (int)*str) != '\0') { + + if (p1 == LF || p1 == CR) { + if (esc_in) { + esc_in = FALSE; + str2 = _to_ascii(str2); + } + CHAROUT(p1); + str++; + continue; + } + + if (ISEUC(p1)) { + if((p2 = (int)*(++str)) == '\0') break; + if (ISEUC(p2)) { + + if (!esc_in) { + esc_in = TRUE; + str2 =_to_jis(str2); + } + + CHAROUT(p1-128); + CHAROUT(p2-128); + str++; + continue; + } + } + + if (esc_in) { + esc_in = FALSE; + str2 = _to_ascii(str2); + } + CHAROUT(p1); + str++; + } + + if (esc_in) + str2 = _to_ascii(str2); + *str2='\0'; + } + + /* ------------------------------------------------ EUC ¤«¤é SJIS ¤ËÊÑ´¹ -- */ + + static void _euc2shift(unsigned char *str, unsigned char *str2) + { + int p1,p2; + + while ((p1 = (int)*str) != '\0') { + if (ISEUC(p1)) { + if((p2 = (int)*(++str)) == '\0') break; + if (ISEUC(p2)) { + p1 -= 128; + p2 -= 128; + _jis_shift(&p1,&p2); + } + CHAROUT(p1); + CHAROUT(p2); + str++; + continue; + } + + CHAROUT(p1); + str++; + } + *str2='\0'; + } + + /* -------------------------------------- ESC ¥·¡¼¥±¥ó¥¹¤ò¥¹¥­¥Ã¥×¤¹¤ë ----- */ + + static unsigned char *_skip_esc(unsigned char *str, int *esc_in) { + int c; + + c = (int)*(++str); + if ((c == '$') || (c == '(')) str++; + if ((c == 'K') || (c == '$')) *esc_in = TRUE; + else *esc_in = FALSE; + + if(*str != '\0') str++; + return str; + } + + + /* ----------------------------------------------- JIS ¤ò SJIS ¤ËÊÑ´¹¤¹¤ë -- */ + + static void _seven2shift(unsigned char *str, unsigned char *str2) + { + int p1, p2, esc_in = FALSE; + + while ((p1 = (int)*str) != '\0') { + + /* ESC¥·¡¼¥±¥ó¥¹¤ò¥¹¥­¥Ã¥×¤¹¤ë */ + if (p1 == ESC) { + str = _skip_esc(str, &esc_in); + continue; + } + + if (p1 == LF || p1 == CR) { + if (esc_in) esc_in = FALSE; + } + + if(esc_in) { /* ISO-2022-JP ¥³¡¼¥É */ + if((p2 = (int)*(++str)) == '\0') break; + + _jis_shift(&p1, &p2); + + CHAROUT(p1); + CHAROUT(p2); + }else{ /* ASCII ¥³¡¼¥É */ + CHAROUT(p1); + } + str++; + } + *str2 = '\0'; + } + + /* ------------------------------------------------ JIS ¤ò EUC ¤ËÊÑ´¹¤¹¤ë -- */ + + static void _seven2euc(unsigned char *str, unsigned char *str2) + { + int p1, esc_in = FALSE; + + while ((p1 = (int)*str) != '\0') { + + /* ESC¥·¡¼¥±¥ó¥¹¤ò¥¹¥­¥Ã¥×¤¹¤ë */ + if (p1 == ESC) { + str = _skip_esc(str, &esc_in); + continue; + } + + if (p1 == LF || p1 == CR) { + if (esc_in) esc_in = FALSE; + } + + if(esc_in) { /* ISO-2022-JP ¥³¡¼¥É */ + CHAROUT(p1 + 128); + + if((p1 = (int)*(++str)) == '\0') break; + CHAROUT(p1 + 128); + }else{ /* ASCII ¥³¡¼¥É */ + CHAROUT(p1); + } + str++; + } + *str2 = '\0'; + } + + /* ------------------------------------------------------------------------ */ + /* --------------------------------------------------------- Public ´Ø¿ô -- */ + char *toStringJIS(char *str) { + int detected; + unsigned char *buf, *ret; + + if(!str) return (NULL); + detected = detectKanjiCode(str); + if(detected == ASCII || detected == JIS) + return strdup(str); + + buf = (unsigned char*)malloc(strlen(str)*2); + if (!buf) return NULL; + + switch(detected) { + case SJIS : + _shift2seven((unsigned char *)str, buf); + break; + case EUC : + _euc2seven((unsigned char *)str, buf); + break; + default: + free(buf); + return strdup(str); + break; + } + + ret = strdup(buf); + free(buf); + return ret; + } + + char *toStringEUC(char *str) { + int detected; + unsigned char *buf, *ret; + + if(!str) return (NULL); + detected = detectKanjiCode(str); + if(detected == ASCII || detected == EUC) return strdup(str); + + buf = (unsigned char*)malloc(strlen(str)*2); + if (!buf) return NULL; + + switch(detected) { + case SJIS : + _shift2euc((unsigned char *)str, buf); + break; + case JIS : + case NEW : case OLD : case NEC : + _seven2euc((unsigned char *)str, buf); + break; + default: + free(buf); + return strdup(str); + break; + } + + ret = strdup(buf); + free(buf); + return ret; + } + + char *toStringSJIS(char *str) { + int detected; + unsigned char *buf, *ret; + + if (!str) return NULL; + detected = detectKanjiCode(str); + if(detected == ASCII) return strdup(str); + + buf = (unsigned char*)malloc(strlen(str)*2); + if (!buf) return NULL; + + switch(detected) { + case NEW : case OLD : case NEC : + case JIS : + _seven2shift((unsigned char *)str, buf); + break; + case EUC : + _euc2shift((unsigned char *)str, buf); + break; + case SJIS : + default: + _shift_self((unsigned char *)str, buf); + } + + ret = strdup(buf); + free(buf); + return ret; + } + + char *toStringAuto(char *str) { + static int jpcode = -1; + static char *sjis_locale_name[] = {SJIS_LOCALE_NAME, NULL}; + static char *jis_locale_name[] = {JIS_LOCALE_NAME, NULL}; + static char *euc_locale_name[] = {EUC_LOCALE_NAME, NULL}; + static struct LOCALETABLE { + int code; + char **name_list; + } locale_table[] = { {SJIS, sjis_locale_name}, + {EUC, euc_locale_name}, + {JIS, jis_locale_name}}; + + if(!str) return (NULL); + + if (jpcode == -1) { + char *ctype = setlocale(LC_CTYPE, ""); + int i, j; + for( j=0; jpcode == -1 && + j < sizeof(locale_table)/sizeof(struct LOCALETABLE); j++ ) { + char **name = locale_table[j].name_list; + for( i=0; name[i]; i++ ) + if (strcasecmp(ctype, name[i]) == 0) { + jpcode = locale_table[j].code; + break; + } + } + if(jpcode == -1) + jpcode = ASCII; + } + + switch (jpcode) { + case SJIS: + return (toStringSJIS(str)); + break; + case JIS: + case NEW : case OLD : case NEC : + return (toStringJIS(str)); + break; + case EUC: + return (toStringEUC(str)); + break; + default: + return (strdup(str)); + break; + } + } diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/libjcode/sample.c gtkali-0.9.5_jp/libjcode/sample.c *** gtkali-0.9.5/libjcode/sample.c Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/libjcode/sample.c Fri Jun 16 10:41:48 2000 *************** *** 0 **** --- 1,41 ---- + /* + sample.c -- ¥µ¥ó¥×¥ë¥×¥í¥°¥é¥à by. ÁÒ¸÷ ·¯Ïº, 1996 + + ¤³¤Î¥×¥í¥°¥é¥à¤Ï¡¢¥µ¥ó¥×¥ë¥×¥í¥°¥é¥à¤Ç¤¹¡£ + ɸ½àÆþÎϤ«¤éÆɤ߹þ¤ó¤À¥Æ¥­¥¹¥È¤ò¥ª¥×¥·¥ç¥ó¤Ë¤¢¤ï¤»¤Æ¡¢ + ¥³¡¼¥ÉÊÑ´¹¤·¤Þ¤¹¡£ + */ + + #include + #include + #include "jlib.h" + + extern void printDetectCode(int code); + + void main(int ac, char *av[]) { + char buffer[BUFSIZ]; + int mode=JIS; + + if(ac == 2) { + if(!strcmp(av[1], "-e")) mode = EUC; + if(!strcmp(av[1], "-s")) mode =SJIS; + } + + while(fgets(buffer,BUFSIZ,stdin) != NULL) { + switch(mode) { + case EUC: + printf("%s", toStringEUC(buffer)); + break; + case SJIS: + printf("%s", toStringSJIS(buffer)); + break; + default: + printf("%s", toStringJIS(buffer)); + break; + } + } + exit(0); + } + + + diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/m4/xdelta.m4 gtkali-0.9.5_jp/m4/xdelta.m4 *** gtkali-0.9.5/m4/xdelta.m4 Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/m4/xdelta.m4 Fri Jun 16 10:50:52 2000 *************** *** 0 **** --- 1,183 ---- + # Configure paths for XDELTA + # Owen Taylor 97-11-3 + + dnl AM_PATH_XDELTA([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) + dnl Test for XDELTA, and define XDELTA_CFLAGS and XDELTA_LIBS, if "gmodule" or + dnl + AC_DEFUN(AM_PATH_XDELTA, + [dnl + dnl Get the cflags and libraries from the xdelta-config script + dnl + AC_ARG_WITH(xdelta-prefix,[ --with-xdelta-prefix=PFX Prefix where XDELTA is installed (optional)], + xdelta_config_prefix="$withval", xdelta_config_prefix="") + AC_ARG_WITH(xdelta-exec-prefix,[ --with-xdelta-exec-prefix=PFX Exec prefix where XDELTA is installed (optional)], + xdelta_config_exec_prefix="$withval", xdelta_config_exec_prefix="") + AC_ARG_ENABLE(xdeltatest, [ --disable-xdeltatest Do not try to compile and run a test XDELTA program], + , enable_xdeltatest=yes) + + if test x$xdelta_config_exec_prefix != x ; then + xdelta_config_args="$xdelta_config_args --exec-prefix=$xdelta_config_exec_prefix" + if test x${XDELTA_CONFIG+set} != xset ; then + XDELTA_CONFIG=$xdelta_config_exec_prefix/bin/xdelta-config + fi + fi + if test x$xdelta_config_prefix != x ; then + xdelta_config_args="$xdelta_config_args --prefix=$xdelta_config_prefix" + if test x${XDELTA_CONFIG+set} != xset ; then + XDELTA_CONFIG=$xdelta_config_prefix/bin/xdelta-config + fi + fi + + AC_PATH_PROG(XDELTA_CONFIG, xdelta-config, no) + min_xdelta_version=ifelse([$1], ,1.0.0,$1) + AC_MSG_CHECKING(for XDELTA - version >= $min_xdelta_version) + no_xdelta="" + if test "$XDELTA_CONFIG" = "no" ; then + no_xdelta=yes + else + XDELTA_CFLAGS=`$XDELTA_CONFIG $xdelta_config_args --cflags` + XDELTA_LIBS=`$XDELTA_CONFIG $xdelta_config_args --libs` + xdelta_config_major_version=`$XDELTA_CONFIG $xdelta_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + xdelta_config_minor_version=`$XDELTA_CONFIG $xdelta_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + xdelta_config_micro_version=`$XDELTA_CONFIG $xdelta_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_xdeltatest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $XDELTA_CFLAGS" + LIBS="$LIBS $XDELTA_LIBS" + dnl + dnl Now check if the installed XDELTA is sufficiently new. (Also sanity + dnl checks the results of xdelta-config to some extent + dnl + rm -f conf.xdeltatest + AC_TRY_RUN([ + #include + #include + #include + + int + main () + { + int major, minor, micro; + char *tmp_version; + + system ("touch conf.xdeltatest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_xdelta_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_xdelta_version"); + exit(1); + } + + if ((xdelta_major_version != $xdelta_config_major_version) || + (xdelta_minor_version != $xdelta_config_minor_version) || + (xdelta_micro_version != $xdelta_config_micro_version)) + { + printf("\n*** 'xdelta-config --version' returned %d.%d.%d, but XDELTA (%d.%d.%d)\n", + $xdelta_config_major_version, $xdelta_config_minor_version, $xdelta_config_micro_version, + xdelta_major_version, xdelta_minor_version, xdelta_micro_version); + printf ("*** was found! If xdelta-config was correct, then it is best\n"); + printf ("*** to remove the old version of XDELTA. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If xdelta-config was wrong, set the environment variable XDELTA_CONFIG\n"); + printf("*** to point to the correct copy of xdelta-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } + else if ((xdelta_major_version != XDELTA_MAJOR_VERSION) || + (xdelta_minor_version != XDELTA_MINOR_VERSION) || + (xdelta_micro_version != XDELTA_MICRO_VERSION)) + { + printf("*** XDELTA header files (version %d.%d.%d) do not match\n", + XDELTA_MAJOR_VERSION, XDELTA_MINOR_VERSION, XDELTA_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + xdelta_major_version, xdelta_minor_version, xdelta_micro_version); + } + else + { + if ((xdelta_major_version > major) || + ((xdelta_major_version == major) && (xdelta_minor_version > minor)) || + ((xdelta_major_version == major) && (xdelta_minor_version == minor) && (xdelta_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of XDELTA (%d.%d.%d) was found.\n", + xdelta_major_version, xdelta_minor_version, xdelta_micro_version); + printf("*** You need a version of XDELTA newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** XDELTA is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the xdelta-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of XDELTA, but you can also set the XDELTA_CONFIG environment to point to the\n"); + printf("*** correct copy of xdelta-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; + } + ],, no_xdelta=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_xdelta" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$XDELTA_CONFIG" = "no" ; then + echo "*** The xdelta-config script installed by XDELTA could not be found" + echo "*** If XDELTA was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the XDELTA_CONFIG environment variable to the" + echo "*** full path to xdelta-config." + else + if test -f conf.xdeltatest ; then + : + else + echo "*** Could not run XDELTA test program, checking why..." + CFLAGS="$CFLAGS $XDELTA_CFLAGS" + LIBS="$LIBS $XDELTA_LIBS" + AC_TRY_LINK([ + #include + #include + ], [ return ((xdelta_major_version) || (xdelta_minor_version) || (xdelta_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding XDELTA or finding the wrong" + echo "*** version of XDELTA. If it is not finding XDELTA, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" + echo "***" + echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" + echo "*** came with the system with the command" + echo "***" + echo "*** rpm --erase --nodeps gtk gtk-devel" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means XDELTA was incorrectly installed" + echo "*** or that you have moved XDELTA since it was installed. In the latter case, you" + echo "*** may want to edit the xdelta-config script: $XDELTA_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + XDELTA_CFLAGS="" + XDELTA_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(XDELTA_CFLAGS) + AC_SUBST(XDELTA_LIBS) + rm -f conf.xdeltatest + ]) diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/po/Makefile.in.in gtkali-0.9.5_jp/po/Makefile.in.in *** gtkali-0.9.5/po/Makefile.in.in Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/po/Makefile.in.in Fri Jun 16 10:50:03 2000 *************** *** 0 **** --- 1,248 ---- + # Makefile for program source directory in GNU NLS utilities package. + # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper + # + # This file file be copied and used freely without restrictions. It can + # be used in projects which are not available under the GNU Public License + # but which still want to provide support for the GNU gettext functionality. + # Please note that the actual code is *not* freely available. + + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ + + SHELL = /bin/sh + @SET_MAKE@ + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ + datadir = $(prefix)/@DATADIRNAME@ + localedir = $(datadir)/locale + gnulocaledir = $(prefix)/share/locale + gettextsrcdir = $(prefix)/share/gettext/po + subdir = po + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@ + + CC = @CC@ + GENCAT = @GENCAT@ + GMSGFMT = PATH=../src:$$PATH @GMSGFMT@ + MSGFMT = @MSGFMT@ + XGETTEXT = PATH=../src:$$PATH @XGETTEXT@ + MSGMERGE = PATH=../src:$$PATH msgmerge + + DEFS = @DEFS@ + CFLAGS = @CFLAGS@ + CPPFLAGS = @CPPFLAGS@ + + INCLUDES = -I.. -I$(top_srcdir)/intl + + COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) + + SOURCES = cat-id-tbl.c + POFILES = @POFILES@ + GMOFILES = @GMOFILES@ + DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \ + stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES) + + POTFILES = \ + + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + INSTOBJEXT = @INSTOBJEXT@ + + .SUFFIXES: + .SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat + + .c.o: + $(COMPILE) $< + + .po.pox: + $(MAKE) $(PACKAGE).pot + $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox + + .po.mo: + $(MSGFMT) -o $@ $< + + .po.gmo: + file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ + && rm -f $$file && $(GMSGFMT) -o $$file $< + + .po.cat: + sed -f ../intl/po2msg.sed < $< > $*.msg \ + && rm -f $@ && $(GENCAT) $@ $*.msg + + + all: all-@USE_NLS@ + + all-yes: cat-id-tbl.c $(CATALOGS) + all-no: + + $(srcdir)/$(PACKAGE).pot: $(POTFILES) + $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ + --add-comments --keyword=_ --keyword=N_ \ + --files-from=$(srcdir)/POTFILES.in \ + && test ! -f $(PACKAGE).po \ + || ( rm -f $(srcdir)/$(PACKAGE).pot \ + && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot ) + + $(srcdir)/cat-id-tbl.c: stamp-cat-id; @: + $(srcdir)/stamp-cat-id: $(PACKAGE).pot + rm -f cat-id-tbl.tmp + sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \ + | sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp + if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \ + rm cat-id-tbl.tmp; \ + else \ + echo cat-id-tbl.c changed; \ + rm -f $(srcdir)/cat-id-tbl.c; \ + mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \ + fi + cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id + + + install: install-exec install-data + install-exec: + install-data: install-data-@USE_NLS@ + install-data-no: all + install-data-yes: all + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $(datadir); \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \ + fi + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + case "$$cat" in \ + *.gmo) destdir=$(gnulocaledir);; \ + *) destdir=$(localedir);; \ + esac; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + dir=$$destdir/$$lang/LC_MESSAGES; \ + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $$dir; \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ + fi; \ + if test -r $$cat; then \ + $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ + echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \ + else \ + $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ + echo "installing $(srcdir)/$$cat as" \ + "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ + fi; \ + if test -r $$cat.m; then \ + $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ + else \ + if test -r $(srcdir)/$$cat.m ; then \ + $(INSTALL_DATA) $(srcdir)/$$cat.m \ + $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $(srcdir)/$$cat as" \ + "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ + else \ + true; \ + fi; \ + fi; \ + done + if test "$(PACKAGE)" = "gettext"; then \ + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $(gettextsrcdir); \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ + fi; \ + $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ + $(gettextsrcdir)/Makefile.in.in; \ + else \ + : ; \ + fi + + # Define this as empty until I found a useful application. + installcheck: + + uninstall: + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ + rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \ + rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ + rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \ + done + rm -f $(gettextsrcdir)/po-Makefile.in.in + + check: all + + cat-id-tbl.o: ../intl/libgettext.h + + dvi info tags TAGS ID: + + mostlyclean: + rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp + rm -fr *.o + + clean: mostlyclean + + distclean: clean + rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m + + maintainer-clean: distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + rm -f $(GMOFILES) + + distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) + dist distdir: update-po $(DISTFILES) + dists="$(DISTFILES)"; \ + for file in $$dists; do \ + ln $(srcdir)/$$file $(distdir) 2> /dev/null \ + || cp -p $(srcdir)/$$file $(distdir); \ + done + + update-po: Makefile + $(MAKE) $(PACKAGE).pot + PATH=`pwd`/../src:$$PATH; \ + cd $(srcdir); \ + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + mv $$lang.po $$lang.old.po; \ + echo "$$lang:"; \ + if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \ + rm -f $$lang.old.po; \ + else \ + echo "msgmerge for $$cat failed!"; \ + rm -f $$lang.po; \ + mv $$lang.old.po $$lang.po; \ + fi; \ + done + + POTFILES: POTFILES.in + ( if test 'x$(srcdir)' != 'x.'; then \ + posrcprefix='$(top_srcdir)/'; \ + else \ + posrcprefix="../"; \ + fi; \ + rm -f $@-t $@ \ + && (sed -e '/^#/d' -e '/^[ ]*$$/d' \ + -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ + | sed -e '$$s/\\$$//') > $@-t \ + && chmod a-w $@-t \ + && mv $@-t $@ ) + + Makefile: Makefile.in.in ../config.status POTFILES + cd .. \ + && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ + $(SHELL) ./config.status + + # Tell versions [3.59,3.63) of GNU make not to export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/po/POTFILES gtkali-0.9.5_jp/po/POTFILES *** gtkali-0.9.5/po/POTFILES Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/po/POTFILES Fri Jun 16 22:03:49 2000 *************** *** 0 **** --- 1,13 ---- + .././src/cfgwin.c \ + .././src/txtent.c \ + .././src/gtkali.c \ + .././src/ignore.c \ + .././src/urlgrabber.c \ + .././src/dialog.c \ + .././src/menu.c \ + .././src/kali_server.c \ + .././src/mainui.c \ + .././src/toolbar.c \ + .././src/aliasdialog.c \ + .././src/userlist.c \ + .././src/chanlist.c diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/po/POTFILES.in gtkali-0.9.5_jp/po/POTFILES.in *** gtkali-0.9.5/po/POTFILES.in Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/po/POTFILES.in Fri Jun 16 22:03:41 2000 *************** *** 0 **** --- 1,13 ---- + ./src/cfgwin.c + ./src/txtent.c + ./src/gtkali.c + ./src/ignore.c + ./src/urlgrabber.c + ./src/dialog.c + ./src/menu.c + ./src/kali_server.c + ./src/mainui.c + ./src/toolbar.c + ./src/aliasdialog.c + ./src/userlist.c + ./src/chanlist.c diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/po/cat-id-tbl.c gtkali-0.9.5_jp/po/cat-id-tbl.c *** gtkali-0.9.5/po/cat-id-tbl.c Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/po/cat-id-tbl.c Fri Jun 16 16:16:03 2000 *************** *** 0 **** --- 1,201 ---- + /* Automatically generated by po2tbl.sed from gtkali.pot. */ + + #if HAVE_CONFIG_H + # include + #endif + + #include "libgettext.h" + + const struct _msg_ent _msg_tbl[] = { + {"", 1}, + {"GtKali Config", 2}, + {"Kali Settings", 3}, + {"Options", 4}, + {"Chat Settings", 5}, + {"Cancel", 6}, + {"OK", 7}, + {"\ + Changes made were saved. You need to restart GtKali to begin\n\ + using it. If you didn't select a default server, a list will\n\ + be presented to you the next time you start GtKali.", 8}, + {"Registration", 9}, + {"Serial Number: ", 10}, + {"SKey: ", 11}, + {"TKey: ", 12}, + {"User Info", 13}, + {"Nickname: ", 14}, + {"Real Name: ", 15}, + {"Email: ", 16}, + {"Location: ", 17}, + {"Other: ", 18}, + {"Default Quit Message: ", 19}, + {"Servers", 20}, + {"Tracker: ", 21}, + {"Default Kali Server: ", 22}, + {"Proxy: ", 23}, + {"URL Highlighting", 24}, + {"URL Color", 25}, + {"URL Font: ", 26}, + {"...", 27}, + {"Browser Command: ", 28}, + {"Do URL Highlighting", 29}, + {"GtKali Options", 30}, + {"Server Messages", 31}, + {"Chat Colors", 32}, + {"Nick Completion", 33}, + {"Logging", 34}, + {"Private Message Windows", 35}, + {"Show Ping Notices", 36}, + {"Window Geometry", 37}, + {"Width: ", 38}, + {"Height: ", 39}, + {"X Position: ", 40}, + {"Y Position: ", 41}, + {"Remember geometry", 42}, + {"Appearance", 43}, + {"Foreground Color", 44}, + {"Background Color", 45}, + {"Font: ", 46}, + {"Kali Font Settings", 47}, + {"Your Color", 48}, + {"Your Font Size:", 49}, + {"Your Font: ", 50}, + {"Event Colors", 51}, + {"Action Messages", 52}, + {"Entering Messages", 53}, + {"Quit/Leaving Messages", 54}, + {"Font Selection", 55}, + {"*** Opened a new chat window\n", 56}, + {"URL in str `%s'", 57}, + {"url_start = %i, url_end = %i", 58}, + {"Couldn't load `%s', using default.", 59}, + {"Couldn't load URL font `%s', using default.", 60}, + {"*** You need someone to ignore!\n", 61}, + {"*** You need someone to unignore!\n", 62}, + {"*** Currently ignoring:\n", 63}, + {"*** You're not ignoring anyone!\n", 64}, + {"*** Built in KaliNix commands:\n", 65}, + {"closes chat", 66}, + {"opens chat", 67}, + {"connects to given server", 68}, + {"disconnects from server", 69}, + {"tells everyone that you are away", 70}, + {"joins a different channel", 71}, + {"get information for given nick", 72}, + {"get list of servers running the given game", 73}, + {"sends a private message to someone", 74}, + {"posture a message", 75}, + {"test connection speed", 76}, + {"offer [description]", 77}, + {"offers a file", 78}, + {"poffer [desc]", 79}, + {"password offer", 80}, + {"shows offers from all users", 81}, + {"deoffer ", 82}, + {"deoffers given filename or all offers", 83}, + {"get ", 84}, + {"gets offered file", 85}, + {"pget ", 86}, + {"gets passworded file", 87}, + {"shows processes for all users on server", 88}, + {"list names/email addresses for all users on server", 89}, + {"lists all servers from tracker", 90}, + {"lists all active channels on server", 91}, + {"list all users with channel", 92}, + {"list information for given user", 93}, + {"displays message of the day", 94}, + {"\ + \n\ + *** GtKali specific commands:\n", 95}, + {"quits GtKali", 96}, + {"clears screen", 97}, + {"ignores given user", 98}, + {"unignores given user", 99}, + {"prints list of ignores", 100}, + {"execute a shell command", 101}, + {"pinged you", 102}, + {"Couldn't fork", 103}, + {"\ + Welcome to GtKali! In order to use GtKali, you're going to\n\ + have to set it up properly, the following window will help\n\ + you do this. The serial number information is required and\n\ + must be obtained from Kali itself. See their website at\n\ + http://www.kali.net/ for more information.\n\ + \n\ + Note about the server information, it is not necessary, just\n\ + leave it blank if you do not know of a server you want to put\n\ + into it for now. The next time you start GtKali, it will present\n\ + you with a list of servers which you can choose from. Enjoy!", 104}, + {"Couldn't initialize KaliNix! Aborting!\n", 105}, + {"gtkali.c: cfg.server_addr=%s (%p)", 106}, + {"*** Now Ignoring Messages from %s...\n", 107}, + {"*** Now Accepting Messages from %s...\n", 108}, + {"Grabbed URLs", 109}, + {"Open", 110}, + {"Clear", 111}, + {"Close", 112}, + {"GtKali Message", 113}, + {"Ok", 114}, + {"About GtKali", 115}, + {"\ + %s\n\ + by Warren Chartier\n\ + From Eden Li's early client\n\ + \tVisit http://gtkali.sourceforge.net for updates.\n", 116}, + {"/_File", 117}, + {"/File/tearoff", 118}, + {"/File/Quit", 119}, + {"/_Edit", 120}, + {"/Edit/tearoff", 121}, + {"/Edit/Copy", 122}, + {"/Edit/Paste", 123}, + {"/_View", 124}, + {"/View/tearoff", 125}, + {"/View/Servers..", 126}, + {"/View/URL Grabber..", 127}, + {"/_Config", 128}, + {"/Config/tearoff", 129}, + {"/Config/Config..", 130}, + {"/Config/Aliases..", 131}, + {"/Config/sep", 132}, + {"/Config/Save on Exit", 133}, + {"/Config/Save Now", 134}, + {"/_Help", 135}, + {"/Help/About..", 136}, + {"#", 137}, + {"Server Name", 138}, + {"IP", 139}, + {"Kali Servers", 140}, + {"Search: ", 141}, + {"Connect", 142}, + {"Set as Default Server", 143}, + {"Refresh", 144}, + {"Capturing servers... Please wait.", 145}, + {"Quitting...", 146}, + {"gdk: w=%i, h=%i, x=%i, y=%i", 147}, + {"quit message: %s", 148}, + {"saving cfg", 149}, + {"not saving cfg", 150}, + {"Default", 151}, + {"URLs", 152}, + {"Copy", 153}, + {"Paste", 154}, + {"Quit", 155}, + {"Alias", 156}, + {"Translation", 157}, + {"Aliases", 158}, + {"Alias Settings", 159}, + {"Add/Apply", 160}, + {"Delete Alias", 161}, + {"Aliases saved... Changes effective immediately.", 162}, + {"Nick", 163}, + {"Whois", 164}, + {"Info", 165}, + {"Ping", 166}, + {"Ignore/Unignore", 167}, + {"Private Message", 168}, + {"Channel", 169}, + {"Users", 170}, + }; + + int _msg_tbl_length = 170; diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/po/ja.po gtkali-0.9.5_jp/po/ja.po *** gtkali-0.9.5/po/ja.po Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/po/ja.po Fri Jun 16 22:09:20 2000 *************** *** 0 **** --- 1,741 ---- + # SOME DESCRIPTIVE TITLE. + # Copyright (C) YEAR Free Software Foundation, Inc. + # Takuro Ashie , 2000. + # + #, fuzzy + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "POT-Creation-Date: 2000-06-16 22:04+0900\n" + "PO-Revision-Date: 2000-06-15 HO:MI+ZONE\n" + "Last-Translator: Takuro Ashie \n" + "Language-Team: Japanese \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=EUC-JP\n" + "Content-Transfer-Encoding: 8bit\n" + + #: src/cfgwin.c:112 + msgid "GtKali Config" + msgstr "GtKaliÀßÄê" + + #: src/cfgwin.c:128 + msgid "Kali Settings" + msgstr "KaliÀßÄê" + + #: src/cfgwin.c:132 + msgid "Options" + msgstr "¥ª¥×¥·¥ç¥ó" + + #: src/cfgwin.c:136 + msgid "Chat Settings" + msgstr "¥Á¥ã¥Ã¥ÈÀßÄê" + + #: src/aliasdialog.c:176 src/cfgwin.c:183 src/kali_server.c:135 + msgid "Cancel" + msgstr "¥­¥ã¥ó¥»¥ë" + + #: src/cfgwin.c:189 + msgid "OK" + msgstr "ŬÍÑ" + + #: src/cfgwin.c:357 + msgid "" + "Changes made were saved. You need to restart GtKali to begin\n" + "using it. If you didn't select a default server, a list will\n" + "be presented to you the next time you start GtKali." + msgstr "" + "Êѹ¹¤òÊݸ¤·¤Þ¤·¤¿. GtKali¤òºÆµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹.\n" + "¥Ç¥Õ¥©¥ë¥È¥µ¡¼¥Ð¤òÀßÄꤷ¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¼¡²ó¤Îµ¯Æ°»þ¤Ë\n" + "¥µ¡¼¥Ð¥ê¥¹¥È¤¬É½¼¨¤µ¤ì¤Þ¤¹." + + #: src/cfgwin.c:374 + msgid "Registration" + msgstr "¥ì¥¸¥¹¥È¾ðÊó" + + #: src/cfgwin.c:380 + msgid "Serial Number: " + msgstr "¥·¥ê¥¢¥ë¥Ê¥ó¥Ð¡¼¡§ " + + #: src/cfgwin.c:382 + msgid "SKey: " + msgstr "S¥­¡¼¡§ " + + #: src/cfgwin.c:384 + msgid "TKey: " + msgstr "T¥­¡¼¡§ " + + #: src/cfgwin.c:390 + msgid "User Info" + msgstr "¥æ¡¼¥¶¡¼¾ðÊó" + + #: src/cfgwin.c:396 + msgid "Nickname: " + msgstr "¥Ë¥Ã¥¯¥Í¡¼¥à¡§ " + + #: src/cfgwin.c:398 + msgid "Real Name: " + msgstr "̾Á°¡§ " + + #: src/cfgwin.c:400 + msgid "Email: " + msgstr "E¥á¡¼¥ë¡§ " + + #: src/cfgwin.c:402 + msgid "Location: " + msgstr "½»½ê¡§ " + + #: src/cfgwin.c:404 + msgid "Other: " + msgstr "¤½¤Î¾¡§ " + + #: src/cfgwin.c:406 + msgid "Default Quit Message: " + msgstr "½ªÎ»»þ¥á¥Ã¥»¡¼¥¸¡§ " + + #: src/cfgwin.c:413 src/toolbar.c:51 + msgid "Servers" + msgstr "¥µ¡¼¥Ð" + + #: src/cfgwin.c:419 + msgid "Tracker: " + msgstr "¥È¥é¥Ã¥«¡¼¡§ " + + #: src/cfgwin.c:421 + msgid "Default Kali Server: " + msgstr "¥Ç¥Õ¥©¥ë¥ÈKali¥µ¡¼¥Ð¡§ " + + #: src/cfgwin.c:423 + msgid "Proxy: " + msgstr "¥×¥í¥­¥·¡§ " + + #: src/cfgwin.c:439 + msgid "URL Highlighting" + msgstr "URL¥Ï¥¤¥é¥¤¥ÈÀßÄê" + + #: src/cfgwin.c:444 + msgid "URL Color" + msgstr "URL¥«¥é¡¼" + + #: src/cfgwin.c:450 + msgid "URL Font: " + msgstr "URL¥Õ¥©¥ó¥È¡§ " + + #: src/cfgwin.c:461 src/cfgwin.c:570 + msgid "..." + msgstr "¥Õ¥©¥ó¥ÈÁªÂò" + + #: src/cfgwin.c:472 + msgid "Browser Command: " + msgstr "¥Ö¥é¥¦¥¶¥³¥Þ¥ó¥É¡§ " + + #: src/cfgwin.c:474 + msgid "Do URL Highlighting" + msgstr "URL¥Ï¥¤¥é¥¤¥ÈÀßÄê¤òÍ­¸ú¤Ë¤¹¤ë" + + #: src/cfgwin.c:490 + msgid "GtKali Options" + msgstr "GtKali¥ª¥×¥·¥ç¥ó" + + #: src/cfgwin.c:496 src/cfgwin.c:634 + msgid "Server Messages" + msgstr "¥µ¡¼¥Ð¥á¥Ã¥»¡¼¥¸" + + #: src/cfgwin.c:498 + msgid "Chat Colors" + msgstr "¥Á¥ã¥Ã¥È¥«¥é¡¼" + + #: src/cfgwin.c:500 + msgid "Nick Completion" + msgstr "¥Ë¥Ã¥¯¥Í¡¼¥àÊä´° [TAB¥­¡¼]" + + #: src/cfgwin.c:502 + msgid "Logging" + msgstr "¥í¥°¤ò¥Õ¥¡¥¤¥ë¤ËÊݸ" + + #: src/cfgwin.c:504 + msgid "Private Message Windows" + msgstr "¥×¥é¥¤¥Ù¡¼¥È¥á¥Ã¥»¡¼¥¸¥¦¥£¥ó¥É¥¦" + + #: src/cfgwin.c:506 + msgid "Show Ping Notices" + msgstr "Ping¤òÂǤ¿¤ì¤¿»þ¤ËÄÌÃΤ¹¤ë" + + #: src/cfgwin.c:512 + msgid "Window Geometry" + msgstr "¥¦¥£¥ó¥É¥¦ÇÛÃÖ" + + #: src/cfgwin.c:518 + msgid "Width: " + msgstr "Éý¡§ " + + #: src/cfgwin.c:520 + msgid "Height: " + msgstr "¹â¤µ¡§ " + + #: src/cfgwin.c:522 + msgid "X Position: " + msgstr "²£°ÌÃÖ¡§ " + + #: src/cfgwin.c:524 + msgid "Y Position: " + msgstr "½Ä°ÌÃÖ¡§ " + + #: src/cfgwin.c:526 + msgid "Remember geometry" + msgstr "¥¦¥£¥ó¥É¥¦°ÌÃÖ¤òÊݸ" + + #: src/cfgwin.c:544 + msgid "Appearance" + msgstr "³°´Ñ" + + #: src/cfgwin.c:549 + msgid "Foreground Color" + msgstr "¥Õ¥©¥ó¥È¥«¥é¡¼¡§ " + + #: src/cfgwin.c:554 + msgid "Background Color" + msgstr "ÇØ·Ê¿§" + + #: src/cfgwin.c:560 + msgid "Font: " + msgstr "¥Õ¥©¥ó¥È¡§ " + + #: src/cfgwin.c:592 + msgid "Kali Font Settings" + msgstr "Kali¥Õ¥©¥ó¥ÈÀßÄê" + + #: src/cfgwin.c:597 + msgid "Your Color" + msgstr "¼«Ê¬¤Î¿§¡§ " + + #: src/cfgwin.c:603 + msgid "Your Font Size:" + msgstr "¼«Ê¬¤Î¥Õ¥©¥ó¥È¥µ¥¤¥º¡§ " + + #: src/cfgwin.c:606 + msgid "Your Font: " + msgstr "¼«Ê¬¤Î¥Õ¥©¥ó¥È¡§ " + + #: src/cfgwin.c:622 + msgid "Event Colors" + msgstr "¥¤¥Ù¥ó¥È¥á¥Ã¥»¡¼¥¸¤Î¿§" + + #: src/cfgwin.c:628 + msgid "Action Messages" + msgstr "¥¢¥¯¥·¥ç¥ó¥á¥Ã¥»¡¼¥¸" + + #: src/cfgwin.c:640 + msgid "Entering Messages" + msgstr "Entering¥á¥Ã¥»¡¼¥¸" + + #: src/cfgwin.c:646 + msgid "Quit/Leaving Messages" + msgstr "Leaving¥á¥Ã¥»¡¼¥¸" + + #: src/cfgwin.c:745 + msgid "Font Selection" + msgstr "¥Õ¥©¥ó¥ÈÁªÂò" + + #: src/txtent.c:147 + msgid "*** Opened a new chat window\n" + msgstr "" + + #: src/txtent.c:178 + #, c-format + msgid "URL in str `%s'" + msgstr "" + + #: src/txtent.c:179 + #, c-format + msgid "url_start = %i, url_end = %i" + msgstr "" + + #: src/txtent.c:193 + #, c-format + msgid "Couldn't load `%s', using default." + msgstr "" + + #: src/txtent.c:231 + #, c-format + msgid "Couldn't load URL font `%s', using default." + msgstr "" + + #: src/gtkali.c:130 + msgid "*** You need someone to ignore!\n" + msgstr "*** ̵»ë¤¹¤ë¥æ¡¼¥¶¡¼¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó!\n" + + #: src/gtkali.c:146 + msgid "*** You need someone to unignore!\n" + msgstr "*** ̵»ë¤ò²ò½ü¤¹¤ë¥æ¡¼¥¶¡¼¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó!\n" + + #: src/gtkali.c:162 + msgid "*** Currently ignoring:\n" + msgstr "*** ¸½ºß̵»ë¤·¤Æ¤¤¤ë¥æ¡¼¥¶¡¼¡§\n" + + #: src/gtkali.c:166 + msgid "*** You're not ignoring anyone!\n" + msgstr "*** ï¤â̵»ë¤·¤Æ¤¤¤Þ¤»¤ó!\n" + + #: src/gtkali.c:172 + msgid "*** Built in KaliNix commands:\n" + msgstr "*** KaliNix¥³¥Þ¥ó¥É¡§\n" + + #: src/gtkali.c:173 + msgid "closes chat" + msgstr "¥Á¥ã¥Ã¥È¤òÊĤ¸¤Þ¤¹" + + #: src/gtkali.c:174 + msgid "opens chat" + msgstr "¥Á¥ã¥Ã¥È¤ò³«¤­¤Þ¤¹" + + #: src/gtkali.c:175 + msgid "connects to given server" + msgstr "»ØÄꤷ¤¿¥µ¡¼¥Ð¤ËÀܳ" + + #: src/gtkali.c:176 + msgid "disconnects from server" + msgstr "¥µ¡¼¥Ð¤«¤éÀÚÃÇ" + + #: src/gtkali.c:177 + msgid "tells everyone that you are away" + msgstr "Î¥Àʤ·¤Æ¤¤¤ë»ö¤ò¾¤Î¥æ¡¼¥¶¡¼¤ËÅÁ¤¨¤ë" + + #: src/gtkali.c:178 + msgid "joins a different channel" + msgstr "¾¤Î¥Á¥ã¥ó¥Í¥ë¤Ë»²²Ã" + + #: src/gtkali.c:179 + msgid "get information for given nick" + msgstr "»ØÄꤷ¤¿¥Ë¥Ã¥¯¥Í¡¼¥à¤ò»ý¤Ä¥æ¡¼¥¶¡¼¤Ë´Ø¤¹¤ë¾ðÊó¤òɽ¼¨" + + #: src/gtkali.c:180 + msgid "get list of servers running the given game" + msgstr "»ØÄꤷ¤¿¥²¡¼¥à¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¥µ¡¼¥Ð¤òɽ¼¨" + + #: src/gtkali.c:181 + msgid "sends a private message to someone" + msgstr "»ØÄꤷ¤¿¥æ¡¼¥¶¡¼¤Ë¥×¥é¥¤¥Ù¡¼¥È¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®" + + #: src/gtkali.c:182 + msgid "posture a message" + msgstr "¶¯Ä´¥á¥Ã¥»¡¼¥¸" + + #: src/gtkali.c:183 + msgid "test connection speed" + msgstr "»ØÄꤷ¤¿¥æ¡¼¥¶¡¼¤Î±þÅú®ÅÙ¤ò·×¬" + + #: src/gtkali.c:184 + msgid "offer [description]" + msgstr "offer <¥Õ¥¡¥¤¥ë̾> [ÀâÌÀ]" + + #: src/gtkali.c:184 + msgid "offers a file" + msgstr "¥Õ¥¡¥¤¥ë¤ò¥ª¥Õ¥¡¡¼¤¹¤ë" + + #: src/gtkali.c:185 + msgid "poffer [desc]" + msgstr "poffer <¥Õ¥¡¥¤¥ë̾> <¥Ñ¥¹¥ï¡¼¥É> [ÀâÌÀ]" + + #: src/gtkali.c:185 + msgid "password offer" + msgstr "¥Ñ¥¹¥ï¡¼¥ÉÉÕ¤­¥ª¥Õ¥¡¡¼" + + #: src/gtkali.c:186 + msgid "shows offers from all users" + msgstr "¸½ºß¥ª¥Õ¥¡¡¼¤µ¤ì¤Æ¤¤¤ëÁ´¤Æ¤Î¥Õ¥¡¥¤¥ë¤òɽ¼¨" + + #: src/gtkali.c:187 + msgid "deoffer " + msgstr "deoffer <¥Õ¥¡¥¤¥ë̾|all>" + + #: src/gtkali.c:187 + msgid "deoffers given filename or all offers" + msgstr "»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë̾¤¢¤ë¤¤¤ÏÁ´¤Æ¤Î¥Õ¥¡¥¤¥ë¤Î¥ª¥Õ¥¡¡¼¤ò²ò½ü" + + #: src/gtkali.c:188 + msgid "get " + msgstr "get <¥Ë¥Ã¥¯¥Í¡¼¥à> <¥Õ¥¡¥¤¥ë̾> <Êݸ¥Õ¥¡¥¤¥ë̾>" + + #: src/gtkali.c:188 + msgid "gets offered file" + msgstr "¥ª¥Õ¥¡¡¼¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤ò¼èÆÀ" + + #: src/gtkali.c:189 + msgid "pget " + msgstr "pget <¥Ë¥Ã¥¯¥Í¡¼¥à> <¥Õ¥¡¥¤¥ë̾> <¥Ñ¥¹¥ï¡¼¥É> <Êݸ¥Õ¥¡¥¤¥ë̾>" + + #: src/gtkali.c:190 + msgid "gets passworded file" + msgstr "¥Ñ¥¹¥ï¡¼¥ÉÉÕ¤­¥ª¥Õ¥¡¡¼¤ò¼èÆÀ" + + #: src/gtkali.c:191 + msgid "shows processes for all users on server" + msgstr "¸½ºß¤Î¥µ¡¼¥Ð¾å¤Î¥²¡¼¥à¤òɽ¼¨" + + #: src/gtkali.c:192 + msgid "list names/email addresses for all users on server" + msgstr "¸½ºß¤Î¥µ¡¼¥Ð¾å¤ÎÁ´¤Æ¤Î¥æ¡¼¥¶¡¼/E¥á¡¼¥ë¤òɽ¼¨" + + #: src/gtkali.c:193 + msgid "lists all servers from tracker" + msgstr "¥È¥é¥Ã¥«¡¼¤«¤éÁ´¤Æ¤Î¥µ¡¼¥Ð¤Î¥¢¥É¥ì¥¹¤ò¼èÆÀ" + + #: src/gtkali.c:194 + msgid "lists all active channels on server" + msgstr "¸½ºß¤Î¥µ¡¼¥Ð¾å¤ÎÁ´¤Æ¤Î¥Á¥ã¥ó¥Í¥ë̾¤òɽ¼¨" + + #: src/gtkali.c:195 + msgid "list all users with channel" + msgstr "¸½ºß¤Î¥µ¡¼¥Ð¤ÎÁ´¤Æ¤Î¥æ¡¼¥¶¡¼¤òɽ¼¨" + + #: src/gtkali.c:196 + msgid "list information for given user" + msgstr "»ØÄꤷ¤¿¥æ¡¼¥¶¡¼¤Î¾ðÊó¤òɽ¼¨" + + #: src/gtkali.c:197 + msgid "displays message of the day" + msgstr "º£Æü¤Î¥µ¡¼¥Ð¥á¥Ã¥»¡¼¥¸¤òɽ¼¨" + + #: src/gtkali.c:199 + msgid "" + "\n" + "*** GtKali specific commands:\n" + msgstr "" + "\n" + "*** GtKali¸ÇÍ­¤Î¥³¥Þ¥ó¥É¡§\n" + + #: src/gtkali.c:200 + msgid "quits GtKali" + msgstr "GtKali¤ò½ªÎ»" + + #: src/gtkali.c:201 + msgid "clears screen" + msgstr "¥¹¥¯¥ê¡¼¥ó¤ò¥¯¥ê¥¢" + + #: src/gtkali.c:202 + msgid "ignores given user" + msgstr "»ØÄꤷ¤¿¥æ¡¼¥¶¡¼¤ò̵»ë" + + #: src/gtkali.c:203 + msgid "unignores given user" + msgstr "»ØÄꤷ¤¿¥æ¡¼¥¶¡¼¤Î̵»ë¤ò²ò½ü" + + #: src/gtkali.c:204 + msgid "prints list of ignores" + msgstr "̵»ë¤·¤Æ¤¤¤ëÁ´¤Æ¤Î¥æ¡¼¥¶¡¼¤òɽ¼¨" + + #: src/gtkali.c:205 + msgid "execute a shell command" + msgstr "¥·¥§¥ë¥³¥Þ¥ó¥É¤ò¼Â¹Ô" + + #: src/gtkali.c:304 + msgid "pinged you" + msgstr "¤¬¤¢¤Ê¤¿¤Ëping¤òÂǤÁ¤Þ¤·¤¿" + + #: src/gtkali.c:514 + msgid "Couldn't fork" + msgstr "" + + #: src/gtkali.c:531 + msgid "" + "Welcome to GtKali! In order to use GtKali, you're going to\n" + "have to set it up properly, the following window will help\n" + "you do this. The serial number information is required and\n" + "must be obtained from Kali itself. See their website at\n" + "http://www.kali.net/ for more information.\n" + "\n" + "Note about the server information, it is not necessary, just\n" + "leave it blank if you do not know of a server you want to put\n" + "into it for now. The next time you start GtKali, it will present\n" + "you with a list of servers which you can choose from. Enjoy!" + msgstr "" + "GtKali¤Ø¤è¤¦¤³¤½! GtKali¤ò»ÈÍѤ¹¤ë¤¿¤á¤Ë¤Ï, ÀßÄê¤òŬÀڤ˹Ԥ¦\n" + "ɬÍפ¬¤¢¤ê¤Þ¤¹. ¼¡¤Ëɽ¼¨¤µ¤ì¤ë¥¦¥£¥ó¥É¥¦¤Ç¡¢É¬ÍפÊÀßÄê¤ò¹Ô¤¦ \n" + "»ö¤¬¤Ç¤­¤Þ¤¹. Gtkali¤ò»ÈÍѤ¹¤ë¤¿¤á¤Ë¤Ï¥·¥ê¥¢¥ë¥Ê¥ó¥Ð¡¼¤¬É¬¿Ü\n" + "¤Ç,ËܲÈKali¤«¤é¼èÆÀ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹. " + " \n" + "¾Ü¤·¤¯¤ÏÈà¤é¤ÎWEB¥µ¥¤¥È¤ò¸æÍ÷²¼¤µ¤¤. http://www.kali.net/\n" + "\n" + "¥µ¡¼¥Ð¾ðÊó¤Ë´Ø¤·¤Æ¤Ïɬ¿Ü¤Ç¤Ï¤Ê¤¯, ¤â¤·º£ÀßÄê¤ò¤·¤¿¤¯¤Ê¤±¤ì¤Ð,\n" + "¤½¤ÎÍó¤Ï¶õÍó¤Ë¤·¤Æ¤ª¤¤¤Æ¤â¹½¤¤¤Þ¤»¤ó.¤½¤Î¾ì¹ç,¼¡²óGtKali¤òµ¯Æ°\n" + "¤·¤¿¤È¤­¤Ë,¤½¤Î»þ¤ËÁªÂò²Äǽ¤Ê¥µ¡¼¥Ð¤Î¥ê¥¹¥È¤¬É½¼¨¤µ¤ì¤Þ¤¹. \n" + "¤½¤ì¤Ç¤ÏGtKali¤ò¸ʬ¤Ë´®Ç½¤·¤Æ¤¯¤À¤µ¤¤!" + + #: src/gtkali.c:556 + msgid "Couldn't initialize KaliNix! Aborting!\n" + msgstr "KaliNix¤ò½é´ü²½¤Ç¤­¤Þ¤»¤ó!½ªÎ»¤·¤Þ¤¹!\n" + + #: src/gtkali.c:561 + #, c-format + msgid "gtkali.c: cfg.server_addr=%s (%p)" + msgstr "" + + #: src/ignore.c:47 + #, c-format + msgid "*** Now Ignoring Messages from %s...\n" + msgstr "*** %s ¤«¤é¤Î¥á¥Ã¥»¡¼¥¸¤ò̵»ë¤·¤Þ¤¹...\n" + + #: src/ignore.c:62 + #, c-format + msgid "*** Now Accepting Messages from %s...\n" + msgstr "*** %s ¤«¤é¤Î¥á¥Ã¥»¡¼¥¸¤ò¼õ¤±Æþ¤ì¤Þ¤¹...\n" + + #: src/urlgrabber.c:50 + msgid "Grabbed URLs" + msgstr "¥­¥ã¥×¥Á¥ã¤µ¤ì¤¿URL" + + #: src/urlgrabber.c:99 + msgid "Open" + msgstr "³«¤¯" + + #: src/urlgrabber.c:107 + msgid "Clear" + msgstr "¥¯¥ê¥¢" + + #: src/urlgrabber.c:115 + msgid "Close" + msgstr "ÊĤ¸¤ë" + + #: src/dialog.c:48 + msgid "GtKali Message" + msgstr "GtKali¥á¥Ã¥»¡¼¥¸" + + #: src/aliasdialog.c:170 src/dialog.c:69 src/dialog.c:125 src/dialog.c:169 + msgid "Ok" + msgstr "" + + #: src/dialog.c:94 + msgid "About GtKali" + msgstr "GtKali¤Ë¤Ä¤¤¤Æ" + + #: src/dialog.c:112 + #, c-format + msgid "" + "%s\n" + "by Warren Chartier\n" + "From Eden Li's early client\n" + "\tVisit http://gtkali.sourceforge.net for updates.\n" + msgstr "" + "%s\n" + "by Warren Chartier\n" + "From Eden Li's early client\n" + "\tºÇ¿·ÈǤξðÊó¤Ë¤Ä¤¤¤Æ¤Ïhttp://gtkali.sourceforge.net¤ò¸æÍ÷²¼¤µ¤¤.\n" + + #: src/menu.c:38 + msgid "/_File" + msgstr "/¥Õ¥¡¥¤¥ë(_F)" + + #: src/menu.c:39 + msgid "/File/tearoff" + msgstr "/¥Õ¥¡¥¤¥ë/tearoff" + + #: src/menu.c:40 + msgid "/File/Quit" + msgstr "/¥Õ¥¡¥¤¥ë/½ªÎ»" + + #: src/menu.c:42 + msgid "/_Edit" + msgstr "/ÊÔ½¸(_E)" + + #: src/menu.c:43 + msgid "/Edit/tearoff" + msgstr "/ÊÔ½¸/tearoff" + + #: src/menu.c:44 + msgid "/Edit/Copy" + msgstr "/ÊÔ½¸/¥³¥Ô¡¼" + + #: src/menu.c:45 + msgid "/Edit/Paste" + msgstr "/ÊÔ½¸/¥Ú¡¼¥¹¥È" + + #: src/menu.c:47 + msgid "/_View" + msgstr "/ɽ¼¨(_V)" + + #: src/menu.c:48 + msgid "/View/tearoff" + msgstr "/ɽ¼¨/tearoff" + + #: src/menu.c:49 + msgid "/View/Servers.." + msgstr "/ɽ¼¨/¥µ¡¼¥Ð°ìÍ÷" + + #: src/menu.c:50 + msgid "/View/URL Grabber.." + msgstr "/ɽ¼¨/URL¥­¥ã¥×¥Á¥ã" + + #: src/menu.c:53 + msgid "/_Config" + msgstr "/ÀßÄê(_C)" + + #: src/menu.c:54 + msgid "/Config/tearoff" + msgstr "/ÀßÄê/tearoff" + + #: src/menu.c:55 + msgid "/Config/Config.." + msgstr "/ÀßÄê/ÀßÄê" + + #: src/menu.c:56 + msgid "/Config/Aliases.." + msgstr "/ÀßÄê/¥¨¥¤¥ê¥¢¥¹" + + #: src/menu.c:57 + msgid "/Config/sep" + msgstr "/ÀßÄê/sep" + + #: src/menu.c:58 + msgid "/Config/Save on Exit" + msgstr "/ÀßÄê/½ªÎ»»þ¤ËÊݸ" + + #: src/menu.c:59 + msgid "/Config/Save Now" + msgstr "/ÀßÄê/º£¤¹¤°Êݸ" + + #: src/menu.c:61 + msgid "/_Help" + msgstr "/¥Ø¥ë¥×(_H)" + + #: src/menu.c:62 + msgid "/Help/About.." + msgstr "/¥Ø¥ë¥×/gtkali¤Ë¤Ä¤¤¤Æ" + + #: src/kali_server.c:37 + msgid "#" + msgstr "" + + #: src/kali_server.c:37 + msgid "Server Name" + msgstr "¥µ¡¼¥Ð̾" + + #: src/kali_server.c:37 + msgid "IP" + msgstr "IP¥¢¥É¥ì¥¹" + + #: src/kali_server.c:63 + msgid "Kali Servers" + msgstr "Kali¥µ¡¼¥Ð°ìÍ÷" + + #: src/kali_server.c:109 + msgid "Search: " + msgstr "¸¡º÷: " + + #: src/kali_server.c:131 + msgid "Connect" + msgstr "Àܳ" + + #: src/kali_server.c:132 + msgid "Set as Default Server" + msgstr "¥Ç¥Õ¥©¥ë¥È¤Ë»ØÄê" + + #: src/kali_server.c:134 + msgid "Refresh" + msgstr "¹¹¿·" + + #: src/kali_server.c:297 + msgid "Capturing servers... Please wait." + msgstr "¥µ¡¼¥Ð¥ê¥¹¥È¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹... ¾¯¡¹¤ªÂÔ¤Á²¼¤µ¤¤." + + #: src/mainui.c:180 + msgid "Quitting..." + msgstr "½ªÎ»½èÍýÃæ¤Ç¤¹..." + + #: src/mainui.c:198 + #, c-format + msgid "gdk: w=%i, h=%i, x=%i, y=%i" + msgstr "" + + #: src/mainui.c:205 + #, fuzzy, c-format + msgid "quit message: %s" + msgstr "½ªÎ»»þ¥á¥Ã¥»¡¼¥¸¡§ " + + #: src/mainui.c:214 + msgid "saving cfg" + msgstr "" + + #: src/mainui.c:221 + msgid "not saving cfg" + msgstr "" + + #: src/toolbar.c:54 + msgid "Default" + msgstr "¥Ç¥Õ¥©¥ë¥È" + + #: src/toolbar.c:57 + msgid "URLs" + msgstr "URL" + + #: src/toolbar.c:62 + msgid "Copy" + msgstr "¥³¥Ô¡¼" + + #: src/toolbar.c:65 + msgid "Paste" + msgstr "¥Ú¡¼¥¹¥È" + + #: src/toolbar.c:70 + msgid "Quit" + msgstr "½ªÎ»" + + #: src/aliasdialog.c:33 + msgid "Alias" + msgstr "¥¨¥¤¥ê¥¢¥¹" + + #: src/aliasdialog.c:33 + msgid "Translation" + msgstr "ËÝÌõ" + + #: src/aliasdialog.c:55 + msgid "Aliases" + msgstr "¥¨¥¤¥ê¥¢¥¹" + + #. entry part + #: src/aliasdialog.c:103 + msgid "Alias Settings" + msgstr "¥¨¥¤¥ê¥¢¥¹ÀßÄê" + + #: src/aliasdialog.c:140 + msgid "Add/Apply" + msgstr "ÄɲÃ/ŬÍÑ" + + #: src/aliasdialog.c:146 + msgid "Delete Alias" + msgstr "¥¨¥¤¥ê¥¢¥¹¤òºï½ü" + + #: src/aliasdialog.c:399 + msgid "Aliases saved... Changes effective immediately." + msgstr "¥¨¥¤¥ê¥¢¥¹¤ò¥»¡¼¥Ö¤·¤Þ¤·¤¿... Êѹ¹¤Ï¤¹¤°¤ËÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹." + + #: src/userlist.c:35 + msgid "Nick" + msgstr "¥Ë¥Ã¥¯¥Í¡¼¥à" + + #: src/userlist.c:98 + msgid "Whois" + msgstr "" + + #: src/userlist.c:105 + msgid "Info" + msgstr "¥æ¡¼¥¶¡¼¾ðÊó(info)" + + #: src/userlist.c:112 + msgid "Ping" + msgstr "" + + #: src/userlist.c:119 + msgid "Ignore/Unignore" + msgstr "̵»ë/̵»ë²ò½ü" + + #: src/userlist.c:126 + msgid "Private Message" + msgstr "¥×¥é¥¤¥Ù¡¼¥È¥á¥Ã¥»¡¼¥¸" + + #: src/chanlist.c:35 + msgid "Channel" + msgstr "¥Á¥ã¥ó¥Í¥ë" + + #: src/chanlist.c:35 + msgid "Users" + msgstr "¥æ¡¼¥¶¡¼" diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/po/stamp-cat-id gtkali-0.9.5_jp/po/stamp-cat-id *** gtkali-0.9.5/po/stamp-cat-id Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/po/stamp-cat-id Fri Jun 16 22:09:42 2000 *************** *** 0 **** --- 1 ---- + timestamp diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/src/Makefile.am gtkali-0.9.5_jp/src/Makefile.am *** gtkali-0.9.5/src/Makefile.am Thu Apr 6 15:01:07 2000 --- gtkali-0.9.5_jp/src/Makefile.am Fri Jun 16 11:11:43 2000 *************** *** 1,15 **** ## Process this file with automake to produce Makefile.in AUTOMAKE_OPTIONS=no-dependencies CLEANFILES=*~ .deps/* .*.swp .*.swo ! CFLAGS += -O2 -Wall DEFS += -DG_LOG_DOMAIN=\"GtKali\" ! INCLUDES += @GTK_CFLAGS@ LDADD += @GTK_LIBS@ LDFLAGS += $(GTK_LIBS) bin_PROGRAMS = gtkali ! gtkali_LDADD = ../kalinix.lib gtkali_SOURCES = \ mainui.c \ dialog.c \ --- 1,16 ---- ## Process this file with automake to produce Makefile.in + SUBDIR=src AUTOMAKE_OPTIONS=no-dependencies CLEANFILES=*~ .deps/* .*.swp .*.swo ! CFLAGS += -O2 -Wall -DLOCALEDIR=\""$(localedir)"\" DEFS += -DG_LOG_DOMAIN=\"GtKali\" ! INCLUDES += @GTK_CFLAGS@ -I$(top_srcdir)/intl LDADD += @GTK_LIBS@ LDFLAGS += $(GTK_LIBS) bin_PROGRAMS = gtkali ! gtkali_LDADD = ../kalinix.lib ${top_srcdir}/libjcode/libjcode.a gtkali_SOURCES = \ mainui.c \ dialog.c \ diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/src/Makefile.in gtkali-0.9.5_jp/src/Makefile.in *** gtkali-0.9.5/src/Makefile.in Thu Apr 13 12:22:20 2000 --- gtkali-0.9.5_jp/src/Makefile.in Fri Jun 16 22:03:43 2000 *************** *** 57,85 **** NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : CC = @CC@ GTKALI_VERSION = @GTKALI_VERSION@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ AUTOMAKE_OPTIONS = no-dependencies CLEANFILES = *~ .deps/* .*.swp .*.swo ! CFLAGS = -O2 -Wall DEFS = -DG_LOG_DOMAIN=\"GtKali\" ! INCLUDES = @GTK_CFLAGS@ LDADD = @GTK_LIBS@ LDFLAGS = $(GTK_LIBS) bin_PROGRAMS = gtkali ! gtkali_LDADD = ../kalinix.lib gtkali_SOURCES = mainui.c dialog.c menu.c userlist.c chanlist.c aliasdialog.c toolbar.c statusbar.c gtkutil.c urlgrabber.c kali_server.c util.c kali.c alias.c ignore.c log.c color.c configfile.c cfg.c kevents.c event.c kpe_handler.c cfgwin.c txtent.c mwindow.c optionmenu.c gtkali.c mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = PROGRAMS = $(bin_PROGRAMS) --- 57,108 ---- NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ CC = @CC@ + DATADIRNAME = @DATADIRNAME@ + GENCAT = @GENCAT@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ GTKALI_VERSION = @GTKALI_VERSION@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ + GT_NO = @GT_NO@ + GT_YES = @GT_YES@ + INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ + INSTOBJEXT = @INSTOBJEXT@ + INTLDEPS = @INTLDEPS@ + INTLLIBS = @INTLLIBS@ + INTLOBJS = @INTLOBJS@ MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + RANLIB = @RANLIB@ + USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ + USE_NLS = @USE_NLS@ VERSION = @VERSION@ + l = @l@ + localedir = @localedir@ + SUBDIR = src AUTOMAKE_OPTIONS = no-dependencies CLEANFILES = *~ .deps/* .*.swp .*.swo ! CFLAGS = -O2 -Wall -DLOCALEDIR=\""$(localedir)"\" DEFS = -DG_LOG_DOMAIN=\"GtKali\" ! INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir)/intl LDADD = @GTK_LIBS@ LDFLAGS = $(GTK_LIBS) bin_PROGRAMS = gtkali ! gtkali_LDADD = ../kalinix.lib ${top_srcdir}/libjcode/libjcode.a gtkali_SOURCES = mainui.c dialog.c menu.c userlist.c chanlist.c aliasdialog.c toolbar.c statusbar.c gtkutil.c urlgrabber.c kali_server.c util.c kali.c alias.c ignore.c log.c color.c configfile.c cfg.c kevents.c event.c kpe_handler.c cfgwin.c txtent.c mwindow.c optionmenu.c gtkali.c mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = PROGRAMS = $(bin_PROGRAMS) *************** *** 90,106 **** kali_server.o util.o kali.o alias.o ignore.o log.o color.o configfile.o \ cfg.o kevents.o event.o kpe_handler.o cfgwin.o txtent.o mwindow.o \ optionmenu.o gtkali.o ! gtkali_DEPENDENCIES = ../kalinix.lib gtkali_LDFLAGS = COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ! DIST_COMMON = ./stamp-h.in Makefile.am Makefile.in config.h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! TAR = tar GZIP_ENV = --best SOURCES = $(gtkali_SOURCES) OBJECTS = $(gtkali_OBJECTS) --- 113,129 ---- kali_server.o util.o kali.o alias.o ignore.o log.o color.o configfile.o \ cfg.o kevents.o event.o kpe_handler.o cfgwin.o txtent.o mwindow.o \ optionmenu.o gtkali.o ! gtkali_DEPENDENCIES = ../kalinix.lib ${top_srcdir}/libjcode/libjcode.a gtkali_LDFLAGS = COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ! DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! TAR = gtar GZIP_ENV = --best SOURCES = $(gtkali_SOURCES) OBJECTS = $(gtkali_OBJECTS) *************** *** 116,149 **** && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - config.h: stamp-h - @if test ! -f $@; then \ - rm -f stamp-h; \ - $(MAKE) stamp-h; \ - else :; fi - stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=src/config.h \ - $(SHELL) ./config.status - @echo timestamp > stamp-h 2> /dev/null - $(srcdir)/config.h.in: $(srcdir)/stamp-h.in - @if test ! -f $@; then \ - rm -f $(srcdir)/stamp-h.in; \ - $(MAKE) $(srcdir)/stamp-h.in; \ - else :; fi - $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null - - mostlyclean-hdr: - - clean-hdr: - - distclean-hdr: - -rm -f config.h - - maintainer-clean-hdr: - mostlyclean-binPROGRAMS: clean-binPROGRAMS: --- 139,144 ---- *************** *** 202,216 **** here=`pwd` && cd $(srcdir) \ && mkid -f$$here/ID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: --- 197,211 ---- here=`pwd` && cd $(srcdir) \ && mkid -f$$here/ID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: *************** *** 244,252 **** check: check-am installcheck-am: installcheck: installcheck-am - all-recursive-am: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - install-exec-am: install-binPROGRAMS install-exec: install-exec-am --- 239,244 ---- *************** *** 258,264 **** install: install-am uninstall-am: uninstall-binPROGRAMS uninstall: uninstall-am ! all-am: Makefile $(PROGRAMS) config.h all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install --- 250,256 ---- install: install-am uninstall-am: uninstall-binPROGRAMS uninstall: uninstall-am ! all-am: Makefile $(PROGRAMS) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install *************** *** 276,298 **** -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \ ! mostlyclean-compile mostlyclean-tags \ ! mostlyclean-generic mostlyclean: mostlyclean-am ! clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \ ! clean-generic mostlyclean-am clean: clean-am ! distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \ ! distclean-tags distclean-generic clean-am distclean: distclean-am ! maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \ maintainer-clean-compile maintainer-clean-tags \ maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" --- 268,289 ---- -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ ! mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-am ! clean-am: clean-binPROGRAMS clean-compile clean-tags clean-generic \ ! mostlyclean-am clean: clean-am ! distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \ ! distclean-generic clean-am distclean: distclean-am ! maintainer-clean-am: maintainer-clean-binPROGRAMS \ maintainer-clean-compile maintainer-clean-tags \ maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" *************** *** 300,316 **** maintainer-clean: maintainer-clean-am ! .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ ! mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile tags mostlyclean-tags distclean-tags \ clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ ! check-am installcheck-am installcheck all-recursive-am install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs \ ! mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 291,306 ---- maintainer-clean: maintainer-clean-am ! .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile tags mostlyclean-tags distclean-tags \ clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ ! check-am installcheck-am installcheck install-exec-am install-exec \ ! install-data-am install-data install-am install uninstall-am uninstall \ ! all-redirect all-am all installdirs mostlyclean-generic \ ! distclean-generic clean-generic maintainer-clean-generic clean \ ! mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/src/aliasdialog.c gtkali-0.9.5_jp/src/aliasdialog.c *** gtkali-0.9.5/src/aliasdialog.c Sat Jul 3 13:41:29 1999 --- gtkali-0.9.5_jp/src/aliasdialog.c Fri Jun 16 21:52:15 2000 *************** *** 24,35 **** #include "alias.h" #include "gtkutil.h" #include "statusbar.h" static GtkWidget *window; static GtkWidget *clist; static GtkWidget *alias_entry, *xlation_entry; ! static gchar *titles[] = {"Alias", "Translation"}; static gint current_row = -1; static void clist_copy_to_row (gchar **); --- 24,36 ---- #include "alias.h" #include "gtkutil.h" #include "statusbar.h" + #include "intl.h" static GtkWidget *window; static GtkWidget *clist; static GtkWidget *alias_entry, *xlation_entry; ! static gchar *titles[] = {N_("Alias"), N_("Translation")}; static gint current_row = -1; static void clist_copy_to_row (gchar **); *************** *** 51,57 **** GList *list; window = gtkutil_window_new (TRUE); ! gtk_window_set_title (GTK_WINDOW (window), "Aliases"); gtk_widget_set_usize (window, 500, 300); gtk_signal_connect (GTK_OBJECT (window), "destroy", --- 52,58 ---- GList *list; window = gtkutil_window_new (TRUE); ! gtk_window_set_title (GTK_WINDOW (window), _("Aliases")); gtk_widget_set_usize (window, 500, 300); gtk_signal_connect (GTK_OBJECT (window), "destroy", *************** *** 66,71 **** --- 67,74 ---- gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); /* scrolled clist */ + titles[0] = _(titles[0]); + titles[1] = _(titles[1]); clist = gtk_clist_new_with_titles (2, titles); gtk_clist_set_selection_mode (GTK_CLIST (clist), GTK_SELECTION_SINGLE); gtk_clist_set_column_width (GTK_CLIST (clist), 0, 70); *************** *** 97,103 **** gtk_box_pack_start (GTK_BOX (hbox), scroller, TRUE, TRUE, 1); /* entry part */ ! frame = gtk_frame_new ("Alias Settings"); gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 5); vbox2 = gtk_vbox_new (FALSE, 4); --- 100,106 ---- gtk_box_pack_start (GTK_BOX (hbox), scroller, TRUE, TRUE, 1); /* entry part */ ! frame = gtk_frame_new (_("Alias Settings")); gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 5); vbox2 = gtk_vbox_new (FALSE, 4); *************** *** 134,146 **** hbox2 = gtk_hbox_new (TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox2), hbox2, TRUE, FALSE, 0); ! button = gtk_button_new_with_label ("Add/Apply"); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (apply_entries), NULL); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (hbox2), button, TRUE, TRUE, 2); ! button = gtk_button_new_with_label ("Delete Alias"); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (clist_delete_current), NULL); gtk_widget_show (button); --- 137,149 ---- hbox2 = gtk_hbox_new (TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox2), hbox2, TRUE, FALSE, 0); ! button = gtk_button_new_with_label (_("Add/Apply")); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (apply_entries), NULL); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (hbox2), button, TRUE, TRUE, 2); ! button = gtk_button_new_with_label (_("Delete Alias")); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (clist_delete_current), NULL); gtk_widget_show (button); *************** *** 164,176 **** gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); ! button = gtk_button_new_with_label ("Ok"); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (ok_callback), NULL); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 2); ! button = gtk_button_new_with_label ("Cancel"); gtk_signal_connect_object (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy), GTK_OBJECT (window)); gtk_widget_show (button); --- 167,179 ---- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); ! button = gtk_button_new_with_label (_("Ok")); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (ok_callback), NULL); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 2); ! button = gtk_button_new_with_label (_("Cancel")); gtk_signal_connect_object (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy), GTK_OBJECT (window)); gtk_widget_show (button); *************** *** 393,397 **** } gtk_widget_destroy (window); ! statusbar_push ("Aliases saved... Changes effective immediately."); } --- 396,400 ---- } gtk_widget_destroy (window); ! statusbar_push (_("Aliases saved... Changes effective immediately.")); } diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/src/cfgwin.c gtkali-0.9.5_jp/src/cfgwin.c *** gtkali-0.9.5/src/cfgwin.c Fri Mar 31 07:30:28 2000 --- gtkali-0.9.5_jp/src/cfgwin.c Fri Jun 16 13:21:54 2000 *************** *** 27,32 **** --- 27,33 ---- #include "optionmenu.h" #include "cfgwin.h" #include "cfg.h" + #include "intl.h" static void cfgwin_callback_destroy (); static void cfgwin_callback_ok (); *************** *** 108,114 **** return; win = gtk_window_new (GTK_WINDOW_TOPLEVEL); ! gtk_window_set_title (GTK_WINDOW (win), "GtKali Config"); gtk_window_set_modal (GTK_WINDOW (win), TRUE); gtk_signal_connect (GTK_OBJECT (win), "destroy", --- 109,115 ---- return; win = gtk_window_new (GTK_WINDOW_TOPLEVEL); ! gtk_window_set_title (GTK_WINDOW (win), _("GtKali Config")); gtk_window_set_modal (GTK_WINDOW (win), TRUE); gtk_signal_connect (GTK_OBJECT (win), "destroy", *************** *** 124,174 **** nbook_page = cfgwin_kali_settings_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new ("Kali Settings")); nbook_page = cfgwin_options_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new ("Options")); nbook_page = cfgwin_chat_settings_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new ("Chat Settings")); /* nbook_page = cfgwin_wingeom_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new ("Window Geometry"));*/ /* nbook_page = cfgwin_serial_numbers_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new ("Serial Numbers")); nbook_page = cfgwin_user_info_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new ("User Info")); nbook_page = cfgwin_options_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new ("Options")); nbook_page = cfgwin_colors_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new ("Message Colors")); nbook_page = cfgwin_servers_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new ("Servers")); nbook_page = cfgwin_chat_window_settings_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new ("Chat Window Settings")); nbook_page = cfgwin_chat_font_settings_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new ("Chat Font Settings")); nbook_page = cfgwin_wingeom_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new ("Window Geometry"));*/ gtk_widget_show (GTK_WIDGET (nbook)); --- 125,175 ---- nbook_page = cfgwin_kali_settings_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new (_("Kali Settings"))); nbook_page = cfgwin_options_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new (_("Options"))); nbook_page = cfgwin_chat_settings_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new (_("Chat Settings"))); /* nbook_page = cfgwin_wingeom_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new (_("Window Geometry")));*/ /* nbook_page = cfgwin_serial_numbers_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new (_("Serial Numbers"))); nbook_page = cfgwin_user_info_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new (_("User Info"))); nbook_page = cfgwin_options_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new (_("Options"))); nbook_page = cfgwin_colors_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new (_("Message Colors"))); nbook_page = cfgwin_servers_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new (_("Servers"))); nbook_page = cfgwin_chat_window_settings_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new (_("Chat Window Settings"))); nbook_page = cfgwin_chat_font_settings_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new (_("Chat Font Settings"))); nbook_page = cfgwin_wingeom_nbook_page (); gtk_notebook_append_page (GTK_NOTEBOOK (nbook), nbook_page, ! gtk_label_new (_("Window Geometry")));*/ gtk_widget_show (GTK_WIDGET (nbook)); *************** *** 179,191 **** hbox = gtk_hbox_new (TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); ! button = gtk_button_new_with_label ("Cancel"); gtk_signal_connect_object (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy), GTK_OBJECT (win)); gtk_box_pack_end (GTK_BOX (hbox), button, TRUE, TRUE, 2); gtk_widget_show (GTK_WIDGET (button)); ! button = gtk_button_new_with_label ("OK"); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (cfgwin_callback_ok), NULL); gtk_box_pack_end (GTK_BOX (hbox), button, TRUE, TRUE, 2); --- 180,192 ---- hbox = gtk_hbox_new (TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); ! button = gtk_button_new_with_label (_("Cancel")); gtk_signal_connect_object (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy), GTK_OBJECT (win)); gtk_box_pack_end (GTK_BOX (hbox), button, TRUE, TRUE, 2); gtk_widget_show (GTK_WIDGET (button)); ! button = gtk_button_new_with_label (_("OK")); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (cfgwin_callback_ok), NULL); gtk_box_pack_end (GTK_BOX (hbox), button, TRUE, TRUE, 2); *************** *** 353,361 **** { cfg_save (); dialog_normal_do ( ! "Changes made were saved. You need to restart GtKali to begin\n" "using it. If you didn't select a default server, a list will\n" ! "be presented to you the next time you start GtKali."); gtk_main_quit (); return; } --- 354,362 ---- { cfg_save (); dialog_normal_do ( ! _("Changes made were saved. You need to restart GtKali to begin\n" "using it. If you didn't select a default server, a list will\n" ! "be presented to you the next time you start GtKali.")); gtk_main_quit (); return; } *************** *** 370,425 **** vbox = gtk_vbox_new (FALSE, 5); ! frame = gtk_frame_new ("Registration"); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (frame), 5); table = gtk_table_new (3, 2, FALSE); gtk_container_add (GTK_CONTAINER (frame), table); ! cfgwin_label_entry_pair ("Serial Number: ", &sn_serial_entry, GTK_TABLE (table), 0, 12, KPESerial, cfg.serial); ! cfgwin_label_entry_pair ("SKey: ", &sn_skey_entry, GTK_TABLE (table), 1, 12, KPESerial, cfg.skey); ! cfgwin_label_entry_pair ("TKey: ", &sn_tkey_entry, GTK_TABLE (table), 2, 12, KPESerial, cfg.tkey); gtk_widget_show (table); gtk_widget_show (frame); ! frame = gtk_frame_new ("User Info"); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (frame), 5); table = gtk_table_new (6, 2, FALSE); gtk_container_add (GTK_CONTAINER (frame), table); ! cfgwin_label_entry_pair ("Nickname: ", &user_info_nickname_entry, GTK_TABLE (table), 0, 16, KPEAny, cfg.nickname); ! cfgwin_label_entry_pair ("Real Name: ", &user_info_realname_entry, GTK_TABLE (table), 1, 30, KPEAny, cfg.realname); ! cfgwin_label_entry_pair ("Email: ", &user_info_email_entry, GTK_TABLE (table), 2, 40, KPEAny, cfg.email); ! cfgwin_label_entry_pair ("Location: ", &user_info_location_entry, GTK_TABLE (table), 3, 40, KPEAny, cfg.location); ! cfgwin_label_entry_pair ("Other: ", &user_info_other_entry, GTK_TABLE (table), 4, 20, KPEAny, cfg.other); ! cfgwin_label_entry_pair ("Default Quit Message: ", &user_info_quit_message_entry, GTK_TABLE (table), 5, 400, KPEAny, cfg.quit_message); /**************** FIX ME: ^^ goes elsewhere*/ gtk_widget_show (table); gtk_widget_show (frame); ! frame = gtk_frame_new ("Servers"); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (frame), 5); table = gtk_table_new (3, 2, FALSE); gtk_container_add (GTK_CONTAINER (frame), table); ! cfgwin_label_entry_pair ("Tracker: ", &servers_tracker_entry, GTK_TABLE (table), 0, 20, KPEServer, cfg.trackeraddr); ! cfgwin_label_entry_pair ("Default Kali Server: ", &servers_server_entry, GTK_TABLE (table), 1, 20, KPEServer, cfg.serveraddr); ! cfgwin_label_entry_pair ("Proxy: ", &servers_proxy_entry, GTK_TABLE (table), 2, 20, KPEServer, cfg.proxyaddr); gtk_widget_show (table); --- 371,426 ---- vbox = gtk_vbox_new (FALSE, 5); ! frame = gtk_frame_new (_("Registration")); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (frame), 5); table = gtk_table_new (3, 2, FALSE); gtk_container_add (GTK_CONTAINER (frame), table); ! cfgwin_label_entry_pair (_("Serial Number: "), &sn_serial_entry, GTK_TABLE (table), 0, 12, KPESerial, cfg.serial); ! cfgwin_label_entry_pair (_("SKey: "), &sn_skey_entry, GTK_TABLE (table), 1, 12, KPESerial, cfg.skey); ! cfgwin_label_entry_pair (_("TKey: "), &sn_tkey_entry, GTK_TABLE (table), 2, 12, KPESerial, cfg.tkey); gtk_widget_show (table); gtk_widget_show (frame); ! frame = gtk_frame_new (_("User Info")); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (frame), 5); table = gtk_table_new (6, 2, FALSE); gtk_container_add (GTK_CONTAINER (frame), table); ! cfgwin_label_entry_pair (_("Nickname: "), &user_info_nickname_entry, GTK_TABLE (table), 0, 16, KPEAny, cfg.nickname); ! cfgwin_label_entry_pair (_("Real Name: "), &user_info_realname_entry, GTK_TABLE (table), 1, 30, KPEAny, cfg.realname); ! cfgwin_label_entry_pair (_("Email: "), &user_info_email_entry, GTK_TABLE (table), 2, 40, KPEAny, cfg.email); ! cfgwin_label_entry_pair (_("Location: "), &user_info_location_entry, GTK_TABLE (table), 3, 40, KPEAny, cfg.location); ! cfgwin_label_entry_pair (_("Other: "), &user_info_other_entry, GTK_TABLE (table), 4, 20, KPEAny, cfg.other); ! cfgwin_label_entry_pair (_("Default Quit Message: "), &user_info_quit_message_entry, GTK_TABLE (table), 5, 400, KPEAny, cfg.quit_message); /**************** FIX ME: ^^ goes elsewhere*/ gtk_widget_show (table); gtk_widget_show (frame); ! frame = gtk_frame_new (_("Servers")); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (frame), 5); table = gtk_table_new (3, 2, FALSE); gtk_container_add (GTK_CONTAINER (frame), table); ! cfgwin_label_entry_pair (_("Tracker: "), &servers_tracker_entry, GTK_TABLE (table), 0, 20, KPEServer, cfg.trackeraddr); ! cfgwin_label_entry_pair (_("Default Kali Server: "), &servers_server_entry, GTK_TABLE (table), 1, 20, KPEServer, cfg.serveraddr); ! cfgwin_label_entry_pair (_("Proxy: "), &servers_proxy_entry, GTK_TABLE (table), 2, 20, KPEServer, cfg.proxyaddr); gtk_widget_show (table); *************** *** 435,452 **** { GtkWidget *frame, *table, *button, *hbox, *label; ! frame = gtk_frame_new ("URL Highlighting"); gtk_container_set_border_width (GTK_CONTAINER (frame), 5); table = gtk_table_new (2, 4, FALSE); gtk_container_add (GTK_CONTAINER (frame), table); ! url_color_omenu = optionmenu_new ("URL Color", (Color)cfg.url_color, (Color)-1); gtk_table_attach (GTK_TABLE (table), optionmenu_get_widget (url_color_omenu), 0, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 5); ! label = gtk_label_new ("URL Font: "); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 5); --- 436,453 ---- { GtkWidget *frame, *table, *button, *hbox, *label; ! frame = gtk_frame_new (_("URL Highlighting")); gtk_container_set_border_width (GTK_CONTAINER (frame), 5); table = gtk_table_new (2, 4, FALSE); gtk_container_add (GTK_CONTAINER (frame), table); ! url_color_omenu = optionmenu_new (_("URL Color"), (Color)cfg.url_color, (Color)-1); gtk_table_attach (GTK_TABLE (table), optionmenu_get_widget (url_color_omenu), 0, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 5); ! label = gtk_label_new (_("URL Font: ")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 5); *************** *** 457,463 **** gtk_box_pack_start (GTK_BOX (hbox), url_font_name_entry, TRUE, TRUE, 2); gtk_widget_show (url_font_name_entry); ! button = gtk_button_new_with_label ("..."); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 2); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (cfgwin_elipse_button_clicked), url_font_name_entry); --- 458,464 ---- gtk_box_pack_start (GTK_BOX (hbox), url_font_name_entry, TRUE, TRUE, 2); gtk_widget_show (url_font_name_entry); ! button = gtk_button_new_with_label (_("...")); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 2); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (cfgwin_elipse_button_clicked), url_font_name_entry); *************** *** 468,476 **** gtk_widget_show (hbox); ! cfgwin_label_entry_pair ("Browser Command: ", &url_handler_entry, GTK_TABLE (table), 2, 200, KPEAny, cfg.url_handler); ! cfgwin_chkbutton ("Do URL Highlighting", &url_activate_cb, GTK_TABLE (table), 0, 3, cfg.url_activate); gtk_widget_show (table); --- 469,477 ---- gtk_widget_show (hbox); ! cfgwin_label_entry_pair (_("Browser Command: "), &url_handler_entry, GTK_TABLE (table), 2, 200, KPEAny, cfg.url_handler); ! cfgwin_chkbutton (_("Do URL Highlighting"), &url_activate_cb, GTK_TABLE (table), 0, 3, cfg.url_activate); gtk_widget_show (table); *************** *** 486,528 **** vbox = gtk_vbox_new (FALSE, 5); ! frame = gtk_frame_new ("GtKali Options"); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (frame), 5); table = gtk_table_new (3, 2, FALSE); gtk_container_add (GTK_CONTAINER (frame), table); ! cfgwin_chkbutton ("Server Messages", &options_server_msgs_cb, GTK_TABLE (table), 0, 0, cfg.server_msgs); ! cfgwin_chkbutton ("Chat Colors", &options_colors_cb, GTK_TABLE (table), 0, 1, cfg.colors); ! cfgwin_chkbutton ("Nick Completion", &options_nick_comp_cb, GTK_TABLE (table), 0, 2, cfg.nick_comp); ! cfgwin_chkbutton ("Logging", &options_logging_cb, GTK_TABLE (table), 1, 0, cfg.logging); ! cfgwin_chkbutton ("Private Message Windows", &options_pop_up_msgs_cb, GTK_TABLE (table), 1, 1, cfg.pop_up_msgs); ! cfgwin_chkbutton ("Show Ping Notices", &options_show_pings_cb, GTK_TABLE (table), 1, 2, cfg.show_pings); gtk_widget_show (table); gtk_widget_show (frame); ! frame = gtk_frame_new ("Window Geometry"); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (frame), 5); table = gtk_table_new (5, 2, FALSE); gtk_container_add (GTK_CONTAINER (frame), table); ! cfgwin_label_spin_button_pair ("Width: ", &wingeom_width_spin_button, GTK_TABLE (table), 0, 2000, cfg.win_width); ! cfgwin_label_spin_button_pair ("Height: ", &wingeom_height_spin_button, GTK_TABLE (table), 1, 2000, cfg.win_height); ! cfgwin_label_spin_button_pair ("X Position: ", &wingeom_x_pos_spin_button, GTK_TABLE (table), 2, 2000, cfg.win_pos_x); ! cfgwin_label_spin_button_pair ("Y Position: ", &wingeom_y_pos_spin_button, GTK_TABLE (table), 3, 2000, cfg.win_pos_y); ! cfgwin_chkbutton ("Remember geometry", &wingeom_remember_cb, GTK_TABLE (table), 0, 4, cfg.win_remember_geom); gtk_widget_show (frame); --- 487,529 ---- vbox = gtk_vbox_new (FALSE, 5); ! frame = gtk_frame_new (_("GtKali Options")); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (frame), 5); table = gtk_table_new (3, 2, FALSE); gtk_container_add (GTK_CONTAINER (frame), table); ! cfgwin_chkbutton (_("Server Messages"), &options_server_msgs_cb, GTK_TABLE (table), 0, 0, cfg.server_msgs); ! cfgwin_chkbutton (_("Chat Colors"), &options_colors_cb, GTK_TABLE (table), 0, 1, cfg.colors); ! cfgwin_chkbutton (_("Nick Completion"), &options_nick_comp_cb, GTK_TABLE (table), 0, 2, cfg.nick_comp); ! cfgwin_chkbutton (_("Logging"), &options_logging_cb, GTK_TABLE (table), 1, 0, cfg.logging); ! cfgwin_chkbutton (_("Private Message Windows"), &options_pop_up_msgs_cb, GTK_TABLE (table), 1, 1, cfg.pop_up_msgs); ! cfgwin_chkbutton (_("Show Ping Notices"), &options_show_pings_cb, GTK_TABLE (table), 1, 2, cfg.show_pings); gtk_widget_show (table); gtk_widget_show (frame); ! frame = gtk_frame_new (_("Window Geometry")); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (frame), 5); table = gtk_table_new (5, 2, FALSE); gtk_container_add (GTK_CONTAINER (frame), table); ! cfgwin_label_spin_button_pair (_("Width: "), &wingeom_width_spin_button, GTK_TABLE (table), 0, 2000, cfg.win_width); ! cfgwin_label_spin_button_pair (_("Height: "), &wingeom_height_spin_button, GTK_TABLE (table), 1, 2000, cfg.win_height); ! cfgwin_label_spin_button_pair (_("X Position: "), &wingeom_x_pos_spin_button, GTK_TABLE (table), 2, 2000, cfg.win_pos_x); ! cfgwin_label_spin_button_pair (_("Y Position: "), &wingeom_y_pos_spin_button, GTK_TABLE (table), 3, 2000, cfg.win_pos_y); ! cfgwin_chkbutton (_("Remember geometry"), &wingeom_remember_cb, GTK_TABLE (table), 0, 4, cfg.win_remember_geom); gtk_widget_show (frame); *************** *** 540,562 **** { GtkWidget *frame, *table, *button, *hbox, *label; ! frame = gtk_frame_new ("Appearance"); gtk_container_set_border_width (GTK_CONTAINER (frame), 5); table = gtk_table_new (1, 3, FALSE); gtk_container_add (GTK_CONTAINER (frame), table); ! cws_chat_fg_color_omenu = optionmenu_new ("Foreground Color", (Color)cfg.chat_fg_color, (Color)-1); gtk_table_attach (GTK_TABLE (table), optionmenu_get_widget (cws_chat_fg_color_omenu), 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 5); ! cws_chat_bg_color_omenu = optionmenu_new ("Background Color", (Color)cfg.chat_bg_color, (Color)-1); gtk_table_attach (GTK_TABLE (table), optionmenu_get_widget (cws_chat_bg_color_omenu), 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 5); ! label = gtk_label_new ("Font: "); hbox = gtk_hbox_new (FALSE, 1); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 2); gtk_widget_show (label); --- 541,563 ---- { GtkWidget *frame, *table, *button, *hbox, *label; ! frame = gtk_frame_new (_("Appearance")); gtk_container_set_border_width (GTK_CONTAINER (frame), 5); table = gtk_table_new (1, 3, FALSE); gtk_container_add (GTK_CONTAINER (frame), table); ! cws_chat_fg_color_omenu = optionmenu_new (_("Foreground Color"), (Color)cfg.chat_fg_color, (Color)-1); gtk_table_attach (GTK_TABLE (table), optionmenu_get_widget (cws_chat_fg_color_omenu), 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 5); ! cws_chat_bg_color_omenu = optionmenu_new (_("Background Color"), (Color)cfg.chat_bg_color, (Color)-1); gtk_table_attach (GTK_TABLE (table), optionmenu_get_widget (cws_chat_bg_color_omenu), 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 5); ! label = gtk_label_new (_("Font: ")); hbox = gtk_hbox_new (FALSE, 1); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 2); gtk_widget_show (label); *************** *** 566,572 **** gtk_box_pack_start (GTK_BOX (hbox), cws_chat_font_name_entry, TRUE, TRUE, 2); gtk_widget_show (cws_chat_font_name_entry); ! button = gtk_button_new_with_label ("..."); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 2); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (cfgwin_elipse_button_clicked), cws_chat_font_name_entry); --- 567,573 ---- gtk_box_pack_start (GTK_BOX (hbox), cws_chat_font_name_entry, TRUE, TRUE, 2); gtk_widget_show (cws_chat_font_name_entry); ! button = gtk_button_new_with_label (_("...")); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 2); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (cfgwin_elipse_button_clicked), cws_chat_font_name_entry); *************** *** 588,608 **** { GtkWidget *frame, *table; ! frame = gtk_frame_new ("Kali Font Settings"); gtk_container_set_border_width (GTK_CONTAINER (frame), 5); table = gtk_table_new (3, 2, FALSE); gtk_container_add (GTK_CONTAINER (frame), table); ! cfs_kali_font_color_omenu = optionmenu_new ("Your Color", (Color)cfg.kali_font_color, Teal); gtk_table_attach (GTK_TABLE (table), optionmenu_get_widget (cfs_kali_font_color_omenu), 0, 2, 0, 1, GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 5); ! cfgwin_label_spin_button_pair ("Your Font Size:", &cfs_kali_font_size_spin_button, GTK_TABLE (table), 1, 72, cfg.kali_font_size); ! cfgwin_label_entry_pair ("Your Font: ", &cfs_kali_font_typeface_entry, GTK_TABLE (table), 2, 200, KPEAny, cfg.kali_font_typeface); gtk_widget_show (table); --- 589,609 ---- { GtkWidget *frame, *table; ! frame = gtk_frame_new (_("Kali Font Settings")); gtk_container_set_border_width (GTK_CONTAINER (frame), 5); table = gtk_table_new (3, 2, FALSE); gtk_container_add (GTK_CONTAINER (frame), table); ! cfs_kali_font_color_omenu = optionmenu_new (_("Your Color"), (Color)cfg.kali_font_color, Teal); gtk_table_attach (GTK_TABLE (table), optionmenu_get_widget (cfs_kali_font_color_omenu), 0, 2, 0, 1, GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 5); ! cfgwin_label_spin_button_pair (_("Your Font Size:"), &cfs_kali_font_size_spin_button, GTK_TABLE (table), 1, 72, cfg.kali_font_size); ! cfgwin_label_entry_pair (_("Your Font: "), &cfs_kali_font_typeface_entry, GTK_TABLE (table), 2, 200, KPEAny, cfg.kali_font_typeface); gtk_widget_show (table); *************** *** 618,648 **** vbox = gtk_vbox_new (FALSE, 5); ! frame = gtk_frame_new ("Event Colors"); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (frame), 5); table = gtk_table_new (1, 4, FALSE); gtk_container_add (GTK_CONTAINER (frame), table); ! col_action_omenu = optionmenu_new ("Action Messages", (Color)cfg.col_action, (Color)-1); gtk_table_attach (GTK_TABLE (table), optionmenu_get_widget (col_action_omenu), 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 5); ! col_server_omenu = optionmenu_new ("Server Messages", (Color)cfg.col_server, (Color)-1); gtk_table_attach (GTK_TABLE (table), optionmenu_get_widget (col_server_omenu), 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 5); ! col_entry_omenu = optionmenu_new ("Entering Messages", (Color)cfg.col_entry, (Color)-1); gtk_table_attach (GTK_TABLE (table), optionmenu_get_widget (col_entry_omenu), 0, 1, 2, 3, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 5); ! col_quit_omenu = optionmenu_new ("Quit/Leaving Messages", (Color)cfg.col_quit, (Color)-1); gtk_table_attach (GTK_TABLE (table), optionmenu_get_widget (col_quit_omenu), --- 619,649 ---- vbox = gtk_vbox_new (FALSE, 5); ! frame = gtk_frame_new (_("Event Colors")); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (frame), 5); table = gtk_table_new (1, 4, FALSE); gtk_container_add (GTK_CONTAINER (frame), table); ! col_action_omenu = optionmenu_new (_("Action Messages"), (Color)cfg.col_action, (Color)-1); gtk_table_attach (GTK_TABLE (table), optionmenu_get_widget (col_action_omenu), 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 5); ! col_server_omenu = optionmenu_new (_("Server Messages"), (Color)cfg.col_server, (Color)-1); gtk_table_attach (GTK_TABLE (table), optionmenu_get_widget (col_server_omenu), 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 5); ! col_entry_omenu = optionmenu_new (_("Entering Messages"), (Color)cfg.col_entry, (Color)-1); gtk_table_attach (GTK_TABLE (table), optionmenu_get_widget (col_entry_omenu), 0, 1, 2, 3, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 5); ! col_quit_omenu = optionmenu_new (_("Quit/Leaving Messages"), (Color)cfg.col_quit, (Color)-1); gtk_table_attach (GTK_TABLE (table), optionmenu_get_widget (col_quit_omenu), *************** *** 741,747 **** { GtkWidget *fs; ! fs = gtk_font_selection_dialog_new ("Font Selection"); gtk_font_selection_dialog_set_font_name (GTK_FONT_SELECTION_DIALOG (fs), gtk_entry_get_text (ent)); --- 742,748 ---- { GtkWidget *fs; ! fs = gtk_font_selection_dialog_new (_("Font Selection")); gtk_font_selection_dialog_set_font_name (GTK_FONT_SELECTION_DIALOG (fs), gtk_entry_get_text (ent)); diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/src/chanlist.c gtkali-0.9.5_jp/src/chanlist.c *** gtkali-0.9.5/src/chanlist.c Thu Apr 13 12:42:24 2000 --- gtkali-0.9.5_jp/src/chanlist.c Fri Jun 16 21:49:00 2000 *************** *** 30,37 **** #include "mainui.h" #include "kali.h" #include "gtkali.h" ! static gchar *titles[] = { "Channel", "Users" }; static GtkWidget *chanlist; static gint sort_up[2] = { TRUE, TRUE }; gchar *selected_channel; --- 30,38 ---- #include "mainui.h" #include "kali.h" #include "gtkali.h" + #include "intl.h" ! static gchar *titles[] = { N_("Channel"), N_("Users") }; static GtkWidget *chanlist; static gint sort_up[2] = { TRUE, TRUE }; gchar *selected_channel; *************** *** 50,55 **** --- 51,58 ---- selected_channel = g_malloc0(20); strcpy(selected_channel, "#chat"); + titles[0] = _(titles[0]); + titles[1] = _(titles[1]); chanlist = gtk_clist_new_with_titles (2, titles); gtk_clist_set_auto_sort (GTK_CLIST (chanlist), TRUE); gtk_clist_set_selection_mode (GTK_CLIST (chanlist), GTK_SELECTION_SINGLE); diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/src/defines.h gtkali-0.9.5_jp/src/defines.h *** gtkali-0.9.5/src/defines.h Mon Apr 10 08:12:13 2000 --- gtkali-0.9.5_jp/src/defines.h Fri Jun 16 10:41:48 2000 *************** *** 21,27 **** #ifndef __GK_DEFINES_H #define __GK_DEFINES_H ! #include "config.h" #define GK_CONF_DIR ".gtkali/" #define GK_LOG_DIR "logs/" --- 21,27 ---- #ifndef __GK_DEFINES_H #define __GK_DEFINES_H ! #include "../config.h" #define GK_CONF_DIR ".gtkali/" #define GK_LOG_DIR "logs/" diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/src/dialog.c gtkali-0.9.5_jp/src/dialog.c *** gtkali-0.9.5/src/dialog.c Sun Mar 26 06:15:25 2000 --- gtkali-0.9.5_jp/src/dialog.c Fri Jun 16 12:03:42 2000 *************** *** 22,27 **** --- 22,28 ---- #include "defines.h" #include "mainui.h" #include "pixmaps/about.xpm" + #include "intl.h" static void dialog_die (GtkWidget *, GtkWidget *); static gint dialog_kill (GtkWidget *, GtkWidget *); *************** *** 44,50 **** va_end (args); w = gtk_window_new (GTK_WINDOW_TOPLEVEL); ! gtk_window_set_title (GTK_WINDOW (w), "GtKali Message"); gtk_window_set_position (GTK_WINDOW (w), GTK_WIN_POS_CENTER); gtk_window_set_modal (GTK_WINDOW (w), TRUE); --- 45,51 ---- va_end (args); w = gtk_window_new (GTK_WINDOW_TOPLEVEL); ! gtk_window_set_title (GTK_WINDOW (w), _("GtKali Message")); gtk_window_set_position (GTK_WINDOW (w), GTK_WIN_POS_CENTER); gtk_window_set_modal (GTK_WINDOW (w), TRUE); *************** *** 65,71 **** gtk_box_pack_start (GTK_BOX (vbox), sep, FALSE, TRUE, 0); gtk_widget_show (sep); ! button = gtk_button_new_with_label ("Ok"); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (dialog_kill), w); --- 66,72 ---- gtk_box_pack_start (GTK_BOX (vbox), sep, FALSE, TRUE, 0); gtk_widget_show (sep); ! button = gtk_button_new_with_label (_("Ok")); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (dialog_kill), w); *************** *** 90,96 **** gchar *txt; w = gtk_window_new (GTK_WINDOW_TOPLEVEL); ! gtk_window_set_title (GTK_WINDOW (w), "About GtKali"); gtk_window_set_position (GTK_WINDOW (w), GTK_WIN_POS_CENTER); gtk_window_set_modal (GTK_WINDOW (w), TRUE); gtk_container_border_width (GTK_CONTAINER (w), 10); --- 91,97 ---- gchar *txt; w = gtk_window_new (GTK_WINDOW_TOPLEVEL); ! gtk_window_set_title (GTK_WINDOW (w), _("About GtKali")); gtk_window_set_position (GTK_WINDOW (w), GTK_WIN_POS_CENTER); gtk_window_set_modal (GTK_WINDOW (w), TRUE); gtk_container_border_width (GTK_CONTAINER (w), 10); *************** *** 108,117 **** txt = g_malloc (600); ! g_snprintf (txt, 600, "%s\n\ by Warren Chartier\n\ From Eden Li's early client\n\ ! \tVisit http://gtkali.sourceforge.net for updates.\n", PACKAGE_VERSION); text = gtk_label_new (txt); gtk_box_pack_start (GTK_BOX (vbox), text, FALSE, TRUE, 0); --- 109,118 ---- txt = g_malloc (600); ! g_snprintf (txt, 600, _("%s\n\ by Warren Chartier\n\ From Eden Li's early client\n\ ! \tVisit http://gtkali.sourceforge.net for updates.\n"), PACKAGE_VERSION); text = gtk_label_new (txt); gtk_box_pack_start (GTK_BOX (vbox), text, FALSE, TRUE, 0); *************** *** 121,127 **** gtk_box_pack_start (GTK_BOX (vbox), sep, FALSE, TRUE, 0); gtk_widget_show (sep); ! button = gtk_button_new_with_label ("Ok"); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (dialog_kill), w); --- 122,128 ---- gtk_box_pack_start (GTK_BOX (vbox), sep, FALSE, TRUE, 0); gtk_widget_show (sep); ! button = gtk_button_new_with_label (_("Ok")); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (dialog_kill), w); *************** *** 165,171 **** gtk_box_pack_start (GTK_BOX (dlg_vbox), dlg_separator, FALSE, TRUE, 0); gtk_widget_show (dlg_separator); ! dlg_ok_button = gtk_button_new_with_label ("Ok"); gtk_signal_connect (GTK_OBJECT (dlg_ok_button), "clicked", GTK_SIGNAL_FUNC (dialog_die), dlg_window); gtk_box_pack_start (GTK_BOX (dlg_vbox), dlg_ok_button, TRUE, FALSE, 0); --- 166,172 ---- gtk_box_pack_start (GTK_BOX (dlg_vbox), dlg_separator, FALSE, TRUE, 0); gtk_widget_show (dlg_separator); ! dlg_ok_button = gtk_button_new_with_label (_("Ok")); gtk_signal_connect (GTK_OBJECT (dlg_ok_button), "clicked", GTK_SIGNAL_FUNC (dialog_die), dlg_window); gtk_box_pack_start (GTK_BOX (dlg_vbox), dlg_ok_button, TRUE, FALSE, 0); diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/src/gtkali.c gtkali-0.9.5_jp/src/gtkali.c *** gtkali-0.9.5/src/gtkali.c Thu Apr 13 12:42:46 2000 --- gtkali-0.9.5_jp/src/gtkali.c Fri Jun 16 13:35:25 2000 *************** *** 23,28 **** --- 23,29 ---- #include #include #include + #include #include "gtkali.h" #include "cfgwin.h" *************** *** 43,48 **** --- 44,51 ---- #include "event.h" #include "ignore.h" #include "log.h" + #include "jlib.h" + #include "intl.h" #define PRN_HELP(x, y) gkprintf (NoColor, " /%-15s - %s\n", (x), (y)) *************** *** 124,130 **** { if (arg == NULL) { ! gkprintf (NoColor, "*** You need someone to ignore!\n"); return; } --- 127,133 ---- { if (arg == NULL) { ! gkprintf (NoColor, _("*** You need someone to ignore!\n")); return; } *************** *** 140,146 **** { if (arg == NULL) { ! gkprintf (NoColor, "*** You need someone to unignore!\n"); return; } --- 143,149 ---- { if (arg == NULL) { ! gkprintf (NoColor, _("*** You need someone to unignore!\n")); return; } *************** *** 156,205 **** { if (ignore_exist ()) { ! gkprintf (NoColor, "*** Currently ignoring:\n"); ignore_print ((IgnorePrintFunc) gkprintf); } else ! gkprintf (NoColor, "*** You're not ignoring anyone!\n"); return; } if (strncmp (com, "/help", 5) == 0) { ! gkprintf (NoColor, "*** Built in KaliNix commands:\n"); ! PRN_HELP ("close", "closes chat"); ! PRN_HELP ("open", "opens chat"); ! PRN_HELP ("connect", "connects to given server"); ! PRN_HELP ("disconnect", "disconnects from server"); ! PRN_HELP ("away", "tells everyone that you are away"); ! PRN_HELP ("join", "joins a different channel"); ! PRN_HELP ("whois", "get information for given nick"); ! PRN_HELP ("process", "get list of servers running the given game"); ! PRN_HELP ("msg", "sends a private message to someone"); ! PRN_HELP ("me", "posture a message"); ! PRN_HELP ("ping", "test connection speed"); ! PRN_HELP ("offer [description]", "offers a file"); ! PRN_HELP ("poffer [desc]", "password offer"); ! PRN_HELP ("queryoffers", "shows offers from all users"); ! PRN_HELP ("deoffer ", "deoffers given filename or all offers"); ! PRN_HELP ("get ", "gets offered file"); ! PRN_HELP ("pget ", ! "gets passworded file"); ! PRN_HELP ("games", "shows processes for all users on server"); ! PRN_HELP ("names", "list names/email addresses for all users on server"); ! PRN_HELP ("servers", "lists all servers from tracker"); ! PRN_HELP ("channels", "lists all active channels on server"); ! PRN_HELP ("users", "list all users with channel"); ! PRN_HELP ("info", "list information for given user"); ! PRN_HELP ("motd", "displays message of the day"); ! ! gkprintf (NoColor, "\n*** GtKali specific commands:\n"); ! PRN_HELP ("quit", "quits GtKali"); ! PRN_HELP ("clear", "clears screen"); ! PRN_HELP ("ignore", "ignores given user"); ! PRN_HELP ("unignore", "unignores given user"); ! PRN_HELP ("ignorelist", "prints list of ignores"); ! //PRN_HELP ("system", "execute a shell command"); return; } --- 159,208 ---- { if (ignore_exist ()) { ! gkprintf (NoColor, _("*** Currently ignoring:\n")); ignore_print ((IgnorePrintFunc) gkprintf); } else ! gkprintf (NoColor, _("*** You're not ignoring anyone!\n")); return; } if (strncmp (com, "/help", 5) == 0) { ! gkprintf (NoColor, _("*** Built in KaliNix commands:\n")); ! PRN_HELP ("close", _("closes chat")); ! PRN_HELP ("open", _("opens chat")); ! PRN_HELP ("connect", _("connects to given server")); ! PRN_HELP ("disconnect", _("disconnects from server")); ! PRN_HELP ("away", _("tells everyone that you are away")); ! PRN_HELP ("join", _("joins a different channel")); ! PRN_HELP ("whois", _("get information for given nick")); ! PRN_HELP ("process", _("get list of servers running the given game")); ! PRN_HELP ("msg", _("sends a private message to someone")); ! PRN_HELP ("me", _("posture a message")); ! PRN_HELP ("ping", _("test connection speed")); ! PRN_HELP (_("offer [description]"), _("offers a file")); ! PRN_HELP (_("poffer [desc]"), _("password offer")); ! PRN_HELP ("queryoffers", _("shows offers from all users")); ! PRN_HELP (_("deoffer "), _("deoffers given filename or all offers")); ! PRN_HELP (_("get "), _("gets offered file")); ! PRN_HELP (_("pget "), ! _("gets passworded file")); ! PRN_HELP ("games", _("shows processes for all users on server")); ! PRN_HELP ("names", _("list names/email addresses for all users on server")); ! PRN_HELP ("servers", _("lists all servers from tracker")); ! PRN_HELP ("channels", _("lists all active channels on server")); ! PRN_HELP ("users", _("list all users with channel")); ! PRN_HELP ("info", _("list information for given user")); ! PRN_HELP ("motd", _("displays message of the day")); ! ! gkprintf (NoColor, _("\n*** GtKali specific commands:\n")); ! PRN_HELP ("quit", _("quits GtKali")); ! PRN_HELP ("clear", _("clears screen")); ! PRN_HELP ("ignore", _("ignores given user")); ! PRN_HELP ("unignore", _("unignores given user")); ! PRN_HELP ("ignorelist", _("prints list of ignores")); ! //PRN_HELP ("system", _("execute a shell command")); return; } *************** *** 211,225 **** if (arg == NULL) { ! gkprintf (NoColor, "*** ERROR: '/system' requires an argument." ! " (i.e. `/system ls -l')\n"); return; } ! statusbar_push ("Command forked, hit any key to terminate."); if ((inp = popen (arg, "r")) == NULL) { ! gkprintf (NoColor, "*** Couldn't fork command %s.\n", arg); return; } --- 214,228 ---- if (arg == NULL) { ! gkprintf (NoColor, _("*** ERROR: '/system' requires an argument." ! " (i.e. `/system ls -l')\n")); return; } ! statusbar_push (_("Command forked, hit any key to terminate.")); if ((inp = popen (arg, "r")) == NULL) { ! gkprintf (NoColor, _("*** Couldn't fork command %s.\n"), arg); return; } *************** *** 264,269 **** --- 267,274 ---- if (kali_capture_check (type, s)) return 0; + s = toStringEUC(s); + switch (type) { *************** *** 296,302 **** break; case KN_INTERNAL_MSG: ! if (strstr(s, "pinged you") && cfg.show_pings == FALSE) break; if (KN_ExpectedResponse == KN_RESPONSE_CHANNELS) --- 301,307 ---- break; case KN_INTERNAL_MSG: ! if (strstr(s, _("pinged you")) && cfg.show_pings == FALSE) break; if (KN_ExpectedResponse == KN_RESPONSE_CHANNELS) *************** *** 506,524 **** pid_t pid; if ((pid = fork ()) == -1) ! perror ("Couldn't fork"); if (pid != 0) exit (0); #endif signal (SIGTERM, (void (*)(gint))mainui_destroy); signal (SIGINT, (void (*)(gint))mainui_destroy); if (cfg_read ()) { gtk_init (&argc, &argv); dialog_normal_do ( ! "Welcome to GtKali! In order to use GtKali, you're going to\n" "have to set it up properly, the following window will help\n" "you do this. The serial number information is required and\n" "must be obtained from Kali itself. See their website at\n" --- 511,534 ---- pid_t pid; if ((pid = fork ()) == -1) ! perror (_("Couldn't fork")); if (pid != 0) exit (0); #endif + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); + signal (SIGTERM, (void (*)(gint))mainui_destroy); signal (SIGINT, (void (*)(gint))mainui_destroy); if (cfg_read ()) { + gtk_set_locale(); gtk_init (&argc, &argv); dialog_normal_do ( ! _("Welcome to GtKali! In order to use GtKali, you're going to\n" "have to set it up properly, the following window will help\n" "you do this. The serial number information is required and\n" "must be obtained from Kali itself. See their website at\n" *************** *** 526,537 **** "Note about the server information, it is not necessary, just\n" "leave it blank if you do not know of a server you want to put\n" "into it for now. The next time you start GtKali, it will present\n" ! "you with a list of servers which you can choose from. Enjoy!"); cfgwin_create_then_die (); return 1; } gtk_init (&argc, &argv); mainui_init (); alias_init (); --- 536,548 ---- "Note about the server information, it is not necessary, just\n" "leave it blank if you do not know of a server you want to put\n" "into it for now. The next time you start GtKali, it will present\n" ! "you with a list of servers which you can choose from. Enjoy!")); cfgwin_create_then_die (); return 1; } + gtk_set_locale(); gtk_init (&argc, &argv); mainui_init (); alias_init (); *************** *** 542,553 **** if (kali_init (read_callback, (personalinfo_t *)pinfo)) { ! dialog_error_do ("Couldn't initialize KaliNix! Aborting!\n"); return 1; } #ifdef DEBUG ! g_warning ("gtkali.c: cfg.server_addr=%s (%p)", cfg.serveraddr, cfg.serveraddr); #endif --- 553,564 ---- if (kali_init (read_callback, (personalinfo_t *)pinfo)) { ! dialog_error_do (_("Couldn't initialize KaliNix! Aborting!\n")); return 1; } #ifdef DEBUG ! g_warning (_("gtkali.c: cfg.server_addr=%s (%p)"), cfg.serveraddr, cfg.serveraddr); #endif diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/src/ignore.c gtkali-0.9.5_jp/src/ignore.c *** gtkali-0.9.5/src/ignore.c Thu Apr 13 12:25:12 2000 --- gtkali-0.9.5_jp/src/ignore.c Fri Jun 16 13:37:45 2000 *************** *** 23,28 **** --- 23,29 ---- #include "cfg.h" #include "mainui.h" #include "color.h" + #include "intl.h" #include #include *************** *** 43,49 **** ignore_add (gchar *nick) { ignorelist = g_list_append (ignorelist, g_strdup (nick)); ! gkprintf (NoColor, "*** Now Ignoring Messages from %s...\n", nick); } void --- 44,50 ---- ignore_add (gchar *nick) { ignorelist = g_list_append (ignorelist, g_strdup (nick)); ! gkprintf (NoColor, _("*** Now Ignoring Messages from %s...\n"), nick); } void *************** *** 58,64 **** if (found->data) g_free (found->data); ignorelist = g_list_remove_link (ignorelist, found); ! gkprintf (NoColor, "*** Now Accepting Messages from %s...\n", nick); } } --- 59,65 ---- if (found->data) g_free (found->data); ignorelist = g_list_remove_link (ignorelist, found); ! gkprintf (NoColor, _("*** Now Accepting Messages from %s...\n"), nick); } } diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/src/intl.h gtkali-0.9.5_jp/src/intl.h *** gtkali-0.9.5/src/intl.h Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/src/intl.h Fri Jun 16 10:50:24 2000 *************** *** 0 **** --- 1,27 ---- + #ifndef __INTL_H__ + #define __INTL_H__ + + #include "../config.h" + + #ifdef ENABLE_NLS + # include + # define _(String) dgettext(PACKAGE,String) + # ifdef gettext_noop + # define N_(String) gettext_noop(String) + # else + # define N_(String) (String) + # endif /* gettext_noop */ + #else + # define _(String) (String) + # define N_(String) (String) + # define textdomain(String) (String) + # define gettext(String) (String) + # define dgettext(Domain,String) (String) + # define dcgettext(Domain,String,Type) (String) + # define bindtextdomain(Domain,Directory) (Domain) + #endif /* ENABLE_NLS */ + + GList *intl_get_language_list(void); + int intl_score_locale(const gchar * locale); + + #endif /* __INTL_H__ */ diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/src/jlib.h gtkali-0.9.5_jp/src/jlib.h *** gtkali-0.9.5/src/jlib.h Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/src/jlib.h Fri Jun 16 10:41:48 2000 *************** *** 0 **** --- 1,28 ---- + /* + * jlib.h -- jlib.c ÍѤΥإåÀ¥Õ¥¡¥¤¥ë by. ÁÒ¸÷ ·¯Ïº + * + * jlib.c ¤òÍøÍѤ¹¤ë¾ì¹ç¤Ï¡¢include ¤·¤Æ¤¯¤À¤µ¤¤¡£ + * + */ + + #define ASCII 0 + #define JIS 1 + #define EUC 2 + #define SJIS 3 + #define AUTO -1 + + extern int detectKanjiCode(char *str); + extern char *toStringJIS(char *str); + extern char *toStringEUC(char *str); + extern char *toStringSJIS(char *str); + extern char *toStringAuto(char *str); + + extern int jconv_printf(int code, char *fmt, ...); + extern int jconv_fprintf(int code, FILE *fp, char *fmt, ...); + extern int jconv_sprintf(int code, char *buf, char *fmt, ...); + extern int jconv_snprintf(int code, char *buf, int len, char *fmt, ...); + + extern int jconv_scanf(int code, char *fmt, ...); + extern int jconv_fscanf(int code, FILE *fp, char *fmt, ...); + extern int jconv_sscanf(int code, char *buf, char *fmt, ...); + diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/src/kali_server.c gtkali-0.9.5_jp/src/kali_server.c *** gtkali-0.9.5/src/kali_server.c Fri Apr 7 14:09:44 2000 --- gtkali-0.9.5_jp/src/kali_server.c Fri Jun 16 21:57:55 2000 *************** *** 32,39 **** #include "kevents.h" #include "kali.h" #include "util.h" ! static gchar *titles[] = { "#", "Server Name", "IP" }; static GtkWidget *window, *slist, *sentry; static gint current_row = -1; static gint sort_up[3] = { TRUE, TRUE, TRUE }; --- 32,40 ---- #include "kevents.h" #include "kali.h" #include "util.h" + #include "intl.h" ! static gchar *titles[] = { N_("#"), N_("Server Name"), N_("IP") }; static GtkWidget *window, *slist, *sentry; static gint current_row = -1; static gint sort_up[3] = { TRUE, TRUE, TRUE }; *************** *** 59,65 **** gboolean inserted; window = gtkutil_window_new (TRUE); ! gtk_window_set_title (GTK_WINDOW (window), "Kali Servers"); gtk_widget_set_usize (window, 500, 300); gtk_signal_connect (GTK_OBJECT (window), "destroy", --- 60,66 ---- gboolean inserted; window = gtkutil_window_new (TRUE); ! gtk_window_set_title (GTK_WINDOW (window), _("Kali Servers")); gtk_widget_set_usize (window, 500, 300); gtk_signal_connect (GTK_OBJECT (window), "destroy", *************** *** 72,77 **** --- 73,81 ---- vbox = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (window), vbox); + titles[0] = _(titles[0]); + titles[1] = _(titles[1]); + titles[2] = _(titles[2]); slist = gtk_clist_new_with_titles (3, titles); gtk_clist_column_titles_active (GTK_CLIST (slist)); gtk_clist_set_selection_mode (GTK_CLIST (slist), GTK_SELECTION_BROWSE); *************** *** 102,108 **** hbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 4); ! lbl = gtk_label_new ("Search: "); gtk_misc_set_alignment (GTK_MISC (lbl), 0, 0.5); gtk_box_pack_start (GTK_BOX (hbox), lbl, FALSE, FALSE, 4); gtk_widget_show (lbl); --- 106,112 ---- hbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 4); ! lbl = gtk_label_new (_("Search: ")); gtk_misc_set_alignment (GTK_MISC (lbl), 0, 0.5); gtk_box_pack_start (GTK_BOX (hbox), lbl, FALSE, FALSE, 4); gtk_widget_show (lbl); *************** *** 124,134 **** hbox = gtk_hbox_new (TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); ! make_button (hbox, "Connect", GTK_SIGNAL_FUNC (connect_func), NULL); ! make_button (hbox, "Set as Default Server", GTK_SIGNAL_FUNC (set_default_server), NULL); ! make_button (hbox, "Refresh", GTK_SIGNAL_FUNC (refresh_func), NULL); ! make_button (hbox, "Cancel", GTK_SIGNAL_FUNC (cancel_func), NULL); gtk_widget_show (hbox); gtk_widget_show (vbox); --- 128,138 ---- hbox = gtk_hbox_new (TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); ! make_button (hbox, _("Connect"), GTK_SIGNAL_FUNC (connect_func), NULL); ! make_button (hbox, _("Set as Default Server"), GTK_SIGNAL_FUNC (set_default_server), NULL); ! make_button (hbox, _("Refresh"), GTK_SIGNAL_FUNC (refresh_func), NULL); ! make_button (hbox, _("Cancel"), GTK_SIGNAL_FUNC (cancel_func), NULL); gtk_widget_show (hbox); gtk_widget_show (vbox); *************** *** 290,296 **** { gchar *start, *end, *dptr, *ins[3], *data; ! statusbar_push ("Capturing servers... Please wait."); mainui_sleep (1); data = kali_capture_command (KN_TRACKER_MSG, "/servers"); --- 294,300 ---- { gchar *start, *end, *dptr, *ins[3], *data; ! statusbar_push (_("Capturing servers... Please wait.")); mainui_sleep (1); data = kali_capture_command (KN_TRACKER_MSG, "/servers"); diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/src/mainui.c gtkali-0.9.5_jp/src/mainui.c *** gtkali-0.9.5/src/mainui.c Thu Apr 6 15:19:05 2000 --- gtkali-0.9.5_jp/src/mainui.c Fri Jun 16 14:38:02 2000 *************** *** 44,49 **** --- 44,51 ---- #include "kali.h" #include "log.h" #include "alias.h" + #include "jlib.h" + #include "intl.h" gint waitkey = 0; gint key = 0; *************** *** 175,181 **** void mainui_destroy (gchar *quit_msg) { ! statusbar_push ("Quitting..."); if (cfg.win_remember_geom) { gint x, y, width, height; --- 177,183 ---- void mainui_destroy (gchar *quit_msg) { ! statusbar_push (_("Quitting...")); if (cfg.win_remember_geom) { gint x, y, width, height; *************** *** 192,205 **** } #ifdef DEBUG ! g_warning ("gdk: w=%i, h=%i, x=%i, y=%i", width, height, x, y); #endif /* write the geom so sticky'll function correctly even if * save_on_exit is FALSE */ cfg_write_window_geometry (); } #ifdef DEBUG ! g_warning ("quit message: %s", quit_msg); #endif kali_quit (quit_msg); mainui_sleep (1); --- 194,208 ---- } #ifdef DEBUG ! q ! g_warning (_("gdk: w=%i, h=%i, x=%i, y=%i"), width, height, x, y); #endif /* write the geom so sticky'll function correctly even if * save_on_exit is FALSE */ cfg_write_window_geometry (); } #ifdef DEBUG ! g_warning (_("quit message: %s"), quit_msg); #endif kali_quit (quit_msg); mainui_sleep (1); *************** *** 208,221 **** if (cfg.save_on_exit) { #ifdef DEBUG ! g_warning ("saving cfg"); #endif cfg_save (); alias_write (); } #ifdef DEBUG else ! g_warning ("not saving cfg"); #endif log_stop (); --- 211,224 ---- if (cfg.save_on_exit) { #ifdef DEBUG ! g_warning (_("saving cfg")); #endif cfg_save (); alias_write (); } #ifdef DEBUG else ! g_warning (_("not saving cfg")); #endif log_stop (); *************** *** 257,262 **** --- 260,267 ---- if (strcmp (buf, "") == 0) return TRUE; + strcpy (buf, toStringSJIS(buf)); + if (*buf == '/') { arg = strchr (buf, ' '); diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/src/menu.c gtkali-0.9.5_jp/src/menu.c *** gtkali-0.9.5/src/menu.c Sat Jul 3 13:41:31 1999 --- gtkali-0.9.5_jp/src/menu.c Fri Jun 16 21:27:21 2000 *************** *** 28,63 **** #include "dialog.h" #include "color.h" #include "cfg.h" static void menu_toggle_save_cfg (); static GtkItemFactory *factory; static GtkItemFactoryEntry menu_items[] = { ! {"/_File", NULL, NULL, 0, ""}, ! {"/File/tearoff", NULL, NULL, 0, ""}, ! {"/File/Quit", "Q", mainui_destroy, 0, NULL}, ! ! {"/_Edit", NULL, NULL, 0, ""}, ! {"/Edit/tearoff",NULL, NULL, 0, ""}, ! {"/Edit/Copy", "C", txtent_copy, 0, NULL }, ! {"/Edit/Paste", "V", txtent_paste, 0, NULL }, ! ! {"/_View", NULL, NULL, 0, ""}, ! {"/View/tearoff", NULL, NULL, 0, ""}, ! {"/View/Servers..", NULL, kali_server_dialog_create,0, NULL}, ! {"/View/URL Grabber..", NULL, urlgrabber_dialog_create, 0, NULL}, ! ! ! {"/_Config", NULL, NULL, 0, "" }, ! {"/Config/tearoff", NULL, NULL, 0, ""}, ! {"/Config/Config..", NULL, cfgwin_create, 0, NULL}, ! {"/Config/Aliases..", NULL, aliasdialog_create, 0, NULL }, ! {"/Config/sep", NULL, NULL, 0, ""}, ! {"/Config/Save on Exit", NULL, menu_toggle_save_cfg, 0, ""}, ! {"/Config/Save Now", NULL, cfg_save, 0, NULL}, ! {"/_Help", NULL, NULL, 0, "" }, ! {"/Help/About..", NULL, dialog_about_do, 0, NULL }, }; GtkWidget * --- 28,65 ---- #include "dialog.h" #include "color.h" #include "cfg.h" + #include "intl.h" + gchar *menu_translate(const gchar *path, gpointer data); static void menu_toggle_save_cfg (); static GtkItemFactory *factory; static GtkItemFactoryEntry menu_items[] = { ! {N_("/_File"), NULL, NULL, 0, ""}, ! {N_("/File/tearoff"), NULL, NULL, 0, ""}, ! {N_("/File/Quit"), "Q", mainui_destroy, 0, NULL}, ! ! {N_("/_Edit"), NULL, NULL, 0, ""}, ! {N_("/Edit/tearoff"),NULL, NULL, 0, ""}, ! {N_("/Edit/Copy"), "C", txtent_copy, 0, NULL }, ! {N_("/Edit/Paste"), "V", txtent_paste, 0, NULL }, ! ! {N_("/_View"), NULL, NULL, 0, ""}, ! {N_("/View/tearoff"), NULL, NULL, 0, ""}, ! {N_("/View/Servers.."), NULL, kali_server_dialog_create,0, NULL}, ! {N_("/View/URL Grabber.."), NULL, urlgrabber_dialog_create, 0, NULL}, ! ! ! {N_("/_Config"), NULL, NULL, 0, "" }, ! {N_("/Config/tearoff"), NULL, NULL, 0, ""}, ! {N_("/Config/Config.."), NULL, cfgwin_create, 0, NULL}, ! {N_("/Config/Aliases.."), NULL, aliasdialog_create, 0, NULL }, ! {N_("/Config/sep"), NULL, NULL, 0, ""}, ! {N_("/Config/Save on Exit"), NULL, menu_toggle_save_cfg, 0, ""}, ! {N_("/Config/Save Now"), NULL, cfg_save, 0, NULL}, ! {N_("/_Help"), NULL, NULL, 0, "" }, ! {N_("/Help/About.."), NULL, dialog_about_do, 0, NULL }, }; GtkWidget * *************** *** 71,77 **** agroup = gtk_accel_group_new (); factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "
", agroup); ! gtk_item_factory_create_items (factory, num_items, menu_items, NULL); w = gtk_item_factory_get_widget (factory, "
/Config/Save on Exit"); #ifdef DEBUG --- 73,81 ---- agroup = gtk_accel_group_new (); factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "
", agroup); ! gtk_item_factory_set_translate_func(factory, menu_translate, "
! ", NULL); ! gtk_item_factory_create_items (factory, num_items, menu_items, NULL); w = gtk_item_factory_get_widget (factory, "
/Config/Save on Exit"); #ifdef DEBUG *************** *** 127,129 **** --- 131,143 ---- * on the next session */ cfg_write_save_on_exit (); } + + gchar *menu_translate(const gchar *path, gpointer data) + { + gchar *retval; + + retval = gettext(path); + + return retval; + } + diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/src/mwindow.c gtkali-0.9.5_jp/src/mwindow.c *** gtkali-0.9.5/src/mwindow.c Sat Apr 8 05:41:28 2000 --- gtkali-0.9.5_jp/src/mwindow.c Fri Jun 16 10:44:21 2000 *************** *** 29,34 **** --- 29,35 ---- #include "mainui.h" #include "kali.h" #include "log.h" + #include "jlib.h" static GList *windows; *************** *** 166,171 **** --- 167,174 ---- strncpy (mbuf, txtent_get_text (mw->te), MAX_ENTRY_LENGTH); g_snprintf (buf, MAX_ENTRY_LENGTH, "/msg %s %s", mw->nick, mbuf); + + strcpy (buf, toStringSJIS(buf)); kali_input (buf); } diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/src/stamp-h gtkali-0.9.5_jp/src/stamp-h *** gtkali-0.9.5/src/stamp-h Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/src/stamp-h Fri Jun 16 10:41:48 2000 *************** *** 0 **** --- 1 ---- + timestamp diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/src/toolbar.c gtkali-0.9.5_jp/src/toolbar.c *** gtkali-0.9.5/src/toolbar.c Sat Jul 3 13:41:31 1999 --- gtkali-0.9.5_jp/src/toolbar.c Fri Jun 16 14:44:27 2000 *************** *** 24,29 **** --- 24,30 ---- #include "kali_server.h" #include "mainui.h" #include "kevents.h" + #include "intl.h" #include "pixmaps/quit.xpm" #include "pixmaps/copy.xpm" *************** *** 47,72 **** gtk_toolbar_set_button_relief (GTK_TOOLBAR (toolbar), GTK_RELIEF_NONE); gtk_toolbar_set_space_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_SPACE_LINE); ! toolbar_append (window->window, "Servers", servers_xpm, GTK_SIGNAL_FUNC (kali_server_dialog_create), NULL); ! toolbar_append (window->window, "Default", servers_xpm, GTK_SIGNAL_FUNC (toolbar_connect_default), NULL); ! toolbar_append (window->window, "URLs", (gchar **)url_grabber_xpm, GTK_SIGNAL_FUNC (urlgrabber_dialog_create), NULL); gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); ! toolbar_append (window->window, "Copy", (gchar **)copy_xpm, GTK_SIGNAL_FUNC (txtent_copy), NULL); ! toolbar_append (window->window, "Paste", (gchar **)paste_xpm, GTK_SIGNAL_FUNC (txtent_paste), NULL); gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); ! toolbar_append (window->window, "Quit", (gchar **)quit_xpm, GTK_SIGNAL_FUNC (toolbar_mainui_destroy), NULL); gtk_widget_show (toolbar); --- 48,73 ---- gtk_toolbar_set_button_relief (GTK_TOOLBAR (toolbar), GTK_RELIEF_NONE); gtk_toolbar_set_space_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_SPACE_LINE); ! toolbar_append (window->window, _("Servers"), servers_xpm, GTK_SIGNAL_FUNC (kali_server_dialog_create), NULL); ! toolbar_append (window->window, _("Default"), servers_xpm, GTK_SIGNAL_FUNC (toolbar_connect_default), NULL); ! toolbar_append (window->window, _("URLs"), (gchar **)url_grabber_xpm, GTK_SIGNAL_FUNC (urlgrabber_dialog_create), NULL); gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); ! toolbar_append (window->window, _("Copy"), (gchar **)copy_xpm, GTK_SIGNAL_FUNC (txtent_copy), NULL); ! toolbar_append (window->window, _("Paste"), (gchar **)paste_xpm, GTK_SIGNAL_FUNC (txtent_paste), NULL); gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); ! toolbar_append (window->window, _("Quit"), (gchar **)quit_xpm, GTK_SIGNAL_FUNC (toolbar_mainui_destroy), NULL); gtk_widget_show (toolbar); diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/src/txtent.c gtkali-0.9.5_jp/src/txtent.c *** gtkali-0.9.5/src/txtent.c Mon Apr 10 08:57:02 2000 --- gtkali-0.9.5_jp/src/txtent.c Fri Jun 16 14:47:25 2000 *************** *** 26,31 **** --- 26,32 ---- #include "txtent.h" #include "util.h" #include "userlist.h" + #include "intl.h" #define is_delimiter(y) ((y)==' '||(y)==')'||(y)=='('||(y)=='<'||(y)=='>'||\ (y)=='\n'||(y)=='\0'||(y)=='"'||(y)=='|') *************** *** 89,94 **** --- 90,96 ---- { GtkWidget *scrollbar, *eventbox, *table; TxtEnt *te; + GdkFont *font = NULL; te = g_new0 (TxtEnt, 1); g_return_val_if_fail (te != NULL, NULL); *************** *** 139,144 **** --- 141,151 ---- te->table = table; + /* ¤³¤ì¤¬¤Ê¤¤¤È¥Þ¥ë¥Á¥Ð¥¤¥Èʸ»ú¤¬ÀÞ¤êÊÖ¤µ¤ì¤Ê¤¤ ¤Ê¤¸¤§¡©(TT */ + font = gdk_fontset_load (cfg.chat_font_name); + gtk_text_insert (GTK_TEXT (te->txt), font, + NULL, NULL, _("*** Opened a new chat window\n"), -1); + return te; } *************** *** 168,175 **** for (; !is_delimiter (*s); s++) ; url_end = s - str - 1; #ifdef DEBUG ! g_warning ("URL in str `%s'", str); ! g_warning ("url_start = %i, url_end = %i", url_start, url_end); #endif if (url_end <= url_start) url_end = url_start = 0; --- 175,182 ---- for (; !is_delimiter (*s); s++) ; url_end = s - str - 1; #ifdef DEBUG ! g_warning (_("URL in str `%s'"), str); ! g_warning (_("url_start = %i, url_end = %i"), url_start, url_end); #endif if (url_end <= url_start) url_end = url_start = 0; *************** *** 181,189 **** color : cfg.chat_fg_color); // bg_color = &color_convert_to_gdk_color (cfg.chat_bg_color); ! font = gdk_font_load (cfg.chat_font_name); if (font == NULL) ! g_warning ("Couldn't load `%s', using default.", cfg.chat_font_name); gtk_text_freeze (GTK_TEXT (te->txt)); --- 188,196 ---- color : cfg.chat_fg_color); // bg_color = &color_convert_to_gdk_color (cfg.chat_bg_color); ! font = gdk_fontset_load (cfg.chat_font_name); if (font == NULL) ! g_warning (_("Couldn't load `%s', using default."), cfg.chat_font_name); gtk_text_freeze (GTK_TEXT (te->txt)); *************** *** 219,227 **** } else { ! url_font = gdk_font_load (cfg.url_font); if (url_font == NULL) ! g_warning ("Couldn't load URL font `%s', using default.", cfg.url_font); gtk_text_insert (GTK_TEXT (te->txt), font, fg_color, NULL, str, url_start); --- 226,234 ---- } else { ! url_font = gdk_fontset_load (cfg.url_font); if (url_font == NULL) ! g_warning (_("Couldn't load URL font `%s', using default."), cfg.url_font); gtk_text_insert (GTK_TEXT (te->txt), font, fg_color, NULL, str, url_start); diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/src/urlgrabber.c gtkali-0.9.5_jp/src/urlgrabber.c *** gtkali-0.9.5/src/urlgrabber.c Fri Mar 31 08:00:41 2000 --- gtkali-0.9.5_jp/src/urlgrabber.c Fri Jun 16 14:49:54 2000 *************** *** 26,31 **** --- 26,32 ---- #include "gtkutil.h" #include "util.h" #include "cfg.h" + #include "intl.h" static GSList *urls; static GtkWidget *window; *************** *** 46,52 **** GtkWidget *scrolled_win, *hbox, *vbox, *button; window = gtkutil_window_new (FALSE); ! gtk_window_set_title (GTK_WINDOW (window), "Grabbed URLs"); gtk_container_set_border_width (GTK_CONTAINER (window), 10); gtk_signal_connect (GTK_OBJECT (window), "destroy", --- 47,53 ---- GtkWidget *scrolled_win, *hbox, *vbox, *button; window = gtkutil_window_new (FALSE); ! gtk_window_set_title (GTK_WINDOW (window), _("Grabbed URLs")); gtk_container_set_border_width (GTK_CONTAINER (window), 10); gtk_signal_connect (GTK_OBJECT (window), "destroy", *************** *** 95,101 **** hbox = gtk_hbox_new (TRUE, 2); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 4); ! button = gtk_button_new_with_label ("Open"); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", --- 96,102 ---- hbox = gtk_hbox_new (TRUE, 2); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 4); ! button = gtk_button_new_with_label (_("Open")); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", *************** *** 103,109 **** gtk_widget_show (button); ! button = gtk_button_new_with_label ("Clear"); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", --- 104,110 ---- gtk_widget_show (button); ! button = gtk_button_new_with_label (_("Clear")); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", *************** *** 111,117 **** gtk_widget_show (button); ! button = gtk_button_new_with_label ("Close"); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); gtk_signal_connect_object (GTK_OBJECT (button), "clicked", --- 112,118 ---- gtk_widget_show (button); ! button = gtk_button_new_with_label (_("Close")); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); gtk_signal_connect_object (GTK_OBJECT (button), "clicked", diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/src/userlist.c gtkali-0.9.5_jp/src/userlist.c *** gtkali-0.9.5/src/userlist.c Thu Apr 13 12:42:09 2000 --- gtkali-0.9.5_jp/src/userlist.c Fri Jun 16 21:54:05 2000 *************** *** 30,37 **** #include "mwindow.h" #include "kali.h" #include "ignore.h" ! static gchar *titles[] = { "Nick" }; static GtkWidget *userlist; static GSList *list; static gint sort_up = TRUE; --- 30,38 ---- #include "mwindow.h" #include "kali.h" #include "ignore.h" + #include "intl.h" ! static gchar *titles[] = { N_("Nick") }; static GtkWidget *userlist; static GSList *list; static gint sort_up = TRUE; *************** *** 58,63 **** --- 59,65 ---- guint n; nick_selected = g_malloc0(20); + titles[0] = _(titles[0]); userlist = gtk_clist_new_with_titles (1, titles); gtk_clist_set_auto_sort (GTK_CLIST (userlist), TRUE); *************** *** 93,127 **** its signals */ popup_menu = gtk_menu_new (); ! sprintf (buf, "Whois"); popup_menu_items = gtk_menu_item_new_with_label (buf); gtk_menu_append (GTK_MENU (popup_menu), popup_menu_items); gtk_signal_connect_object (GTK_OBJECT (popup_menu_items), "activate", GTK_SIGNAL_FUNC (popup_menu_handler), (gpointer) g_strdup (buf)); gtk_widget_show (popup_menu_items); ! sprintf (buf, "Info"); popup_menu_items = gtk_menu_item_new_with_label (buf); gtk_menu_append (GTK_MENU (popup_menu), popup_menu_items); gtk_signal_connect_object (GTK_OBJECT (popup_menu_items), "activate", GTK_SIGNAL_FUNC (popup_menu_handler), (gpointer) g_strdup (buf)); gtk_widget_show (popup_menu_items); ! sprintf (buf, "Ping"); popup_menu_items = gtk_menu_item_new_with_label (buf); gtk_menu_append (GTK_MENU (popup_menu), popup_menu_items); gtk_signal_connect_object (GTK_OBJECT (popup_menu_items), "activate", GTK_SIGNAL_FUNC (popup_menu_handler), (gpointer) g_strdup (buf)); gtk_widget_show (popup_menu_items); ! sprintf (buf, "Ignore/Unignore"); popup_menu_items = gtk_menu_item_new_with_label (buf); gtk_menu_append (GTK_MENU (popup_menu), popup_menu_items); gtk_signal_connect_object (GTK_OBJECT (popup_menu_items), "activate", GTK_SIGNAL_FUNC (popup_menu_handler), (gpointer) g_strdup (buf)); gtk_widget_show (popup_menu_items); ! sprintf (buf, "Private Message"); popup_menu_items = gtk_menu_item_new_with_label (buf); gtk_menu_append (GTK_MENU (popup_menu), popup_menu_items); gtk_signal_connect_object (GTK_OBJECT (popup_menu_items), "activate", --- 95,129 ---- its signals */ popup_menu = gtk_menu_new (); ! sprintf (buf, _("Whois")); popup_menu_items = gtk_menu_item_new_with_label (buf); gtk_menu_append (GTK_MENU (popup_menu), popup_menu_items); gtk_signal_connect_object (GTK_OBJECT (popup_menu_items), "activate", GTK_SIGNAL_FUNC (popup_menu_handler), (gpointer) g_strdup (buf)); gtk_widget_show (popup_menu_items); ! sprintf (buf, _("Info")); popup_menu_items = gtk_menu_item_new_with_label (buf); gtk_menu_append (GTK_MENU (popup_menu), popup_menu_items); gtk_signal_connect_object (GTK_OBJECT (popup_menu_items), "activate", GTK_SIGNAL_FUNC (popup_menu_handler), (gpointer) g_strdup (buf)); gtk_widget_show (popup_menu_items); ! sprintf (buf, _("Ping")); popup_menu_items = gtk_menu_item_new_with_label (buf); gtk_menu_append (GTK_MENU (popup_menu), popup_menu_items); gtk_signal_connect_object (GTK_OBJECT (popup_menu_items), "activate", GTK_SIGNAL_FUNC (popup_menu_handler), (gpointer) g_strdup (buf)); gtk_widget_show (popup_menu_items); ! sprintf (buf, _("Ignore/Unignore")); popup_menu_items = gtk_menu_item_new_with_label (buf); gtk_menu_append (GTK_MENU (popup_menu), popup_menu_items); gtk_signal_connect_object (GTK_OBJECT (popup_menu_items), "activate", GTK_SIGNAL_FUNC (popup_menu_handler), (gpointer) g_strdup (buf)); gtk_widget_show (popup_menu_items); ! sprintf (buf, _("Private Message")); popup_menu_items = gtk_menu_item_new_with_label (buf); gtk_menu_append (GTK_MENU (popup_menu), popup_menu_items); gtk_signal_connect_object (GTK_OBJECT (popup_menu_items), "activate", diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/stamp-h gtkali-0.9.5_jp/stamp-h *** gtkali-0.9.5/stamp-h Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/stamp-h Fri Jun 16 22:03:51 2000 *************** *** 0 **** --- 1 ---- + timestamp diff -C 3 -r --unidirectional-new-file gtkali-0.9.5/stamp-h.in gtkali-0.9.5_jp/stamp-h.in *** gtkali-0.9.5/stamp-h.in Thu Jan 1 09:00:00 1970 --- gtkali-0.9.5_jp/stamp-h.in Fri Jun 16 22:09:55 2000 *************** *** 0 **** --- 1 ---- + timestamp