remove supporting files from top level into tools

Author: s-u

configure

@@ -2116,6 +2116,35 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_config_headers="$ac_config_headers src/config.h"
 
+ac_aux_dir=
+for ac_dir in tools "$srcdir"/tools; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in tools \"$srcdir\"/tools" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
 
 # find R home and set CC/CFLAGS
 : ${R_HOME=`R RHOME`}
@@ -3764,7 +3793,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Java run-time works" >&5
 $as_echo_n "checking whether Java run-time works... " >&6; }
-if "$JAVA" -classpath . getsp; then
+if "$JAVA" -classpath tools getsp; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
@@ -3777,7 +3806,7 @@ has_xrs="$want_xrs"
 if test x"$has_xrs" = xauto; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Xrs is supported" >&5
 $as_echo_n "checking whether -Xrs is supported... " >&6; }
-   if "$JAVA" -Xrs -classpath . getsp; then
+   if "$JAVA" -Xrs -classpath tools getsp; then
       has_xrs=yes
    else
       has_xrs=no
@@ -4035,35 +4064,6 @@ $as_echo "yes" >&6; }
   export JAVA_HOME JAVA_CPPFLAGS JAVA_LIBS JAVA_LD_LIBRARY_PATH JAVA JAVAC JAVAH JAR
   CONFIGURED=1
   export CONFIGURED
-  ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
 
 
 subdirs="$subdirs jri"

configure.ac

@@ -2,6 +2,7 @@
 AC_INIT(rJava, 0.8, Simon.Urbanek@r-project.org)
 AC_CONFIG_SRCDIR([src/rJava.c])
 AC_CONFIG_HEADER([src/config.h])
+AC_CONFIG_AUX_DIR([tools])
 
 # find R home and set CC/CFLAGS
 : ${R_HOME=`R RHOME`}
@@ -224,7 +225,7 @@ if test "x$OSNAME" = xDarwin; then
 fi
 
 AC_MSG_CHECKING([whether Java run-time works])
-if "$JAVA" -classpath . getsp; then
+if "$JAVA" -classpath tools getsp; then
    AC_MSG_RESULT(yes)
 else
    AC_MSG_RESULT(no)
@@ -234,7 +235,7 @@ fi
 has_xrs="$want_xrs"
 if test x"$has_xrs" = xauto; then
    AC_MSG_CHECKING([whether -Xrs is supported])
-   if "$JAVA" -Xrs -classpath . getsp; then
+   if "$JAVA" -Xrs -classpath tools getsp; then
       has_xrs=yes
    else
       has_xrs=no

mkdist

@@ -38,7 +38,7 @@ rm -f /tmp/rJava/README.md
 cd /tmp/rJava
 
 if [ "$1" = "-c" ]; then
-    rm -f configure install-sh jri/configure
+    rm -f configure tools/install-sh jri/configure
 fi
 
 if [ -e /tmp/rJava/configure ]; then
@@ -50,7 +50,7 @@ else
     rm -rf autom4te* acloc*
 fi
 
-if [ ! -e install-sh ]; then
+if [ ! -e tools/install-sh ]; then
     echo "Fetching install-sh ..."
     ams=/usr/share/automake/install-sh
     if [ ! -e $ams ]; then
@@ -60,12 +60,12 @@ if [ ! -e install-sh ]; then
 	echo "*** ERROR: install-sh is not present and I can't find it in /usr/share"
 	exit 2
     fi
-    cp $ams install-sh
+    cp $ams tools/install-sh
 fi
 
-if [ ! -e getsp.class ]; then
+if [ ! -e tools/getsp.class ]; then
     echo "Compiling getsp.class"
-    javac -target 1.2 -source 1.2 getsp.java
+    (cd tools && javac -target 1.2 -source 1.2 getsp.java)
 fi
 
 echo "Removing CVS/SVN and backup files ..."