Download as
Browse Code »

Commit 2452cbb52e0eeddb2ef72c77e359c8811078c86c

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

Melhorando mecanismo de configuração

Showing 2 changed files with 41 additions and 27 deletions   Show diff stats
@@ -148,7 +148,6 @@ case "$host" in @@ -148,7 +148,6 @@ case "$host" in
148 PLUGINS="hllapi" 148 PLUGINS="hllapi"
149 APP_GUI_SRC="resources.rc" 149 APP_GUI_SRC="resources.rc"
150 DLLPREFIX="" 150 DLLPREFIX=""
151 - JNI_CPPFLAGS="-I\$(JDK_HOME)/include -I\$(JDK_HOME)/include/win32"  
152 ;; 151 ;;
153 152
154 *-apple-*) 153 *-apple-*)
@@ -173,7 +172,6 @@ case "$host" in @@ -173,7 +172,6 @@ case "$host" in
173 LDAPPFLAGS="" 172 LDAPPFLAGS=""
174 DBGRPATH="-Wl,--rpath,.bin/Debug/lib" 173 DBGRPATH="-Wl,--rpath,.bin/Debug/lib"
175 DBGCMDPREFIX="LD_LIBRARY_PATH=\$(BINDIR)/Debug/lib" 174 DBGCMDPREFIX="LD_LIBRARY_PATH=\$(BINDIR)/Debug/lib"
176 - JNI_CPPFLAGS="-I\$(JDK_HOME)/include -I\$(JDK_HOME)/include/linux"  
177 DLLPREFIX="lib" 175 DLLPREFIX="lib"
178 176
179 esac 177 esac
@@ -369,18 +367,6 @@ if test "$app_cv_java" = "yes" ; then @@ -369,18 +367,6 @@ if test "$app_cv_java" = "yes" ; then
369 367
370 fi 368 fi
371 369
372 -if test "$app_cv_java" = "yes" ; then  
373 -  
374 - EXTENSIONS="$EXTENSIONS java"  
375 - PLUGINS="$PLUGINS j3270"  
376 - AC_MSG_NOTICE([jdk is present and enabled.])  
377 -  
378 -else  
379 -  
380 - AC_MSG_NOTICE([jdk is NOT present or disabled.])  
381 -  
382 -fi  
383 -  
384 # Set JVM arch 370 # Set JVM arch
385 case $host_cpu in 371 case $host_cpu in
386 372
@@ -403,14 +389,17 @@ if test "_$JVMDIR" = "_" ; then @@ -403,14 +389,17 @@ if test "_$JVMDIR" = "_" ; then
403 389
404 case "$host" in 390 case "$host" in
405 *-mingw32) 391 *-mingw32)
  392 + jniinc=$JDK_HOME/include/win32
406 JVMDIR="\$(JRE_HOME)/bin" 393 JVMDIR="\$(JRE_HOME)/bin"
407 ;; 394 ;;
408 395
409 *-apple-*) 396 *-apple-*)
  397 + jniinc=$JDK_HOME/include/apple
410 JVMDIR="\$(JRE_HOME)/lib/$jvm_arch/server" 398 JVMDIR="\$(JRE_HOME)/lib/$jvm_arch/server"
411 ;; 399 ;;
412 400
413 *) 401 *)
  402 + jniinc=$JDK_HOME/include/linux
414 JVMDIR="\$(JRE_HOME)/lib/$jvm_arch/server" 403 JVMDIR="\$(JRE_HOME)/lib/$jvm_arch/server"
415 esac 404 esac
416 405
@@ -431,6 +420,25 @@ case "$host" in @@ -431,6 +420,25 @@ case "$host" in
431 jvm_libs="-L\$(JVMDIR) -Wl,-rpath,\$(JVMDIR) -ljvm" 420 jvm_libs="-L\$(JVMDIR) -Wl,-rpath,\$(JVMDIR) -ljvm"
432 esac 421 esac
433 422
  423 +if test -d "$jniinc"; then
  424 + AC_MSG_NOTICE([Found $jniinc.])
  425 +else
  426 + AC_MSG_NOTICE([Can't find $jniinc.])
  427 + app_cv_java="no"
  428 +fi
  429 +
  430 +if test "$app_cv_java" = "yes" ; then
  431 +
  432 + EXTENSIONS="$EXTENSIONS java"
  433 + PLUGINS="$PLUGINS j3270"
  434 + AC_MSG_NOTICE([jdk is present and enabled.])
  435 +
  436 +else
  437 +
  438 + AC_MSG_NOTICE([jdk is NOT present or disabled.])
  439 +
  440 +fi
  441 +
434 442
435 AC_SUBST(JVM_LIBS,$jvm_libs) 443 AC_SUBST(JVM_LIBS,$jvm_libs)
436 444
@@ -444,7 +452,7 @@ AC_SUBST(javadocdir) @@ -444,7 +452,7 @@ AC_SUBST(javadocdir)
444 AC_SUBST(JAR) 452 AC_SUBST(JAR)
445 AC_SUBST(JDK_HOME) 453 AC_SUBST(JDK_HOME)
446 AC_SUBST(JRE_HOME) 454 AC_SUBST(JRE_HOME)
447 -AC_SUBST(JNI_CPPFLAGS) 455 +AC_SUBST(JNI_CPPFLAGS,"-I$JDK_HOME/include -I$jniinc")
448 456
449 #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------ 457 #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------
450 458
@@ -544,25 +552,31 @@ AC_SUBST(PHPCONFDIR) @@ -544,25 +552,31 @@ AC_SUBST(PHPCONFDIR)
544 AC_PATH_TOOL([REXXC], [rexxc], [cp] ) 552 AC_PATH_TOOL([REXXC], [rexxc], [cp] )
545 AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no]) 553 AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no])
546 554
547 -PKG_CHECK_MODULES( [REXX], [ooRexx], app_cv_rexx=yes, AC_MSG_NOTICE([No ooRexx on pkg-config.]) ) 555 +AC_ARG_ENABLE([rexx],[AS_HELP_STRING([--disable-rexx], [Disable ooRexx integration])],[ app_cv_rexx="$enableval" ],[ app_cv_rexx="yes" ])
548 556
549 -if test "$app_cv_rexx" != "yes"; then 557 +if test "$app_cv_rexx" == "yes"; then
550 558
551 - if test "$REXXCONFIG" != "no"; then  
552 - REXX_CFLAGS=`$REXXCONFIG --cflags`  
553 - REXX_LIBS=`$REXXCONFIG --libs`  
554 - REXX_HOME=`$REXXCONFIG --prefix`/share/ooRexx  
555 - AC_MSG_NOTICE([Got settings from oorexx-config.])  
556 - app_cv_rexx="yes"  
557 - fi 559 + PKG_CHECK_MODULES( [REXX], [ooRexx], app_cv_rexx=yes, AC_MSG_NOTICE([No ooRexx on pkg-config.]) )
558 560
559 -else 561 + if test "$app_cv_rexx" != "yes"; then
  562 +
  563 + if test "$REXXCONFIG" != "no"; then
  564 + REXX_CFLAGS=`$REXXCONFIG --cflags`
  565 + REXX_LIBS=`$REXXCONFIG --libs`
  566 + REXX_HOME=`$REXXCONFIG --prefix`/share/ooRexx
  567 + AC_MSG_NOTICE([Got settings from oorexx-config.])
  568 + fi
560 569
561 - REXX_HOME=`$PKG_CONFIG --variable=prefix ooRexx`/share/ooRexx 570 + else
  571 +
  572 + REXX_HOME=`$PKG_CONFIG --variable=prefix ooRexx`/share/ooRexx
  573 +
  574 + fi
562 575
563 fi 576 fi
564 577
565 if test "$app_cv_rexx" == "yes"; then 578 if test "$app_cv_rexx" == "yes"; then
  579 +
566 AC_DEFINE(HAVE_REXX) 580 AC_DEFINE(HAVE_REXX)
567 AC_DEFINE(HAVE_OOREXXAPI_H) 581 AC_DEFINE(HAVE_OOREXXAPI_H)
568 582
@@ -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: 2015-06-22 11:40-0300\n" 8 +"POT-Creation-Date: 2015-06-22 22:10-0300\n"
9 "PO-Revision-Date: 2014-02-17 08:05-0300\n" 9 "PO-Revision-Date: 2014-02-17 08:05-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: Portugues <>\n" 11 "Language-Team: Portugues <>\n"