diff --git a/Makefile.in b/Makefile.in index 9236659..bafb7f0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -44,6 +44,7 @@ localedir=@localedir@ docdir=@docdir@ sysconfdir=@sysconfdir@ POTDIR=$(BASEDIR)/.pot +GETTEXT_PACKAGE=@GETTEXT_PACKAGE@ BASEDIR=@BASEDIR@ @@ -66,7 +67,7 @@ MSGCAT=@MSGCAT@ all: \ $(BINRLS)/ipcserver@DLLEXT@ \ $(BINRLS)/libipc3270@LIBEXT@ \ - locale/$(LIBNAME).pot + locale/$(GETTEXT_PACKAGE).pot plugin: \ $(BINRLS)/ipcserver@DLLEXT@ @@ -80,7 +81,7 @@ $(BINRLS)/ipcserver@DLLEXT@: $(BINRLS)/libipc3270@LIBEXT@: @$(MAKE) -C client $@ -locale/$(LIBNAME).pot: +locale/$(GETTEXT_PACKAGE).pot: @rm -f $@ @$(MKDIR) $(@D) diff --git a/client/src/core/linux/dynamic/init.cc b/client/src/core/linux/dynamic/init.cc index d89bcb6..7270b3a 100644 --- a/client/src/core/linux/dynamic/init.cc +++ b/client/src/core/linux/dynamic/init.cc @@ -49,16 +49,8 @@ int ipc3270_loaded(void) { -#ifdef HAVE_LIBINTL - - static bool initialized = false; - - if(!initialized) { - initialized = true; - bindtextdomain(PACKAGE_NAME, LIB3270_STRINGIZE_VALUE_OF(LOCALEDIR)); - } - -#endif // HAVE_LIBINTL + debug("LOCALEDIR=\"%s\"",LIB3270_STRINGIZE_VALUE_OF(LOCALEDIR)); + bindtextdomain(GETTEXT_PACKAGE, LIB3270_STRINGIZE_VALUE_OF(LOCALEDIR)); return 0; diff --git a/client/src/include/ipc-client-internals.h b/client/src/include/ipc-client-internals.h index c38df64..d5e844a 100644 --- a/client/src/include/ipc-client-internals.h +++ b/client/src/include/ipc-client-internals.h @@ -67,7 +67,7 @@ #ifdef HAVE_LIBINTL #include - #define _( x ) dgettext(PACKAGE_NAME, x) + #define _( x ) dgettext(GETTEXT_PACKAGE, x) #define N_( x ) x #else #define _( x ) x diff --git a/client/src/session/remote/wait.cc b/client/src/session/remote/wait.cc index f888f07..793628c 100644 --- a/client/src/session/remote/wait.cc +++ b/client/src/session/remote/wait.cc @@ -57,6 +57,8 @@ rc = worker(); + debug("rc=",rc); + if(rc == 0) return; else if(rc != ETIMEDOUT) @@ -89,6 +91,8 @@ void IPC::Session::waitForReady(time_t timeout) const { + debug(__FUNCTION__,"(",timeout,")"); + wait(timeout, [this]() { int rc; diff --git a/common/src/include/config.h.in b/common/src/include/config.h.in index feef89d..33274ac 100644 --- a/common/src/include/config.h.in +++ b/common/src/include/config.h.in @@ -35,6 +35,7 @@ #undef PACKAGE_VERSION #undef PACKAGE_RELEASE #undef PRODUCT_NAME + #undef GETTEXT_PACKAGE #undef HAVE_LIBINTL #undef HAVE_ICONV diff --git a/configure.ac b/configure.ac index dde9dd9..3e96499 100644 --- a/configure.ac +++ b/configure.ac @@ -429,6 +429,14 @@ AS_VAR_POPDEF([CACHEVAR])dnl AX_CHECK_COMPILE_FLAG([-std=gnu++11], [CXXFLAGS="$CXXFLAGS -std=gnu++11"]) +dnl --------------------------------------------------------------------------- +dnl Set translation domain. +dnl --------------------------------------------------------------------------- + +app_cv_gettext_package="libipc3270" + +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$app_cv_gettext_package") +AC_SUBST(GETTEXT_PACKAGE,"$app_cv_gettext_package") dnl --------------------------------------------------------------------------- dnl Configure which files to generate. diff --git a/locale/Makefile.in b/locale/Makefile.in index 3c4607d..6cf1c0c 100644 --- a/locale/Makefile.in +++ b/locale/Makefile.in @@ -33,7 +33,7 @@ datarootdir=@datarootdir@ localedir=${datarootdir}/locale PACKAGE_NAME=@PACKAGE_NAME@ -LIBNAME=libipc3270 +GETTEXT_PACKAGE=@GETTEXT_PACKAGE@ PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_TARNAME=@PACKAGE_TARNAME@ @@ -52,21 +52,21 @@ INSTALL_DATA=@INSTALL_DATA@ #---[ Rules ]---------------------------------------------------------------------------- %.po: \ - $(LIBNAME).pot + $(GETTEXT_PACKAGE).pot @echo $(basename $@) ... - @$(MSGMERGE) --update --sort-output $@ $(LIBNAME).pot + @$(MSGMERGE) --update --sort-output $@ $(GETTEXT_PACKAGE).pot @touch $@ -$(BINDIR)/%/LC_MESSAGES/$(LIBNAME).mo: \ +$(BINDIR)/%/LC_MESSAGES/$(GETTEXT_PACKAGE).mo: \ %.po @echo $< ... @$(MKDIR) `dirname $@` @$(MSGFMT) -c -v -o $@ $^ -$(DESTDIR)/$(localedir)/%/LC_MESSAGES/$(LIBNAME).mo: \ - $(BINDIR)/%/LC_MESSAGES/$(LIBNAME).mo +$(DESTDIR)/$(localedir)/%/LC_MESSAGES/$(GETTEXT_PACKAGE).mo: \ + $(BINDIR)/%/LC_MESSAGES/$(GETTEXT_PACKAGE).mo @echo $< ... @$(MKDIR) `dirname $@` @@ -75,10 +75,10 @@ $(DESTDIR)/$(localedir)/%/LC_MESSAGES/$(LIBNAME).mo: \ #---[ Targets ]-------------------------------------------------------------------------- all: \ - $(foreach SRC, $(basename $(wildcard *.po)), $(BINDIR)/$(SRC)/LC_MESSAGES/$(LIBNAME).mo) + $(foreach SRC, $(basename $(wildcard *.po)), $(BINDIR)/$(SRC)/LC_MESSAGES/$(GETTEXT_PACKAGE).mo) install: \ - $(foreach SRC, $(basename $(wildcard *.po)), $(DESTDIR)/$(localedir)/$(SRC)/LC_MESSAGES/$(LIBNAME).mo) + $(foreach SRC, $(basename $(wildcard *.po)), $(DESTDIR)/$(localedir)/$(SRC)/LC_MESSAGES/$(GETTEXT_PACKAGE).mo) diff --git a/server/Makefile.in b/server/Makefile.in index 73aaede..8c44c53 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -102,6 +102,7 @@ CFLAGS= \ -I$(BASEDIR)/server/src/include \ -I$(BASEDIR)/common/src/include \ -DBUILD_DATE=`date +%Y%m%d` \ + -DLOCALEDIR=$(localedir) \ @V3270_CFLAGS@ \ @GTK_CFLAGS@ \ @GLIB_CFLAGS@ \ diff --git a/server/src/core/linux/gobject.c b/server/src/core/linux/gobject.c index bd69102..36d3335 100644 --- a/server/src/core/linux/gobject.c +++ b/server/src/core/linux/gobject.c @@ -78,6 +78,9 @@ static void ipc3270_class_init(ipc3270Class *klass) { object_class = G_OBJECT_CLASS (klass); object_class->finalize = ipc3270_finalize; + debug("Localedir: \"%s\"",G_STRINGIFY(LOCALEDIR)); + bindtextdomain(GETTEXT_PACKAGE, G_STRINGIFY(LOCALEDIR)); + } static void ipc3270_init(ipc3270 *object) { diff --git a/server/src/include/internals.h b/server/src/include/internals.h index 1c3fc78..f531ac9 100644 --- a/server/src/include/internals.h +++ b/server/src/include/internals.h @@ -42,7 +42,6 @@ #include #define ENABLE_NLS - #define GETTEXT_PACKAGE PACKAGE_NAME #include #include -- libgit2 0.21.2