Commit 537443d3f4dd23c73402f627b6d733e45085fab7

Authored by Perry Werneck
1 parent dc88327e

Ajustes para permitir definição do nome da lib3270 via ./configure

@@ -75,6 +75,12 @@ $(BINDBG)/%@DLLEXT@: \ @@ -75,6 +75,12 @@ $(BINDBG)/%@DLLEXT@: \
75 75
76 @$(MAKE) -C src/$(basename $(notdir $@)) $@ 76 @$(MAKE) -C src/$(basename $(notdir $@)) $@
77 77
  78 +$(BINDBG)/lib@LIB3270_NAME@@DLLEXT@: \
  79 + $(DEPENDS) \
  80 + ./src/lib3270/*
  81 +
  82 + @$(MAKE) -C src/lib3270 $@
  83 +
78 $(BINDBG)/plugins/%@DLLEXT@: \ 84 $(BINDBG)/plugins/%@DLLEXT@: \
79 $(DEPENDS) \ 85 $(DEPENDS) \
80 ./src/plugins/%/* 86 ./src/plugins/%/*
@@ -93,6 +99,12 @@ $(BINRLS)/%@DLLEXT@: \ @@ -93,6 +99,12 @@ $(BINRLS)/%@DLLEXT@: \
93 99
94 @$(MAKE) -C src/$(basename $(notdir $@)) $@ 100 @$(MAKE) -C src/$(basename $(notdir $@)) $@
95 101
  102 +$(BINRLS)/lib@LIB3270_NAME@@DLLEXT@: \
  103 + $(DEPENDS) \
  104 + ./src/lib3270/*
  105 +
  106 + @$(MAKE) -C src/lib3270 $@
  107 +
96 $(BINRLS)/%.a: \ 108 $(BINRLS)/%.a: \
97 $(DEPENDS) \ 109 $(DEPENDS) \
98 ./src/%/* 110 ./src/%/*
@@ -188,7 +200,7 @@ $(BINDIR)/%.png: \ @@ -188,7 +200,7 @@ $(BINDIR)/%.png: \
188 #---[ Release targets ]-------------------------------------------------------- 200 #---[ Release targets ]--------------------------------------------------------
189 201
190 all: \ 202 all: \
191 - $(BINRLS)/lib3270@DLLEXT@ \ 203 + $(BINRLS)/lib@LIB3270_NAME@@DLLEXT@ \
192 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \ 204 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \
193 $(BINRLS)/libpw3270cpp.a \ 205 $(BINRLS)/libpw3270cpp.a \
194 $(foreach PLG, $(PLUGINS), $(BINRLS)/plugins/$(PLG)@DLLEXT@) \ 206 $(foreach PLG, $(PLUGINS), $(BINRLS)/plugins/$(PLG)@DLLEXT@) \
@@ -199,7 +211,7 @@ all: \ @@ -199,7 +211,7 @@ all: \
199 @$(MAKE) -C locale all 211 @$(MAKE) -C locale all
200 212
201 Release: \ 213 Release: \
202 - $(BINRLS)/lib3270@DLLEXT@ \ 214 + $(BINRLS)/lib@LIB3270_NAME@@DLLEXT@ \
203 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \ 215 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \
204 $(foreach PLG, $(PLUGINS), $(BINRLS)/plugins/$(PLG)@DLLEXT@) \ 216 $(foreach PLG, $(PLUGINS), $(BINRLS)/plugins/$(PLG)@DLLEXT@) \
205 $(BINDIR)/$(PACKAGE_NAME).png \ 217 $(BINDIR)/$(PACKAGE_NAME).png \
@@ -209,7 +221,7 @@ Release: \ @@ -209,7 +221,7 @@ Release: \
209 @$(MAKE) -C locale all 221 @$(MAKE) -C locale all
210 222
211 locale/$(PACKAGE_TARNAME).pot: \ 223 locale/$(PACKAGE_TARNAME).pot: \
212 - $(POTDIR)/lib3270.pot \ 224 + $(POTDIR)/lib@LIB3270_NAME@.pot \
213 $(POTDIR)/pw3270.pot \ 225 $(POTDIR)/pw3270.pot \
214 $(POTDIR)/ui.pot \ 226 $(POTDIR)/ui.pot \
215 $(foreach PLG, $(PLUGINS), $(POTDIR)/plugins/$(PLG).pot) 227 $(foreach PLG, $(PLUGINS), $(POTDIR)/plugins/$(PLG).pot)
@@ -225,7 +237,7 @@ install: \ @@ -225,7 +237,7 @@ install: \
225 $(foreach PLG, $(PLUGINS), $(DESTDIR)$(libdir)/$(PACKAGE_TARNAME)-plugins/$(PLG)@DLLEXT@) 237 $(foreach PLG, $(PLUGINS), $(DESTDIR)$(libdir)/$(PACKAGE_TARNAME)-plugins/$(PLG)@DLLEXT@)
226 238
227 install-lib: \ 239 install-lib: \
228 - $(DESTDIR)$(libdir)/lib3270@DLLEXT@ \ 240 + $(DESTDIR)$(libdir)/@LIB3270_NAME@@DLLEXT@ \
229 241
230 install-app: \ 242 install-app: \
231 install-branding \ 243 install-branding \
@@ -264,7 +276,7 @@ install-branding: @@ -264,7 +276,7 @@ install-branding:
264 #---[ Debug targets ]---------------------------------------------------------- 276 #---[ Debug targets ]----------------------------------------------------------
265 277
266 Debug: \ 278 Debug: \
267 - $(BINDBG)/lib3270@DLLEXT@ \ 279 + $(BINDBG)/lib@LIB3270_NAME@@DLLEXT@ \
268 $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \ 280 $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \
269 $(BINDBG)/libpw3270cpp.a \ 281 $(BINDBG)/libpw3270cpp.a \
270 $(foreach PLG, $(PLUGINS), $(BINDBG)/plugins/$(PLG)@DLLEXT@) 282 $(foreach PLG, $(PLUGINS), $(BINDBG)/plugins/$(PLG)@DLLEXT@)
@@ -276,7 +288,7 @@ $(BINDBG)/libpw3270cpp.a: \ @@ -276,7 +288,7 @@ $(BINDBG)/libpw3270cpp.a: \
276 288
277 289
278 run: \ 290 run: \
279 - $(BINDBG)/lib3270@DLLEXT@ \ 291 + $(BINDBG)/lib@LIB3270_NAME@@DLLEXT@ \
280 $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \ 292 $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \
281 $(foreach PLG, $(PLUGINS), $(BINDBG)/plugins/$(PLG)@DLLEXT@) 293 $(foreach PLG, $(PLUGINS), $(BINDBG)/plugins/$(PLG)@DLLEXT@)
282 294
@@ -365,10 +365,16 @@ dnl --------------------------------------------------------------------------- @@ -365,10 +365,16 @@ dnl ---------------------------------------------------------------------------
365 dnl Lib3270 flags 365 dnl Lib3270 flags
366 dnl --------------------------------------------------------------------------- 366 dnl ---------------------------------------------------------------------------
367 367
  368 +AC_ARG_WITH([libname], [AS_HELP_STRING([--with-libname], [Setup library name])], [ app_cv_libname="$withval" ],[ app_cv_libname="3270" ])
  369 +
  370 +
368 AC_SUBST(LIB3270_CFLAGS,-I$ac_pwd/src/include) 371 AC_SUBST(LIB3270_CFLAGS,-I$ac_pwd/src/include)
369 -AC_SUBST(LIB3270_LIBS,-l3270) 372 +AC_SUBST(LIB3270_LIBS,-l$app_cv_libname)
370 AC_SUBST(PW3270_LIBS,-l$PACKAGE_TARNAME) 373 AC_SUBST(PW3270_LIBS,-l$PACKAGE_TARNAME)
371 374
  375 +AC_DEFINE(LIB3270_NAME,$app_cv_libname)
  376 +AC_SUBST(LIB3270_NAME,$app_cv_libname)
  377 +
372 dnl --------------------------------------------------------------------------- 378 dnl ---------------------------------------------------------------------------
373 dnl Check for headers 379 dnl Check for headers
374 dnl --------------------------------------------------------------------------- 380 dnl ---------------------------------------------------------------------------
locale/pt_BR.po
@@ -5,7 +5,7 @@ msgid "" @@ -5,7 +5,7 @@ msgid ""
5 msgstr "" 5 msgstr ""
6 "Project-Id-Version: pw3270 5.0\n" 6 "Project-Id-Version: pw3270 5.0\n"
7 "Report-Msgid-Bugs-To: \n" 7 "Report-Msgid-Bugs-To: \n"
8 -"POT-Creation-Date: 2018-07-23 16:29-0300\n" 8 +"POT-Creation-Date: 2018-09-14 16:06-0300\n"
9 "PO-Revision-Date: 2018-01-15 13:50-0200\n" 9 "PO-Revision-Date: 2018-01-15 13:50-0200\n"
10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 "Language-Team: Português <perry.werneck@gmail.com>\n" 11 "Language-Team: Português <perry.werneck@gmail.com>\n"
@@ -419,6 +419,11 @@ msgstr &quot;Não foi possível conectar a %s&quot; @@ -419,6 +419,11 @@ msgstr &quot;Não foi possível conectar a %s&quot;
419 msgid "Can't connect to %s:%s" 419 msgid "Can't connect to %s:%s"
420 msgstr "Não foi possível conectar a %s:%s" 420 msgstr "Não foi possível conectar a %s:%s"
421 421
  422 +#: main.c:70
  423 +#, fuzzy
  424 +msgid "Can't connect to DBUS server"
  425 +msgstr "Não foi possível conectar a %s"
  426 +
422 #: selection.c:466 427 #: selection.c:466
423 #, c-format 428 #, c-format
424 msgid "Can't convert line %d from %s to %s" 429 msgid "Can't convert line %d from %s to %s"
@@ -433,6 +438,10 @@ msgstr &quot;Recortar não permitido em seleção retangular&quot; @@ -433,6 +438,10 @@ msgstr &quot;Recortar não permitido em seleção retangular&quot;
433 msgid "Can't determine value for environment variable \"%s\" " 438 msgid "Can't determine value for environment variable \"%s\" "
434 msgstr "Não consigo determinar o valor da variável de ambiente \"%s\" " 439 msgstr "Não consigo determinar o valor da variável de ambiente \"%s\" "
435 440
  441 +#: main.c:115
  442 +msgid "Can't get DBUS object name"
  443 +msgstr ""
  444 +
436 #: ft.c:413 445 #: ft.c:413
437 msgid "Can't get file size" 446 msgid "Can't get file size"
438 msgstr "Não foi possível obter o tamanho do arquivo" 447 msgstr "Não foi possível obter o tamanho do arquivo"
@@ -667,6 +676,11 @@ msgstr &quot;Configurar host&quot; @@ -667,6 +676,11 @@ msgstr &quot;Configurar host&quot;
667 msgid "Connect on startup" 676 msgid "Connect on startup"
668 msgstr "Conectar ao iniciar" 677 msgstr "Conectar ao iniciar"
669 678
  679 +#: gobject.c:205
  680 +#, fuzzy
  681 +msgid "Connecting to host"
  682 +msgstr "Não foi possível conectar ao servidor"
  683 +
670 #: connect.c:215 connect.c:311 connect.c:320 connect.c:382 connect.c:397 684 #: connect.c:215 connect.c:311 connect.c:320 connect.c:382 connect.c:397
671 #: connect.c:413 connect.c:427 connect.c:447 connect.c:461 connect.c:477 685 #: connect.c:413 connect.c:427 connect.c:447 connect.c:461 connect.c:477
672 #: connect.c:573 686 #: connect.c:573
@@ -1942,6 +1956,11 @@ msgstr &quot;Iniciar transferência de arquivo&quot; @@ -1942,6 +1956,11 @@ msgstr &quot;Iniciar transferência de arquivo&quot;
1942 msgid "Starting" 1956 msgid "Starting"
1943 msgstr "Iniciando" 1957 msgstr "Iniciando"
1944 1958
  1959 +#: gobject.c:193
  1960 +#, c-format
  1961 +msgid "State %04d can't accept requests"
  1962 +msgstr ""
  1963 +
1945 #: security.c:237 1964 #: security.c:237
1946 msgid "Subject issuer mismatch" 1965 msgid "Subject issuer mismatch"
1947 msgstr "Divergência na identidade do emissor" 1966 msgstr "Divergência na identidade do emissor"
@@ -2431,6 +2450,11 @@ msgstr &quot;Valor de cor inválido ou inesperado: \&quot;%s\&quot;&quot; @@ -2431,6 +2450,11 @@ msgstr &quot;Valor de cor inválido ou inesperado: \&quot;%s\&quot;&quot;
2431 msgid "Unexpected or unknown security status" 2450 msgid "Unexpected or unknown security status"
2432 msgstr "Estado de segurança inesperado ou desconhecido." 2451 msgstr "Estado de segurança inesperado ou desconhecido."
2433 2452
  2453 +#: gobject.c:208
  2454 +#, fuzzy, c-format
  2455 +msgid "Unexpected state %04d"
  2456 +msgstr "Alvo inesperado \"%s\""
  2457 +
2434 #: actions.c:391 2458 #: actions.c:391
2435 #, c-format 2459 #, c-format
2436 msgid "Unexpected target \"%s\"" 2460 msgid "Unexpected target \"%s\""
@@ -2835,10 +2859,6 @@ msgstr &quot;translator-credits&quot; @@ -2835,10 +2859,6 @@ msgstr &quot;translator-credits&quot;
2835 #~ "32768. Valores maiores trazem maior performance, porem, nem todos os " 2859 #~ "32768. Valores maiores trazem maior performance, porem, nem todos os "
2836 #~ "hosts podem suportá-los." 2860 #~ "hosts podem suportá-los."
2837 2861
2838 -#, fuzzy  
2839 -#~ msgid "Can't connect to DBUS server"  
2840 -#~ msgstr "Não foi possível conectar a %s"  
2841 -  
2842 #~ msgid "Can't start download." 2862 #~ msgid "Can't start download."
2843 #~ msgstr "Não foi possível iniciar o download." 2863 #~ msgstr "Não foi possível iniciar o download."
2844 2864
@@ -2875,10 +2895,6 @@ msgstr &quot;translator-credits&quot; @@ -2875,10 +2895,6 @@ msgstr &quot;translator-credits&quot;
2875 #~ msgid "Complete" 2895 #~ msgid "Complete"
2876 #~ msgstr "Completo" 2896 #~ msgstr "Completo"
2877 2897
2878 -#, fuzzy  
2879 -#~ msgid "Connecting to host"  
2880 -#~ msgstr "Não foi possível conectar ao servidor"  
2881 -  
2882 #~ msgid "Copiar tudo" 2898 #~ msgid "Copiar tudo"
2883 #~ msgstr "Copiar tudo" 2899 #~ msgstr "Copiar tudo"
2884 2900
@@ -3241,10 +3257,6 @@ msgstr &quot;translator-credits&quot; @@ -3241,10 +3257,6 @@ msgstr &quot;translator-credits&quot;
3241 #~ msgid "Unexpected element <%s>" 3257 #~ msgid "Unexpected element <%s>"
3242 #~ msgstr "Elemento <%s> inesperado" 3258 #~ msgstr "Elemento <%s> inesperado"
3243 3259
3244 -#, fuzzy  
3245 -#~ msgid "Unexpected state %04d"  
3246 -#~ msgstr "Alvo inesperado \"%s\""  
3247 -  
3248 #~ msgid "" 3260 #~ msgid ""
3249 #~ "Unknown host:\n" 3261 #~ "Unknown host:\n"
3250 #~ "%s" 3262 #~ "%s"
locale/pw3270.pot
@@ -9,7 +9,7 @@ msgstr &quot;&quot; @@ -9,7 +9,7 @@ msgstr &quot;&quot;
9 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 9 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
10 "Project-Id-Version: PACKAGE VERSION\n" 10 "Project-Id-Version: PACKAGE VERSION\n"
11 "Report-Msgid-Bugs-To: \n" 11 "Report-Msgid-Bugs-To: \n"
12 -"POT-Creation-Date: 2018-08-17 10:53-0300\n" 12 +"POT-Creation-Date: 2018-09-14 16:06-0300\n"
13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15 "Language-Team: LANGUAGE <LL@li.org>\n" 15 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr &quot;&quot; @@ -20,7 +20,7 @@ msgstr &quot;&quot;
20 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 20 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
21 "Project-Id-Version: PACKAGE VERSION\n" 21 "Project-Id-Version: PACKAGE VERSION\n"
22 "Report-Msgid-Bugs-To: \n" 22 "Report-Msgid-Bugs-To: \n"
23 -"POT-Creation-Date: 2018-08-17 10:53-0300\n" 23 +"POT-Creation-Date: 2018-09-14 16:06-0300\n"
24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
26 "Language-Team: LANGUAGE <LL@li.org>\n" 26 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,6 +39,17 @@ msgstr &quot;&quot; @@ -39,6 +39,17 @@ msgstr &quot;&quot;
39 "MIME-Version: 1.0\n" 39 "MIME-Version: 1.0\n"
40 "Content-Type: text/plain; charset=CHARSET\n" 40 "Content-Type: text/plain; charset=CHARSET\n"
41 "Content-Transfer-Encoding: 8bit\n" 41 "Content-Transfer-Encoding: 8bit\n"
  42 +"#-#-#-#-# dbus3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
  43 +"Project-Id-Version: PACKAGE VERSION\n"
  44 +"Report-Msgid-Bugs-To: \n"
  45 +"POT-Creation-Date: 2018-09-14 16:06-0300\n"
  46 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  47 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  48 +"Language-Team: LANGUAGE <LL@li.org>\n"
  49 +"Language: \n"
  50 +"MIME-Version: 1.0\n"
  51 +"Content-Type: text/plain; charset=CHARSET\n"
  52 +"Content-Transfer-Encoding: 8bit\n"
42 53
43 #: window.c:329 54 #: window.c:329
44 #, c-format 55 #, c-format
@@ -424,6 +435,10 @@ msgstr &quot;&quot; @@ -424,6 +435,10 @@ msgstr &quot;&quot;
424 msgid "Can't connect to %s:%s" 435 msgid "Can't connect to %s:%s"
425 msgstr "" 436 msgstr ""
426 437
  438 +#: main.c:70
  439 +msgid "Can't connect to DBUS server"
  440 +msgstr ""
  441 +
427 #: selection.c:466 442 #: selection.c:466
428 #, c-format 443 #, c-format
429 msgid "Can't convert line %d from %s to %s" 444 msgid "Can't convert line %d from %s to %s"
@@ -438,6 +453,10 @@ msgstr &quot;&quot; @@ -438,6 +453,10 @@ msgstr &quot;&quot;
438 msgid "Can't determine value for environment variable \"%s\" " 453 msgid "Can't determine value for environment variable \"%s\" "
439 msgstr "" 454 msgstr ""
440 455
  456 +#: main.c:115
  457 +msgid "Can't get DBUS object name"
  458 +msgstr ""
  459 +
441 #: ft.c:413 460 #: ft.c:413
442 msgid "Can't get file size" 461 msgid "Can't get file size"
443 msgstr "" 462 msgstr ""
@@ -660,6 +679,10 @@ msgstr &quot;&quot; @@ -660,6 +679,10 @@ msgstr &quot;&quot;
660 msgid "Connect on startup" 679 msgid "Connect on startup"
661 msgstr "" 680 msgstr ""
662 681
  682 +#: gobject.c:205
  683 +msgid "Connecting to host"
  684 +msgstr ""
  685 +
663 #: connect.c:215 connect.c:311 connect.c:320 connect.c:382 connect.c:397 686 #: connect.c:215 connect.c:311 connect.c:320 connect.c:382 connect.c:397
664 #: connect.c:413 connect.c:427 connect.c:447 connect.c:461 connect.c:477 687 #: connect.c:413 connect.c:427 connect.c:447 connect.c:461 connect.c:477
665 #: connect.c:573 688 #: connect.c:573
@@ -1890,6 +1913,11 @@ msgstr &quot;&quot; @@ -1890,6 +1913,11 @@ msgstr &quot;&quot;
1890 msgid "Starting" 1913 msgid "Starting"
1891 msgstr "" 1914 msgstr ""
1892 1915
  1916 +#: gobject.c:193
  1917 +#, c-format
  1918 +msgid "State %04d can't accept requests"
  1919 +msgstr ""
  1920 +
1893 #: security.c:237 1921 #: security.c:237
1894 msgid "Subject issuer mismatch" 1922 msgid "Subject issuer mismatch"
1895 msgstr "" 1923 msgstr ""
@@ -2325,6 +2353,11 @@ msgstr &quot;&quot; @@ -2325,6 +2353,11 @@ msgstr &quot;&quot;
2325 msgid "Unexpected or unknown security status" 2353 msgid "Unexpected or unknown security status"
2326 msgstr "" 2354 msgstr ""
2327 2355
  2356 +#: gobject.c:208
  2357 +#, c-format
  2358 +msgid "Unexpected state %04d"
  2359 +msgstr ""
  2360 +
2328 #: actions.c:391 2361 #: actions.c:391
2329 #, c-format 2362 #, c-format
2330 msgid "Unexpected target \"%s\"" 2363 msgid "Unexpected target \"%s\""
src/lib3270/Makefile.in
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) 24 # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça)
25 # 25 #
26 26
27 -LIBNAME=lib3270@DLLEXT@ 27 +LIBNAME=lib@LIB3270_NAME@@DLLEXT@
28 28
29 SOURCES = bounds.c ctlr.c util.c toggles.c screen.c selection.c kybd.c telnet.c \ 29 SOURCES = bounds.c ctlr.c util.c toggles.c screen.c selection.c kybd.c telnet.c \
30 iocalls.c connect.c \ 30 iocalls.c connect.c \
@@ -129,7 +129,7 @@ all: \ @@ -129,7 +129,7 @@ all: \
129 Release: \ 129 Release: \
130 $(BINRLS)/$(LIBNAME) 130 $(BINRLS)/$(LIBNAME)
131 131
132 -$(BASEDIR)/.pot/lib3270.pot: \ 132 +$(BASEDIR)/.pot/lib@LIB3270_NAME@.pot: \
133 $(foreach SRC, $(basename $(SOURCES)), $(POTDIR)/$(SRC).pot) 133 $(foreach SRC, $(basename $(SOURCES)), $(POTDIR)/$(SRC).pot)
134 134
135 @rm -f $@ 135 @rm -f $@