[java-atk-wrapper] Added JDK_HOME auto-detection

[Ke Wang <kewang src gnome org>]

commit 4db73b0641147a798b6c7c1fe982a3e8c4c01971
Author: Ke Wang <ke wang sun com>
Date:   Wed Jul 29 17:46:31 2009 +0800

    Added JDK_HOME auto-detection

 Makefile.am         |    2 ++
 acinclude.m4        |   10 +++++-----
 configure.in        |   20 ++++++++++++++++++++
 wrapper/Makefile.am |    4 ++--
 4 files changed, 29 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 23b4375..32f70b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS=jni wrapper
+
+EXTRA_DIST = JavaInfo.java
diff --git a/acinclude.m4 b/acinclude.m4
index 635a94c..e37c95a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -9,7 +9,7 @@ case $host in
     if test $gcj_compile = "yes"; then
       JNI_INCLUDES=
     else
-      JNI_INCLUDES="-I$JAVA_HOME/include -I$JAVA_HOME/include/win32"
+      JNI_INCLUDES="-I$JDK_HOME/include -I$JDK_HOME/include/win32"
     fi
     platform_win32="yes"
     PLATFORM_CFLAGS="-mms-bitfields"
@@ -21,7 +21,7 @@ case $host in
     if test $gcj_compile = "yes"; then
       JNI_INCLUDES=
     else
-      JNI_INCLUDES="-I$JAVA_HOME/include -I$JAVA_HOME/include/win32"
+      JNI_INCLUDES="-I$JDK_HOME/include -I$JDK_HOME/include/win32"
     fi
     platform_win32="yes"
     PLATFORM_CFLAGS=
@@ -33,7 +33,7 @@ case $host in
     if test $gcj_compile = "yes"; then
       JNI_INCLUDES=
     else
-      JNI_INCLUDES="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
+      JNI_INCLUDES="-I$JDK_HOME/include -I$JDK_HOME/include/linux"
     fi
     PLATFORM_CFLAGS=
     PLATFORM_LDFLAGS=
@@ -44,7 +44,7 @@ case $host in
     if test $gcj_compile = "yes"; then
       JNI_INCLUDES=
     else
-      JNI_INCLUDES="-I$JAVA_HOME/include -I$JAVA_HOME/include/solaris"
+      JNI_INCLUDES="-I$JDK_HOME/include -I$JDK_HOME/include/solaris"
     fi
     PLATFORM_CFLAGS=
     PLATFORM_LDFLAGS=
@@ -55,7 +55,7 @@ case $host in
     if test $gcj_compile = "yes"; then
       JNI_INCLUDES=
     else
-      JNI_INCLUDES="-I$JAVA_HOME/include -I$JAVA_HOME/include/$host_os"
+      JNI_INCLUDES="-I$JDK_HOME/include -I$JDK_HOME/include/$host_os"
     fi
     PLATFORM_CFLAGS=
     PLATFORM_LDFLAGS=
diff --git a/configure.in b/configure.in
index 3d598f2..2bf4f4a 100644
--- a/configure.in
+++ b/configure.in
@@ -41,6 +41,7 @@ JAVA_REQUIRED=1.5
 JAVA_ERROR_MESSAGE="Java $JAVA_REQUIRED or later is required to build java-access-bridge"
 
 AC_ARG_VAR([JAVA_HOME],[Java Runtime Environment location])
+AC_ARG_VAR([JDK_HOME],[JDK installation path])
 
 if test -z "$JAVA_HOME"; then
   JAVA_PATH=${PATH}
@@ -72,6 +73,25 @@ if test -z "$JAR"; then
 fi
 AC_SUBST(JAR)
 
+AC_ARG_WITH([jdk_auto_detect],
+	    [AS_HELP_STRING([--with-jdk-auto-detect],
+			    [Auto-detection of jdk location])],
+	    [],
+	    [with_jdk_auto_detect=yes])
+
+if test "x$with_jdk_auto_detect" = "xyes"; then
+	CUR_DIR=`pwd`
+	SRC_DIR=`dirname $0`
+	SRC_DIR=`cd $SRC_DIR;pwd;cd $CUR_DIR`
+	$JAVAC $SRC_DIR/JavaInfo.java
+	JDK_HOME="`CLASSPATH=$SRC_DIR $JAVA JavaInfo`"
+else
+	if test -z "$JDK_HOME"; then
+		AC_MSG_ERROR("You should specify JDK_HOME")
+	fi
+fi
+AC_SUBST(JDK_HOME)
+
 CHECK_JNI
 
 AC_MSG_CHECKING([JDK version])
diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index 49ab18b..e9f8b16 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -3,12 +3,12 @@ JARFILES=java-atk-wrapper.jar
 ALL_CLASSES=org/GNOME/Accessibility/*.class
 DEP_CLASSES=$(wildcard $(ALL_CLASSES))
 
-java_atk_wrapperdir = $(prefix)/share/jar
+java_atk_wrapperdir = $(JDK_HOME)/jre/lib/ext
 java_atk_wrapper_DATA = $(JARFILES)
 
 EXTRA_DIST = $(properties_DATA)
 
-propertiesdir = $(prefix)/share/jar
+propertiesdir = $(JDK_HOME)/jre/lib
 properties_DATA = accessibility.properties
 
 $(JARFILES) : $(DEP_CLASSES)