# HG changeset patch # User doko@ubuntu.com # Date 1330376770 -3600 # Node ID 3c0f13d17deb7b393d24e0deed8f27073672be9e # Parent 08b063e5536bac82706e697970e6ec5d3bf83955 Use the mozilla-plugin pkgconfig module if the libxul module is not available 2012-02-27 Matthias Klose * acinclude.m4 (IT_CHECK_PLUGIN_DEPENDENCIES): Use the mozilla-plugin pkgconfig module if the libxul module is not available. diff -r 08b063e5536b -r 3c0f13d17deb ChangeLog --- a/ChangeLog Mon Feb 27 22:05:46 2012 +0100 +++ b/ChangeLog Mon Feb 27 22:06:10 2012 +0100 @@ -1,3 +1,8 @@ +2012-02-27 Matthias Klose + + * acinclude.m4 (IT_CHECK_PLUGIN_DEPENDENCIES): Use the mozilla-plugin + pkgconfig module if the libxul module is not available. + 2012-02-27 Matthias Klose * acinclude.m4 (IT_FIND_JAVA): Set VERSION_DEFS. diff -r 08b063e5536b -r 3c0f13d17deb acinclude.m4 --- a/acinclude.m4 Mon Feb 27 22:05:46 2012 +0100 +++ b/acinclude.m4 Mon Feb 27 22:06:10 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])