Download as
Browse Code »

Commit 2574a834160fb4bd157871cab11d53271538381d

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

Pesquisa pelo java estava dando erro quando em cross-compiler

Showing 1 changed file with 14 additions and 10 deletions   Show diff stats
@@ -257,18 +257,22 @@ fi @@ -257,18 +257,22 @@ fi
257 257
258 AC_ARG_ENABLE([java],[AS_HELP_STRING([--disable-java], [Disable java integration])],[ app_cv_java="$enableval" ],[ app_cv_java="yes" ]) 258 AC_ARG_ENABLE([java],[AS_HELP_STRING([--disable-java], [Disable java integration])],[ app_cv_java="$enableval" ],[ app_cv_java="yes" ])
259 259
260 -# Check for JDK_HOME  
261 -if test "_$JDK_HOME" = "_" ; then  
262 - AC_CHECK_FILE("/usr/java/default/bin/javac",JDK_HOME="/usr/java/default",)  
263 -fi 260 +if test "$app_cv_java" = "yes" ; then
264 261
265 -if test "_$JDK_HOME" = "_" ; then  
266 - app_cv_java="no"  
267 -fi 262 + # Check for JDK_HOME
  263 + if test "_$JDK_HOME" = "_" ; then
  264 + AC_CHECK_FILE("/usr/java/default/bin/javac",JDK_HOME="/usr/java/default",)
  265 + fi
  266 +
  267 + if test "_$JDK_HOME" = "_" ; then
  268 + app_cv_java="no"
  269 + fi
  270 +
  271 + # Check for JRE_HOME
  272 + if test "_$JRE_HOME" = "_" ; then
  273 + JRE_HOME="\$(JDK_HOME)/jre"
  274 + fi
268 275
269 -# Check for JRE_HOME  
270 -if test "_$JRE_HOME" = "_" ; then  
271 - JRE_HOME="\$(JDK_HOME)/jre"  
272 fi 276 fi
273 277
274 if test "$app_cv_java" = "yes" ; then 278 if test "$app_cv_java" = "yes" ; then