Download as
Browse Code »

Commit 9c1b8a6a3daa0533d849f36f0fe1aeafab41acaa

Authored by perry.werneck@gmail.com
1 parent fa5b8320
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Corrigindo empacotamento windows

Showing 2 changed files with 17 additions and 13 deletions   Show diff stats
@@ -393,31 +393,34 @@ if test -z "${REXX_HOME}"; then @@ -393,31 +393,34 @@ if test -z "${REXX_HOME}"; then
393 REXX_HOME="\$(datarootdir)/ooRexx" 393 REXX_HOME="\$(datarootdir)/ooRexx"
394 394
395 AC_PATH_TOOL([REXXC], [rexxc], [cp] ) 395 AC_PATH_TOOL([REXXC], [rexxc], [cp] )
396 - AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no]) 396 + AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no])
397 397
398 PKG_CHECK_MODULES( [REXX], [ooRexx], app_cv_rexx=yes, AC_MSG_NOTICE([No ooRexx on pkg-config.]) ) 398 PKG_CHECK_MODULES( [REXX], [ooRexx], app_cv_rexx=yes, AC_MSG_NOTICE([No ooRexx on pkg-config.]) )
399 399
400 - if test "$app_cv_rexx" != "yes"; then 400 + if test "$app_cv_rexx" != "yes"; then
401 401
402 - if test "$REXXCONFIG" != "no"; then  
403 - app_cv_rexx=yes  
404 - REXX_CFLAGS=`$REXXCONFIG --cflags`  
405 - REXX_LIBS=`$REXXCONFIG --libs`  
406 - REXX_HOME=`$REXXCONFIG --prefix`/share/ooRexx  
407 - AC_MSG_NOTICE([Got settings from oorexx-config.])  
408 - else  
409 - AC_MSG_NOTICE([ooRexx SDK is NOT available.]) 402 + if test "$REXXCONFIG" != "no"; then
  403 + app_cv_rexx=yes
  404 + REXX_CFLAGS=`$REXXCONFIG --cflags`
  405 + REXX_LIBS=`$REXXCONFIG --libs`
  406 + REXX_HOME=`$REXXCONFIG --prefix`/share/ooRexx
  407 + AC_MSG_NOTICE([Got settings from oorexx-config.])
  408 + else
  409 + AC_MSG_NOTICE([ooRexx SDK is NOT available.])
410 app_cv_rexx="no" 410 app_cv_rexx="no"
411 - fi  
412 - fi 411 + fi
  412 + fi
413 413
414 else 414 else
415 if test -e "${REXX_HOME}/api/oorexxapi.h"; then 415 if test -e "${REXX_HOME}/api/oorexxapi.h"; then
416 416
417 app_cv_rexx="yes" 417 app_cv_rexx="yes"
418 418
  419 + AC_MSG_NOTICE([Setting rexx sdk from REXX_HOME])
  420 +
419 REXX_CFLAGS="$CFLAGS -I\"$REXX_HOME/api\"" 421 REXX_CFLAGS="$CFLAGS -I\"$REXX_HOME/api\""
420 REXX_LIBS="$LIBS -L\"$REXX_HOME\" -lrexxapi -lrexx" 422 REXX_LIBS="$LIBS -L\"$REXX_HOME\" -lrexxapi -lrexx"
  423 +
421 AC_PATH_TOOL([REXXC], [rexxc], [cp], path="$PATH:$REXX_HOME" ) 424 AC_PATH_TOOL([REXXC], [rexxc], [cp], path="$PATH:$REXX_HOME" )
422 425
423 else 426 else
@@ -431,6 +434,7 @@ if test "$app_cv_rexx" == "yes"; then @@ -431,6 +434,7 @@ if test "$app_cv_rexx" == "yes"; then
431 AC_DEFINE(HAVE_REXX) 434 AC_DEFINE(HAVE_REXX)
432 AC_DEFINE(HAVE_OOREXXAPI_H) 435 AC_DEFINE(HAVE_OOREXXAPI_H)
433 PLUGINS="$PLUGINS rx3270" 436 PLUGINS="$PLUGINS rx3270"
  437 + AC_MSG_NOTICE([Rexx plugin enabled.])
434 fi 438 fi
435 439
436 AC_SUBST(REXXC) 440 AC_SUBST(REXXC)
@@ -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: 2013-06-28 16:44-0300\n" 8 +"POT-Creation-Date: 2013-06-28 16:57-0300\n"
9 "PO-Revision-Date: 2013-05-08 14:30-0300\n" 9 "PO-Revision-Date: 2013-05-08 14:30-0300\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 <>\n" 11 "Language-Team: Português <>\n"