Mercurial > hg > release > icedtea-web-1.8
changeset 1506:61cfcf1170a5
fix cargo detection in autoconf
| author | Alex Kashchenko <akashche@redhat.com> |
|---|---|
| date | Wed, 05 Sep 2018 23:13:59 +0100 |
| parents | c7ec25fa7f31 |
| children | e7e17fa6a127 |
| files | ChangeLog configure.ac |
| diffstat | 2 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Sep 05 19:10:43 2018 +0200 +++ b/ChangeLog Wed Sep 05 23:13:59 2018 +0100 @@ -18,6 +18,11 @@ * rust-launcher/src/utils.rs: class for various utility methods. Including testing subclass +2018-09-04 Alex Kashchenko <akashche@redhat.com> + + Fix cargo detection in autoconf + * autoconf.ac: add missed check whether cargo was found in PATH + 2018-08-13 Jiri Vanek <jvanek@redhat.com> * LICENSE: new file. Added explicit license with details
--- a/configure.ac Wed Sep 05 19:10:43 2018 +0200 +++ b/configure.ac Wed Sep 05 23:13:59 2018 +0100 @@ -58,10 +58,12 @@ fi else AC_PATH_PROG([CARGO], [cargo],,) - if test x${ENABLE_SHELL_LAUNCHERS} = xno ; then - AC_MSG_ERROR([cargo is used to call rustc for lunchers. No go]) - else - echo "cargo is used to manage lunchers sources, is missing but you have enable-shell-launchers as yes, continuing with UNAMAINTAINED shell launchers only" + if test x"$CARGO" = x ; then + if test x${ENABLE_SHELL_LAUNCHERS} = xno ; then + AC_MSG_ERROR([cargo is used to call rustc for lunchers. No go]) + else + echo "cargo is used to manage lunchers sources, is missing but you have enable-shell-launchers as yes, continuing with UNAMAINTAINED shell launchers only" + fi fi fi AM_CONDITIONAL([ENABLE_NATIVE_LAUNCHERS], [test ! x"$RUSTC" = x -a ! x"$CARGO" = x])