diff options
| author | Greg Hudson <ghudson@mit.edu> | 2011-06-10 18:17:22 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2011-06-10 18:17:22 +0000 |
| commit | cb8b1138d6e349a77507f3c561fc7ee2dde5cd7c (patch) | |
| tree | ad5246d1ab834f44aa9a5de30b255d9f044c9663 /src/config | |
| parent | fd2f45cf93bfbf10863011fb1a61fc08041c2f51 (diff) | |
| download | krb5-cb8b1138d6e349a77507f3c561fc7ee2dde5cd7c.tar.gz krb5-cb8b1138d6e349a77507f3c561fc7ee2dde5cd7c.tar.xz krb5-cb8b1138d6e349a77507f3c561fc7ee2dde5cd7c.zip | |
Add localization support to com_err
* Add compile_et arguments --textdomain and --localedir.
* Store text domain and localedir at the end of error tables.
* error_message() calls dgettext if the table has a text domain.
* add_error_table() calls bindtextdomain if the table has a localedir.
* Define N_() as no-op in generated source and mark up error messages.
* When using system compile_et, test for --textdomain support.
* Use --textdomain option when available.
* Run xgettext over generated sources in compile_et rule.
* Translate com_err results in krb5int_get_error() if com_err won't.
ticket: 6918
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24960 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/post.in | 2 | ||||
| -rw-r--r-- | src/config/pre.in | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/config/post.in b/src/config/post.in index 43c218bdff..c59360059c 100644 --- a/src/config/post.in +++ b/src/config/post.in @@ -42,7 +42,7 @@ $(BUILDTOP)/.depend-verify-et: depend-verify-et-$(COM_ERR_VERSION) depend-verify-et-k5: @if test -r $(BUILDTOP)/.depend-verify-et; then :; \ else (set -x; touch $(BUILDTOP)/.depend-verify-et); fi -depend-verify-et-sys: +depend-verify-et-sys depend-verify-et-intlsys: @echo 1>&2 error: cannot build dependencies using system et package @exit 1 $(BUILDTOP)/.depend-verify-ss: depend-verify-ss-$(SS_VERSION) diff --git a/src/config/pre.in b/src/config/pre.in index 69548babfe..a81d150dd4 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -330,6 +330,7 @@ KRB5_DEPLIB = $(TOPLIBD)/libkrb5$(DEPLIBEXT) CRYPTO_DEPLIB = $(TOPLIBD)/libk5crypto$(DEPLIBEXT) COM_ERR_DEPLIB = $(COM_ERR_DEPLIB-@COM_ERR_VERSION@) COM_ERR_DEPLIB-sys = # empty +COM_ERR_DEPLIB-intlsys = # empty COM_ERR_DEPLIB-k5 = $(TOPLIBD)/libcom_err$(DEPLIBEXT) SUPPORT_LIBNAME=krb5support SUPPORT_DEPLIB = $(TOPLIBD)/lib$(SUPPORT_LIBNAME)$(DEPLIBEXT) @@ -356,6 +357,7 @@ KADMCLNT_DEPLIBS = $(KADMCLNT_DEPLIB) $(KADM_COMM_DEPLIBS) COM_ERR_VERSION = @COM_ERR_VERSION@ COM_ERR_DEPS = $(COM_ERR_DEPS-@COM_ERR_VERSION@) COM_ERR_DEPS-sys = +COM_ERR_DEPS-intlsys = COM_ERR_DEPS-k5 = $(BUILDTOP)/include/com_err.h SS_VERSION = @SS_VERSION@ SS_DEPS = $(SS_DEPS-@SS_VERSION@) @@ -421,7 +423,9 @@ PRNG_ALG = @PRNG_ALG@ ### /* these are invoked as $(...) foo.et, which works, but could be better */ COMPILE_ET= $(COMPILE_ET-@COM_ERR_VERSION@) COMPILE_ET-sys= compile_et -COMPILE_ET-k5= $(BUILDTOP)/util/et/compile_et -d $(top_srcdir)/util/et +COMPILE_ET-intlsys= compile_et --textdomain mit-krb5 +COMPILE_ET-k5= $(BUILDTOP)/util/et/compile_et -d $(top_srcdir)/util/et \ + --textdomain mit-krb5 .SUFFIXES: .h .c .et .ct |