diff options
| author | Sveinung Kvilhaugsvik <sveinung84@users.sourceforge.net> | 2013-09-29 13:34:27 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-10-03 19:20:08 +0200 |
| commit | e4998abcd8cc84ab4a7c80a912726a9d30a21bd8 (patch) | |
| tree | 849931531b46f56620722cbe68e1901086de42e3 /m4/ax_xtra_classpath.m4 | |
| parent | 0c74d543b4e289ccfb2bfd2b2b5292b20e92b4bf (diff) | |
| download | autoconf-archive-e4998abcd8cc84ab4a7c80a912726a9d30a21bd8.tar.gz | |
Add /usr/share/java to ax_xtra_classpath's search path.
Diffstat (limited to 'm4/ax_xtra_classpath.m4')
| -rw-r--r-- | m4/ax_xtra_classpath.m4 | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/m4/ax_xtra_classpath.m4 b/m4/ax_xtra_classpath.m4 index e9b3c83..dc1971e 100644 --- a/m4/ax_xtra_classpath.m4 +++ b/m4/ax_xtra_classpath.m4 @@ -47,15 +47,22 @@ AU_ALIAS([DPS_XTRA_CLASSPATH], [AX_XTRA_CLASSPATH]) AC_DEFUN([AX_XTRA_CLASSPATH],[ AC_PROG_SED -AX_JAVA_CHECK_CLASS([$2],[got="yes"],[got="no"]) -cpxtra=""; saved_cp="${CLASSPATH}"; + +POTENTIAL_LOCATIONS="/usr/share/java" for jhome in `ls -dr /usr/java/* /usr/local/java/* 2> /dev/null`; do for jdir in lib jre/lib; do +POTENTIAL_LOCATIONS="$POTENTIAL_LOCATIONS $jhome/$jdir" +done; done + +AX_JAVA_CHECK_CLASS([$2],[got="yes"],[got="no"]) +cpxtra=""; saved_cp="${CLASSPATH}"; +for location in $POTENTIAL_LOCATIONS; do for jfile in $3; do -if test "x$got" != "xyes" && test -f "$jhome/$jdir/$jfile"; then -CLASSPATH="${saved_cp}:$jhome/$jdir/$jfile" -AX_JAVA_CHECK_CLASS([$2],[got="yes"; cpxtra="$jhome/$jdir/$jfile:"],[got="no"]) -fi; done; done; done +if test "x$got" != "xyes" && test -f "$location/$jfile"; then +CLASSPATH="${saved_cp}:$location/$jfile" +AX_JAVA_CHECK_CLASS([$2],[got="yes"; cpxtra="$location/$jfile:"],[got="no"]) +fi; done; done; + if test "x${saved_cp}" != "x"; then CLASSPATH="${saved_cp}" else unset CLASSPATH; fi |