diff options
| author | Brian Jones <cbj@gnu.org> | 2000-12-15 04:58:55 +0000 |
|---|---|---|
| committer | Brian Jones <cbj@gnu.org> | 2000-12-15 04:58:55 +0000 |
| commit | 7bd2e922dec1a769fe416f362241aa913a9ffa2e (patch) | |
| tree | cd712e75cebc9bc3933477608e38a53ef637da2d | |
| parent | 90823461a8693d8333ea2dd487502dea83cc4267 (diff) | |
| download | classpath-7bd2e922dec1a769fe416f362241aa913a9ffa2e.tar.gz | |
* acinclude.m4 : CLASSPATH_INTERNAL_CHECK_JAPHAR takes an optional
argument such that specifying the prefix to Japhar now works,
allowing the user to have multiple installations of Japhar and yet
configure for a specific installation.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | acinclude.m4 | 8 |
2 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2000-12-14 Brian Jones <cbj@gnu.org> + * acinclude.m4 : CLASSPATH_INTERNAL_CHECK_JAPHAR takes an optional + argument such that specifying the prefix to Japhar now works, + allowing the user to have multiple installations of Japhar and yet + configure for a specific installation. + 2000-12-10 Brian Jones <cbj@gnu.org> * configure.in : commented out code to assume Japhar if not otherwise specified. Compiling without Japhar is almost diff --git a/acinclude.m4 b/acinclude.m4 index be1f3412a..d3c9dfdd4 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -23,7 +23,11 @@ esac dnl CLASSPATH_INTERNAL_CHECK_JAPHAR AC_DEFUN(CLASSPATH_INTERNAL_CHECK_JAPHAR, [ - AC_PATH_PROG(JAPHAR_CONFIG, japhar-config, "", $PATH:/usr/local/japhar/bin:/usr/japhar/bin) + if test "$1" = ""; then + AC_PATH_PROG(JAPHAR_CONFIG, japhar-config, "", $PATH:/usr/local/japhar/bin:/usr/japhar/bin) + else + AC_PATH_PROG(JAPHAR_CONFIG, japhar-config, "", $1/bin:$PATH) + fi if test "$JAPHAR_CONFIG" = ""; then echo "configure: cannot find japhar-config: is Japhar installed?" 1>&2 exit 1 @@ -165,6 +169,8 @@ AC_DEFUN(CLASSPATH_CHECK_JAPHAR, [ if test ${withval} = "yes" || test ${withval} = ""; then CLASSPATH_INTERNAL_CHECK_JAPHAR + elif test ${withval} != "no" || test ${withval} != "false"; then + CLASSPATH_INTERNAL_CHECK_JAPHAR(${withval}) fi ], [ |