Find java with configure, do not include preprocessed jgf script in binary dists.

5 files changed, 27 insertions, 12 deletions

diff --git a/src/INSTALL.binary b/src/INSTALL.binary
index 94ef1676f..e9b8f0295 100644
--- a/src/INSTALL.binary
+++ b/src/INSTALL.binary
@@ -4,10 +4,12 @@ Installing a binary GF distribution:
 
    $ gtar -zxf GF-2.0-[host].tar.gz
 
-2. If you don't want to install the files under /usr/local, 
-   run configure with the right installation prefix:
+2. Run configure:
 
-   E.g.
+   $ ./configure
+
+   If you don't want to install the files under /usr/local, 
+   run configure with the right installation prefix. E.g.:
 
    $ ./configure --prefix=/usr
 
diff --git a/src/Makefile b/src/Makefile
index d714f5a99..6c9aedded 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -134,7 +134,7 @@ binary-dist:
 	./configure --host="$(host)" CPPFLAGS="`lib__readline -I` `lib__ncurses -I`" LDFLAGS="`lib__readline -l` `lib__ncurses -l`"
 #	make unix gfdoc jar
 	make gfdoc jar
-	$(INSTALL) ../bin/gf util/gfdoc jgf $(BIN_DIST_DIR)
+	$(INSTALL) ../bin/gf util/gfdoc $(BIN_DIST_DIR)
 	$(INSTALL) -m 0644 java/gf-java.jar $(BIN_DIST_DIR)
 	$(INSTALL) configure $(BIN_DIST_DIR)
 	$(INSTALL) -m 0644 config.mk.in jgf.in $(BIN_DIST_DIR)
diff --git a/src/ReleaseProcedure b/src/ReleaseProcedure
index f586a6b2f..4b725b1f1 100644
--- a/src/ReleaseProcedure
+++ b/src/ReleaseProcedure
@@ -46,15 +46,13 @@ Procedure for making a GF release:
     e.g. banded.medic.chalmers.se):
 
    $ cd src
-   $ ./configure --host=i386-pc-linux-gnu
-   $ make binary-dist
+   $ ./configure --host=i386-pc-linux-gnu && make binary-dist
 
-12. Build a generic binary sparc/solaris package (should be done on a Solaris box,
-    e.g. remote1.cs.chalmers.se):
+12. Build a generic binary sparc/solaris package (should be done 
+    on a Solaris box, e.g. remote1.cs.chalmers.se):
 
    $ cd src
-   $ ./configure --host=sparc-sun-solaris2
-   $ make binary-dist
+   $ ./configure --host=sparc-sun-solaris2 && make binary-dist
 
 13. Build a Mac OS X package:
 
diff --git a/src/configure.ac b/src/configure.ac
index b8dc606b2..18815c69b 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -4,7 +4,7 @@ AC_INIT([GF],[2.0],[aarne@cs.chalmers.se],[GF])
 
 AC_PREREQ(2.53)
 
-AC_REVISION($Revision: 1.5 $)
+AC_REVISION($Revision: 1.6 $)
 
 AC_CONFIG_FILES([config.mk jgf])
 
@@ -54,6 +54,19 @@ AC_ARG_WITH(jar,
 AC_SUBST(JAR)
 
 dnl ***********************************************
+dnl java
+dnl ***********************************************
+
+AC_ARG_WITH(java,
+  AC_HELP_STRING([--with-java=<java command>],
+               [Use a different command instead of
+                'java' for the Java Virtual Machine.]),
+  [AC_CHECK_FILE("$withval",JAVA="$withval",[AC_PATH_PROG(JAVA,"$withval")])],
+  [AC_PATH_PROG(JAVA,java)])
+
+AC_SUBST(JAVA)
+
+dnl ***********************************************
 dnl Other programs
 dnl ***********************************************
 
diff --git a/src/jgf.in b/src/jgf.in
index ff9adec02..cd79cb7c7 100644
--- a/src/jgf.in
+++ b/src/jgf.in
@@ -5,7 +5,9 @@ exec_prefix=@exec_prefix@
 GF_BIN_DIR=@bindir@
 GF_LIB_DIR=@libdir@/GF-@PACKAGE_VERSION@
 
+JAVA=@JAVA@
+
 GF=$GF_BIN_DIR/gf
 JARFILE=$GF_LIB_DIR/gf-java.jar
 
-exec java -jar $JARFILE "$GF -java $*"
+exec $JAVA -jar $JARFILE "$GF -java $*"