From 537443d3f4dd23c73402f627b6d733e45085fab7 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Fri, 14 Sep 2018 16:16:11 -0300 Subject: [PATCH] Ajustes para permitir definição do nome da lib3270 via ./configure --- Makefile.in | 24 ++++++++++++++++++------ configure.ac | 8 +++++++- locale/pt_BR.po | 38 +++++++++++++++++++++++++------------- locale/pw3270.pot | 37 +++++++++++++++++++++++++++++++++++-- src/lib3270/Makefile.in | 4 ++-- 5 files changed, 87 insertions(+), 24 deletions(-) diff --git a/Makefile.in b/Makefile.in index 9ec7162..486b305 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,6 +75,12 @@ $(BINDBG)/%@DLLEXT@: \ @$(MAKE) -C src/$(basename $(notdir $@)) $@ +$(BINDBG)/lib@LIB3270_NAME@@DLLEXT@: \ + $(DEPENDS) \ + ./src/lib3270/* + + @$(MAKE) -C src/lib3270 $@ + $(BINDBG)/plugins/%@DLLEXT@: \ $(DEPENDS) \ ./src/plugins/%/* @@ -93,6 +99,12 @@ $(BINRLS)/%@DLLEXT@: \ @$(MAKE) -C src/$(basename $(notdir $@)) $@ +$(BINRLS)/lib@LIB3270_NAME@@DLLEXT@: \ + $(DEPENDS) \ + ./src/lib3270/* + + @$(MAKE) -C src/lib3270 $@ + $(BINRLS)/%.a: \ $(DEPENDS) \ ./src/%/* @@ -188,7 +200,7 @@ $(BINDIR)/%.png: \ #---[ Release targets ]-------------------------------------------------------- all: \ - $(BINRLS)/lib3270@DLLEXT@ \ + $(BINRLS)/lib@LIB3270_NAME@@DLLEXT@ \ $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \ $(BINRLS)/libpw3270cpp.a \ $(foreach PLG, $(PLUGINS), $(BINRLS)/plugins/$(PLG)@DLLEXT@) \ @@ -199,7 +211,7 @@ all: \ @$(MAKE) -C locale all Release: \ - $(BINRLS)/lib3270@DLLEXT@ \ + $(BINRLS)/lib@LIB3270_NAME@@DLLEXT@ \ $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \ $(foreach PLG, $(PLUGINS), $(BINRLS)/plugins/$(PLG)@DLLEXT@) \ $(BINDIR)/$(PACKAGE_NAME).png \ @@ -209,7 +221,7 @@ Release: \ @$(MAKE) -C locale all locale/$(PACKAGE_TARNAME).pot: \ - $(POTDIR)/lib3270.pot \ + $(POTDIR)/lib@LIB3270_NAME@.pot \ $(POTDIR)/pw3270.pot \ $(POTDIR)/ui.pot \ $(foreach PLG, $(PLUGINS), $(POTDIR)/plugins/$(PLG).pot) @@ -225,7 +237,7 @@ install: \ $(foreach PLG, $(PLUGINS), $(DESTDIR)$(libdir)/$(PACKAGE_TARNAME)-plugins/$(PLG)@DLLEXT@) install-lib: \ - $(DESTDIR)$(libdir)/lib3270@DLLEXT@ \ + $(DESTDIR)$(libdir)/@LIB3270_NAME@@DLLEXT@ \ install-app: \ install-branding \ @@ -264,7 +276,7 @@ install-branding: #---[ Debug targets ]---------------------------------------------------------- Debug: \ - $(BINDBG)/lib3270@DLLEXT@ \ + $(BINDBG)/lib@LIB3270_NAME@@DLLEXT@ \ $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \ $(BINDBG)/libpw3270cpp.a \ $(foreach PLG, $(PLUGINS), $(BINDBG)/plugins/$(PLG)@DLLEXT@) @@ -276,7 +288,7 @@ $(BINDBG)/libpw3270cpp.a: \ run: \ - $(BINDBG)/lib3270@DLLEXT@ \ + $(BINDBG)/lib@LIB3270_NAME@@DLLEXT@ \ $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \ $(foreach PLG, $(PLUGINS), $(BINDBG)/plugins/$(PLG)@DLLEXT@) diff --git a/configure.ac b/configure.ac index 921acf4..2a590f3 100644 --- a/configure.ac +++ b/configure.ac @@ -365,10 +365,16 @@ dnl --------------------------------------------------------------------------- dnl Lib3270 flags dnl --------------------------------------------------------------------------- +AC_ARG_WITH([libname], [AS_HELP_STRING([--with-libname], [Setup library name])], [ app_cv_libname="$withval" ],[ app_cv_libname="3270" ]) + + AC_SUBST(LIB3270_CFLAGS,-I$ac_pwd/src/include) -AC_SUBST(LIB3270_LIBS,-l3270) +AC_SUBST(LIB3270_LIBS,-l$app_cv_libname) AC_SUBST(PW3270_LIBS,-l$PACKAGE_TARNAME) +AC_DEFINE(LIB3270_NAME,$app_cv_libname) +AC_SUBST(LIB3270_NAME,$app_cv_libname) + dnl --------------------------------------------------------------------------- dnl Check for headers dnl --------------------------------------------------------------------------- diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 9ec25a3..d364603 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: pw3270 5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-23 16:29-0300\n" +"POT-Creation-Date: 2018-09-14 16:06-0300\n" "PO-Revision-Date: 2018-01-15 13:50-0200\n" "Last-Translator: Perry Werneck \n" "Language-Team: Português \n" @@ -419,6 +419,11 @@ msgstr "Não foi possível conectar a %s" msgid "Can't connect to %s:%s" msgstr "Não foi possível conectar a %s:%s" +#: main.c:70 +#, fuzzy +msgid "Can't connect to DBUS server" +msgstr "Não foi possível conectar a %s" + #: selection.c:466 #, c-format msgid "Can't convert line %d from %s to %s" @@ -433,6 +438,10 @@ msgstr "Recortar não permitido em seleção retangular" msgid "Can't determine value for environment variable \"%s\" " msgstr "Não consigo determinar o valor da variável de ambiente \"%s\" " +#: main.c:115 +msgid "Can't get DBUS object name" +msgstr "" + #: ft.c:413 msgid "Can't get file size" msgstr "Não foi possível obter o tamanho do arquivo" @@ -667,6 +676,11 @@ msgstr "Configurar host" msgid "Connect on startup" msgstr "Conectar ao iniciar" +#: gobject.c:205 +#, fuzzy +msgid "Connecting to host" +msgstr "Não foi possível conectar ao servidor" + #: connect.c:215 connect.c:311 connect.c:320 connect.c:382 connect.c:397 #: connect.c:413 connect.c:427 connect.c:447 connect.c:461 connect.c:477 #: connect.c:573 @@ -1942,6 +1956,11 @@ msgstr "Iniciar transferência de arquivo" msgid "Starting" msgstr "Iniciando" +#: gobject.c:193 +#, c-format +msgid "State %04d can't accept requests" +msgstr "" + #: security.c:237 msgid "Subject issuer mismatch" msgstr "Divergência na identidade do emissor" @@ -2431,6 +2450,11 @@ msgstr "Valor de cor inválido ou inesperado: \"%s\"" msgid "Unexpected or unknown security status" msgstr "Estado de segurança inesperado ou desconhecido." +#: gobject.c:208 +#, fuzzy, c-format +msgid "Unexpected state %04d" +msgstr "Alvo inesperado \"%s\"" + #: actions.c:391 #, c-format msgid "Unexpected target \"%s\"" @@ -2835,10 +2859,6 @@ msgstr "translator-credits" #~ "32768. Valores maiores trazem maior performance, porem, nem todos os " #~ "hosts podem suportá-los." -#, fuzzy -#~ msgid "Can't connect to DBUS server" -#~ msgstr "Não foi possível conectar a %s" - #~ msgid "Can't start download." #~ msgstr "Não foi possível iniciar o download." @@ -2875,10 +2895,6 @@ msgstr "translator-credits" #~ msgid "Complete" #~ msgstr "Completo" -#, fuzzy -#~ msgid "Connecting to host" -#~ msgstr "Não foi possível conectar ao servidor" - #~ msgid "Copiar tudo" #~ msgstr "Copiar tudo" @@ -3241,10 +3257,6 @@ msgstr "translator-credits" #~ msgid "Unexpected element <%s>" #~ msgstr "Elemento <%s> inesperado" -#, fuzzy -#~ msgid "Unexpected state %04d" -#~ msgstr "Alvo inesperado \"%s\"" - #~ msgid "" #~ "Unknown host:\n" #~ "%s" diff --git a/locale/pw3270.pot b/locale/pw3270.pot index 9c00431..4e17421 100644 --- a/locale/pw3270.pot +++ b/locale/pw3270.pot @@ -9,7 +9,7 @@ msgstr "" "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-17 10:53-0300\n" +"POT-Creation-Date: 2018-09-14 16:06-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,7 +20,7 @@ msgstr "" "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-17 10:53-0300\n" +"POT-Creation-Date: 2018-09-14 16:06-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -39,6 +39,17 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +"#-#-#-#-# dbus3270.pot (PACKAGE VERSION) #-#-#-#-#\n" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-09-14 16:06-0300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" #: window.c:329 #, c-format @@ -424,6 +435,10 @@ msgstr "" msgid "Can't connect to %s:%s" msgstr "" +#: main.c:70 +msgid "Can't connect to DBUS server" +msgstr "" + #: selection.c:466 #, c-format msgid "Can't convert line %d from %s to %s" @@ -438,6 +453,10 @@ msgstr "" msgid "Can't determine value for environment variable \"%s\" " msgstr "" +#: main.c:115 +msgid "Can't get DBUS object name" +msgstr "" + #: ft.c:413 msgid "Can't get file size" msgstr "" @@ -660,6 +679,10 @@ msgstr "" msgid "Connect on startup" msgstr "" +#: gobject.c:205 +msgid "Connecting to host" +msgstr "" + #: connect.c:215 connect.c:311 connect.c:320 connect.c:382 connect.c:397 #: connect.c:413 connect.c:427 connect.c:447 connect.c:461 connect.c:477 #: connect.c:573 @@ -1890,6 +1913,11 @@ msgstr "" msgid "Starting" msgstr "" +#: gobject.c:193 +#, c-format +msgid "State %04d can't accept requests" +msgstr "" + #: security.c:237 msgid "Subject issuer mismatch" msgstr "" @@ -2325,6 +2353,11 @@ msgstr "" msgid "Unexpected or unknown security status" msgstr "" +#: gobject.c:208 +#, c-format +msgid "Unexpected state %04d" +msgstr "" + #: actions.c:391 #, c-format msgid "Unexpected target \"%s\"" diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in index f003c37..c1d0414 100644 --- a/src/lib3270/Makefile.in +++ b/src/lib3270/Makefile.in @@ -24,7 +24,7 @@ # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) # -LIBNAME=lib3270@DLLEXT@ +LIBNAME=lib@LIB3270_NAME@@DLLEXT@ SOURCES = bounds.c ctlr.c util.c toggles.c screen.c selection.c kybd.c telnet.c \ iocalls.c connect.c \ @@ -129,7 +129,7 @@ all: \ Release: \ $(BINRLS)/$(LIBNAME) -$(BASEDIR)/.pot/lib3270.pot: \ +$(BASEDIR)/.pot/lib@LIB3270_NAME@.pot: \ $(foreach SRC, $(basename $(SOURCES)), $(POTDIR)/$(SRC).pot) @rm -f $@ -- libgit2 0.21.2