# HG changeset patch # User doko@ubuntu.com # Date 1330376645 -3600 # Node ID 07717ba83e5f82a55302885978a9ceece83ba526 # Parent c20a74b4136c4b6c92dadedd55c21382e60dc9ca 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 c20a74b4136c -r 07717ba83e5f ChangeLog --- 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 + + * 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 c20a74b4136c -r 07717ba83e5f acinclude.m4 --- 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])