Mercurial > hg > release > icedtea6-1.6
changeset 1717:0fe3a89b2dfb
Make sure the RHINO_JAR variable always refers to a valid file.
2010-02-19 Andrew John Hughes <ahughes@redhat.com>
* acinclude.m4:
(FIND_RHINO_JAR): Clear RHINO_JAR variable
if it still contains "no" at the end of the
macro.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Fri, 19 Feb 2010 14:19:25 +0000 |
| parents | 9ad8a3d44a67 |
| children | 017e76a6cef2 |
| files | ChangeLog acinclude.m4 |
| diffstat | 2 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Mar 18 14:56:35 2010 +0000 +++ b/ChangeLog Fri Feb 19 14:19:25 2010 +0000 @@ -1,3 +1,10 @@ +2010-02-19 Andrew John Hughes <ahughes@redhat.com> + + * acinclude.m4: + (FIND_RHINO_JAR): Clear RHINO_JAR variable + if it still contains "no" at the end of the + macro. + 2010-02-17 Andrew John Hughes <ahughes@redhat.com> PR icedtea/179
--- a/acinclude.m4 Thu Mar 18 14:56:35 2010 +0000 +++ b/acinclude.m4 Fri Feb 19 14:19:25 2010 +0000 @@ -639,6 +639,10 @@ fi AC_MSG_RESULT(${RHINO_JAR}) AM_CONDITIONAL(WITH_RHINO, test x"${RHINO_JAR}" != "xno") +dnl Clear RHINO_JAR if it doesn't contain a valid filename + if test x"${RHINO_JAR}" = "xno"; then + RHINO_JAR= + fi AC_SUBST(RHINO_JAR) ])