Download as
Browse Code »

Commit d92ac8927df2d2ee2e74dde957e343947fc30ec2

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

Melhorando detecção do java

Showing 1 changed file with 14 additions and 7 deletions   Show diff stats
configure.ac
  Diff comments   View file @d92ac89
... ... @@ -285,6 +285,9 @@ fi
285 285  
286 286 #--[ Check For Java ]-----------------------------------------------------------------------------------------------------------------------------------------
287 287  
  288 +AC_ARG_VAR([JDK_HOME], [JDK home directory])
  289 +AC_ARG_VAR([JRE_HOME], [JRE home directory])
  290 +
288 291 AC_ARG_ENABLE([java],[AS_HELP_STRING([--disable-java], [Disable java integration])],[ app_cv_java="$enableval" ],[ app_cv_java="yes" ])
289 292  
290 293 if test "$app_cv_java" = "yes" ; then
... ... @@ -294,24 +297,28 @@ if test "$app_cv_java" = "yes" ; then
294 297 app_cv_java="no"
295 298 fi
296 299  
  300 + # Check for JDK_HOME
  301 + if test "_$JDK_HOME" = "_" ; then
  302 + JDK_HOME=$JAVA_HOME
  303 + fi
  304 +
297 305 # Check for JRE_HOME
298 306 if test "_$JRE_HOME" = "_" ; then
299   - JRE_HOME="\$(JAVA_HOME)/jre"
  307 + JRE_HOME=$JAVA_HOME/jre
300 308 fi
301   -
302 309 fi
303 310  
304 311 if test "$app_cv_java" = "yes" ; then
305   - AC_PATH_TOOL([JAVA], [java], [no], [$JAVA_HOME/bin:$PATH])
306   - AC_PATH_TOOL([JAVAC], [javac], [no], [$JAVA_HOME/bin:$PATH])
307   - AC_PATH_TOOL([JAVAH], [javah], [no], [$JAVA_HOME/bin:$PATH])
308   - AC_PATH_TOOL([JAR], [jar], [no], [$JAVA_HOME/bin:$PATH])
  312 + AC_PATH_TOOL([JAVA], [java], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
  313 + AC_PATH_TOOL([JAVAC], [javac], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
  314 + AC_PATH_TOOL([JAVAH], [javah], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
  315 + AC_PATH_TOOL([JAR], [jar], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
309 316 fi
310 317  
311 318 AC_SUBST(JAVAC)
312 319 AC_SUBST(JAVAH)
313 320 AC_SUBST(JAR)
314   -AC_SUBST(JAVA_HOME)
  321 +AC_SUBST(JDK_HOME)
315 322 AC_SUBST(JRE_HOME)
316 323  
317 324 #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------
... ...