From f753d01a0b4771ad84649ebbdf7ad178b2308690 Mon Sep 17 00:00:00 2001
From: bringert <unknown>
Date: Wed, 23 Jun 2004 13:09:56 +0000
Subject: Added ReleaseProcedure. Added configureation and makefiles for binary
 packages. Configure now lets you specify which javac and jar to use.

---
 src/configure.ac | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

(limited to 'src/configure.ac')

diff --git a/src/configure.ac b/src/configure.ac
index c36de72ea..b8dc606b2 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -4,11 +4,11 @@ AC_INIT([GF],[2.0],[aarne@cs.chalmers.se],[GF])
 
 AC_PREREQ(2.53)
 
-AC_REVISION($Revision: 1.4 $)
+AC_REVISION($Revision: 1.5 $)
 
 AC_CONFIG_FILES([config.mk jgf])
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
 
 dnl ***********************************************
@@ -27,6 +27,32 @@ GHCI=$(dirname $GHC)/ghci
 AC_SUBST(GHC)
 AC_SUBST(GHCI)
 
+dnl ***********************************************
+dnl javac
+dnl ***********************************************
+
+AC_ARG_WITH(javac,
+  AC_HELP_STRING([--with-javac=<javac command>],
+               [Use a different command instead of
+                'javac' for the Java compiler.]),
+  [AC_CHECK_FILE("$withval",JAVAC="$withval",[AC_PATH_PROG(JAVAC,"$withval")])],
+  [AC_PATH_PROG(JAVAC,javac)])
+
+AC_SUBST(JAVAC)
+
+dnl ***********************************************
+dnl jar
+dnl ***********************************************
+
+AC_ARG_WITH(jar,
+  AC_HELP_STRING([--with-jar=<jar command>],
+               [Use a different command instead of
+                'jar' for the Java archive tool.]),
+  [AC_CHECK_FILE("$withval",JAR="$withval",[AC_PATH_PROG(JAR,"$withval")])],
+  [AC_PATH_PROG(JAR,jar)])
+
+AC_SUBST(JAR)
+
 dnl ***********************************************
 dnl Other programs
 dnl ***********************************************
-- 
cgit v1.2.3