[java-atk-wrapper] Set JAVA_HOME properly



commit 0c9436f9f258940fbdd9244cfa6bf5c44a12a194
Author: Magdalen Berns <m berns thismagpie com>
Date:   Mon Nov 10 19:11:57 2014 +0000

    Set JAVA_HOME properly
    
    JAVA_HOME is used but not specified in configure.ac so really it's just
    a blank string. It can be determined from JavaInfo and then used.
    
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=739912

 configure.ac |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a3d93be..3743ba3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,15 +105,17 @@ SRC_DIR=`dirname $0`
 if test "x$with_jdk_auto_detect" = "xyes"; then
   `$JAVAC $JAVACFLAGS -classpath $SRC_DIR/wrapper/org/GNOME/Accessibility $SRC_DIR/JavaInfo.java`
   JDK_SRC=`$JAVA $JAVACFLAGS JavaInfo`
+  JAVA_HOME=`$JAVA JavaInfo`/include
 else
   if test -z "$JDK_SRC"; then
     AC_MSG_ERROR("You should specify JDK_SRC")
   fi
 fi
 AC_SUBST(JDK_SRC)
+AC_SUBST(JAVA_HOME)
 
 if test "x$GCC" = xyes; then
-  JAW_CFLAGS=$JAW_CFLAGS $CFLAGS -I$JAVA_HOME/include
+  JAW_CFLAGS=$JAW_CFLAGS $CFLAGS -I$JAVA_HOME
 else
   AC_MSG_ERROR("You should compile with GCC")
 fi


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]