Mercurial > hg > release > icedtea-web-1.2
changeset 334:07717ba83e5f
Use the mozilla-plugin pkgconfig module if the libxul module is not available
2012-02-27 Matthias Klose <doko@ubuntu.com>
* acinclude.m4 (IT_CHECK_PLUGIN_DEPENDENCIES): Use the mozilla-plugin
pkgconfig module if the libxul module is not available.
| author | doko@ubuntu.com |
|---|---|
| date | Mon, 27 Feb 2012 22:04:05 +0100 |
| parents | c20a74b4136c |
| children | d3b97728550a |
| files | ChangeLog acinclude.m4 |
| diffstat | 2 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Feb 27 22:03:15 2012 +0100 +++ b/ChangeLog Mon Feb 27 22:04:05 2012 +0100 @@ -1,3 +1,8 @@ +2012-02-27 Matthias Klose <doko@ubuntu.com> + + * acinclude.m4 (IT_CHECK_PLUGIN_DEPENDENCIES): Use the mozilla-plugin + pkgconfig module if the libxul module is not available. + 2012-02-27 Matthias Klose <doko@ubuntu.com> * acinclude.m4 (IT_FIND_JAVA): Set VERSION_DEFS.
--- a/acinclude.m4 Mon Feb 27 22:03:15 2012 +0100 +++ b/acinclude.m4 Mon Feb 27 22:04:05 2012 +0100 @@ -396,6 +396,9 @@ if pkg-config --modversion libxul >/dev/null 2>&1 then xulrunner_cv_collapsed_version=`pkg-config --modversion libxul | awk -F. '{power=6; v=0; for (i=1; i <= NF; i++) {v += $i * 10 ^ power; power -=2}; print v}'` + elif pkg-config --modversion mozilla-plugin >/dev/null 2>&1 + then + xulrunner_cv_collapsed_version=`pkg-config --modversion mozilla-plugin | awk -F. '{power=6; v=0; for (i=1; i <= NF; i++) {v += $i * 10 ^ power; power -=2}; print v}'` else AC_MSG_FAILURE([cannot determine xulrunner version]) fi])