diff options
| author | doko <[email protected]> | 2012-02-27 21:53:21 +0100 |
|---|---|---|
| committer | doko <[email protected]> | 2012-02-27 21:53:21 +0100 |
| commit | 39f1ff14b49aa0a6cf35269025991eb819e60d78 (patch) | |
| tree | 08e45f169da3d79eff50be2121b523fa7abeb2b9 /acinclude.m4 | |
| parent | a6b12e16fd330edb07600ff867822a65245e151a (diff) | |
Define mime descriptions for 1.7, when built with Java7
2012-02-27 Matthias Klose <[email protected]>
* acinclude.m4 (IT_FIND_JAVA): Set VERSION_DEFS.
* Makefile.am ($(PLUGIN_DIR)/%.o): Pass $(VERSION_DEFS)
* IcedTeaNPPlugin.cc (PLUGIN_MIME_DESC): Define in terms
of HAVE_JAVA7.
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index c819d0f..a330d0f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -396,6 +396,9 @@ then 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]) @@ -673,6 +676,11 @@ AC_DEFUN_ONCE([IT_FIND_JAVA], fi AC_MSG_RESULT(${JAVA}) AC_SUBST(JAVA) + JAVA_VERSION=`$JAVA -version 2>&1 | sed -n '1s/@<:@^"@:>@*"\(.*\)"$/\1/p'` + case "${JAVA_VERSION}" in + 1.7*) VERSION_DEFS='-DHAVE_JAVA7';; + esac + AC_SUBST(VERSION_DEFS) ]) AC_DEFUN_ONCE([IT_FIND_KEYTOOL], |