[java-atk-wrapper] Remove functionality of JAVA_HOME auto-detection

[Ke Wang <kewang src gnome org>]

commit 79fcf62023baf856c04cb1accb97486af0503765
Author: Ke Wang <ke wang sun com>
Date:   Wed Jul 8 13:03:05 2009 +0800

    Remove functionality of JAVA_HOME auto-detection

 INSTALL             |   13 ++++++--
 configure.in        |   77 ++++++++++++++++++---------------------------------
 wrapper/Makefile.am |    9 +++--
 3 files changed, 42 insertions(+), 57 deletions(-)
---
diff --git a/INSTALL b/INSTALL
index e363b41..f02b3e7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,10 +4,10 @@ Directions for installing the Java ATK Wrapper for GNOME
 (2) If you obtained java-atk-wrapper from GNOME Git repository:
 
 run ./autogen.sh in the java-atk-wrapper directory (this directory),
-	optionally specifying the "prefix" into which your GNOME 2
-	installation resides (e.g. /opt/gnome-2.0).
+specify JAVA_HOME where JDK resides and optionally specifying the
+"prefix" into which your GNOME 2 installation resides (e.g. /opt/gnome-2.0).
 Example:
-	./autogen.sh --prefix=/opt/gnome-2.0
+	./autogen.sh --prefix=/opt/gnome-2.0 JAVA_HOME=/usr/java
 
 (2a) If you obtained the java-atk-wrapper via a tarfile,
 run "./configure" in this directory with options as above.
@@ -16,3 +16,10 @@ run "./configure" in this directory with options as above.
 
 (4) run make install.
 
+(5) copy java-atk-wrapper.jar to JRE extension library path
+
+	cp $(prefix)/share/jar/java-atk-wrapper.jar /usr/java/jre/lib/ext/
+
+(6) copy accessibility.properties to JRE library path
+
+	cp $(prefix)/share/jar/accessibility.properties /usr/java/jre/lib/
diff --git a/configure.in b/configure.in
index 055e097..b81346c 100644
--- a/configure.in
+++ b/configure.in
@@ -40,25 +40,37 @@ AC_SUBST(ATK_BRIDGE_LIB_NAME)
 JAVA_REQUIRED=1.5
 JAVA_ERROR_MESSAGE="Java $JAVA_REQUIRED or later is required to build java-access-bridge"
 
-AC_CHECK_PROG(JAVA, java, java, no)
-if test "x$JAVA" = xno; then
+AC_ARG_VAR([JAVA_HOME],[Java Runtime Environment location])
+
+if test -z "$JAVA_HOME"; then
+  AC_MSG_ERROR([JAVA_HOME not found])
+else
+  JAVA_PATH=${JAVA_HOME}:${JAVA_HOME}/jre/bin:${JAVA_HOME}/bin:${JAVA_HOME}/../bin:${PATH}
+fi
+
+AC_PATH_PROG(JAVA,java,,${JAVA_PATH})
+if test -z "$JAVA"; then
   AC_MSG_ERROR([$JAVA_ERROR_MESSAGE])
 fi
 AC_SUBST(JAVA)
 
-AC_CHECK_PROG(JAVAC, javac, javac, no)
-if test "x$JAVAC" = xno; then
+AC_PATH_PROG(JAVAC,javac,,${JAVA_PATH})
+if test -z "$JAVAC"; then
   AC_MSG_ERROR([$JAVA_ERROR_MESSAGE])
 fi
 AC_SUBST(JAVAC)
 
-CUR_DIR=`pwd`
-SRC_DIR=`dirname $0`
-SRC_DIR=`cd $SRC_DIR;pwd;cd $CUR_DIR`
-$JAVAC $SRC_DIR/JavaInfo.java
-JAVA_HOME="`CLASSPATH=$SRC_DIR java JavaInfo`"
+AC_PATH_PROG(JAVAH,javah,,${JAVA_PATH})
+if test -z "$JAVAH"; then
+  AC_MSG_ERROR([$JAVA_ERROR_MESSAGE])
+fi
+AC_SUBST(JAVAH)
 
-AC_SUBST(JAVA_HOME)
+AC_PATH_PROG(JAR,jar,,${JAVA_PATH})
+if test -z "$JAR"; then
+  AC_MSG_ERROR([$JAVA_ERROR_MESSAGE])
+fi
+AC_SUBST(JAR)
 
 CHECK_JNI
 
@@ -81,49 +93,14 @@ elif test $j_major_version = $min_major_version; then
       AC_MSG_ERROR([$JAVA_ERROR_MESSAGE])
     fi
   fi
-fi    
-
-dnl AC_MSG_CHECKING([for Java Accessibility Utilities])
-
-if test "x$JAVA_HOME" != "x" ; then
-
-dnl  AC_CHECK_FILE("$JAVA_HOME/jre/lib/ext/jaccess.jar", 
-dnl	JACCESS=yes,
-dnl	AC_MSG_ERROR([$JACCESS_ERROR_MESSAGE]))
-
-  JAVA_PROPERTIES_HOME="$JAVA_HOME/jre/lib"
-else
-  JAVAC_EXE=`which $JAVAC`	
-  JACCESS=`dirname $JAVAC_EXE`
-  JAVA_PROPERTIES_HOME="$JACCESS/../jre/lib"
-  AC_MSG_RESULT([JRE_HOME appears to be $JACCESS/jre])
-
-dnl  AC_CHECK_FILE("$JACCESS/../jre/lib/ext/jaccess.jar", JACCESS=yes,
-dnl                 AC_MSG_ERROR([$JACCESS_ERROR_MESSAGE]))
-
-fi
-
-dnl AC_SUBST(JACCESS)
-
-if test "x$JAVA_HOME" != "x" ; then
-  AC_CHECK_FILE("$JAVA_HOME/bin/jar", JAR="$JAVA_HOME/bin/jar",
-	AC_MSG_ERROR([$JAVA_ERROR_MESSAGE]))
-else
-  AC_CHECK_PROG(JAR, jar, jar, no)
-  if test "x$JAR" = xno; then
-    AC_MSG_ERROR([$JAVA_ERROR_MESSAGE])
-  fi
-fi
-AC_SUBST(JAR)
-
-AC_SUBST(JAVA_PROPERTIES_HOME)
-
-AC_SUBST(EXTRA_JARFILES)
+fi 
 
-AC_PATH_PROG(XPROP,xprop,no)
-if test x$XPROP = xno; then
+XPROP_PATH=${PATH}:/usr/X11/bin
+AC_PATH_PROG(XPROP,xprop,,${XPROP_PATH})
+if test -z "$XPROP"; then
   AC_MSG_ERROR([No xprop found])
 fi
+AC_SUBST(XPROP)
 
 AC_OUTPUT([
 Makefile
diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index 23ee2e7..49ab18b 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -1,17 +1,18 @@
 SUBDIRS=org
 JARFILES=java-atk-wrapper.jar
-DEP_CLASSES=$(wildcard org/GNOME/Accessibility/*.class)
+ALL_CLASSES=org/GNOME/Accessibility/*.class
+DEP_CLASSES=$(wildcard $(ALL_CLASSES))
 
-java_atk_wrapperdir = $(JAVA_HOME)/jre/lib/ext
+java_atk_wrapperdir = $(prefix)/share/jar
 java_atk_wrapper_DATA = $(JARFILES)
 
 EXTRA_DIST = $(properties_DATA)
 
-propertiesdir = $(JAVA_HOME)/jre/lib
+propertiesdir = $(prefix)/share/jar
 properties_DATA = accessibility.properties
 
 $(JARFILES) : $(DEP_CLASSES)
-	$(JAR) cf $(JARFILES) org/GNOME/Accessibility/*.class
+	$(JAR) cf $(JARFILES) $(ALL_CLASSES)
 
 all-local : $(DATA) $(JARFILES)