Download as
Browse Code »

Commit 65a0a2e4322f752174feedfd15803872c8cbff00

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

Melhorando a detecção do java

Showing 1 changed file with 27 additions and 1 deletions   Show diff stats
@@ -311,6 +311,7 @@ fi @@ -311,6 +311,7 @@ fi
311 311
312 #--[ Check For Java ]----------------------------------------------------------------------------------------------------------------------------------------- 312 #--[ Check For Java ]-----------------------------------------------------------------------------------------------------------------------------------------
313 313
  314 +AC_ARG_VAR([JAVA_HOME], [JAVA home directory])
314 AC_ARG_VAR([JDK_HOME], [JDK home directory]) 315 AC_ARG_VAR([JDK_HOME], [JDK home directory])
315 AC_ARG_VAR([JRE_HOME], [JRE home directory]) 316 AC_ARG_VAR([JRE_HOME], [JRE home directory])
316 317
@@ -325,7 +326,7 @@ if test "$app_cv_java" = "yes" ; then @@ -325,7 +326,7 @@ if test "$app_cv_java" = "yes" ; then
325 326
326 # Check for JAVA_HOME 327 # Check for JAVA_HOME
327 if test "_$JAVA_HOME" = "_" ; then 328 if test "_$JAVA_HOME" = "_" ; then
328 - app_cv_java="no" 329 + JAVA_HOME=$libdir/jvm/java
329 fi 330 fi
330 331
331 # Check for JDK_HOME 332 # Check for JDK_HOME
@@ -342,13 +343,38 @@ fi @@ -342,13 +343,38 @@ fi
342 if test "$app_cv_java" = "yes" ; then 343 if test "$app_cv_java" = "yes" ; then
343 344
344 AC_PATH_TOOL([JAVA], [java], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH]) 345 AC_PATH_TOOL([JAVA], [java], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
  346 + if test "$JAVA" = "no" ; then
  347 + app_cv_java="no"
  348 + fi
  349 +
345 AC_PATH_TOOL([JAVAC], [javac], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH]) 350 AC_PATH_TOOL([JAVAC], [javac], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
  351 + if test "$JAVAC" = "no" ; then
  352 + app_cv_java="no"
  353 + fi
  354 +
346 AC_PATH_TOOL([JAVAH], [javah], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH]) 355 AC_PATH_TOOL([JAVAH], [javah], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
  356 + if test "$JAVAH" = "no" ; then
  357 + app_cv_java="no"
  358 + fi
  359 +
347 AC_PATH_TOOL([JAR], [jar], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH]) 360 AC_PATH_TOOL([JAR], [jar], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
  361 + if test "$JAVA" = "no" ; then
  362 + app_cv_java="no"
  363 + fi
  364 +
348 AC_PATH_TOOL([JAVADOC], [javadoc], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH]) 365 AC_PATH_TOOL([JAVADOC], [javadoc], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
  366 + if test "$JAVADOC" = "no" ; then
  367 + app_cv_java="no"
  368 + fi
  369 +
  370 +fi
  371 +
  372 +if test "$app_cv_java" = "yes" ; then
349 373
350 EXTENSIONS="$EXTENSIONS java" 374 EXTENSIONS="$EXTENSIONS java"
351 PLUGINS="$PLUGINS j3270" 375 PLUGINS="$PLUGINS j3270"
  376 + AC_MSG_NOTICE([jdk is present and enabled.])
  377 +
352 else 378 else
353 379
354 AC_MSG_NOTICE([jdk is NOT present or disabled.]) 380 AC_MSG_NOTICE([jdk is NOT present or disabled.])