[icedtea-web] use the mozilla-plugin pkgconfig module for configuration

[Matthias Klose]

On 16.02.2012 20:53, Deepak Bhole wrote:
> * Matthias Klose<doko at ubuntu.com>  [2012-02-04 04:04]:
>> afaiu icedtea-web doesn't depend on libxul, and libxul.pc isn't
>> shipped anymore on some distributions.  the configure should check
>> for mozilla-plugin.pc instead. I see the mozilla-plugin.pc file as
>> part of new and not so new Debian and Ubuntu releases.  This should
>> go to the trunk and the 1.2 branch.
>>
>
> Hi Matthias,
>
> Can you make it check for both? It is hard to know if all distros out
> there (that use icedtea-web) have mozilla-plugin.pc..

done. however, the use of libxul.pc should be deprecated. The only headers used 
are npapi.h, and other np*.h headers. nobody should be using libxul.pc. it only 
existed for embedders and extensions that needed to link against libxul (which 
the plugin doesn't do).

   Matthias
-------------- next part --------------
diff -r c959afd1eba7 acinclude.m4
--- a/acinclude.m4	Mon Feb 13 11:35:49 2012 -0500
+++ b/acinclude.m4	Wed Feb 22 12:41:20 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])