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

[Deepak Bhole]

* 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..

Thanks,
Deepak

>    Matthias
> 
> 

> Description: <short summary of the patch>
>  TODO: Put a short summary on the line above and replace this paragraph
>  with a longer explanation of this change. Complete the meta-information
>  with other relevant fields (see below for details). To make it easier, the
>  information below has been extracted from the changelog. Adjust it or drop
>  it.
>  .
>  icedtea-web (1.2~pre1-0ubuntu1) precise; urgency=low
>  .
>    * Update to hg 20120203, taken from the icedtea-web-1.2 release branch.
>    * Build separate plugin packages for OpenJDK 6 and OpenJDK 7, needed
>      to provide the path to the runtime in the plugin.
>    * Use icedtea-<jre version>-plugin as the name for both plugin packages.
>    * Remove icedtea-web-1.1.4-npapi-fix.patch, fixed upstream.
>    * Pass -n to gzip when compressing manpages to be Multi-Arch: same safe.
>    * Build multiarch packages.
> Author: Matthias Klose <doko at ubuntu.com>
> 
> ---
> The information above should follow the Patch Tagging Guidelines, please
> checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
> are templates for supplementary fields that you might want to add:
> 
> Origin: <vendor|upstream|other>, <url of original patch>
> Bug: <url in upstream bugtracker>
> Bug-Debian: http://bugs.debian.org/<bugnumber>
> Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
> Forwarded: <no|not-needed|url proving that it has been forwarded>
> Reviewed-By: <name and email of someone who approved the patch>
> Last-Update: <YYYY-MM-DD>
> 
> --- icedtea-web-1.2~pre1.orig/acinclude.m4
> +++ icedtea-web-1.2~pre1/acinclude.m4
> @@ -393,9 +393,9 @@ AC_REQUIRE([IT_CHECK_PLUGIN_DEPENDENCIES
>  if test "x${enable_plugin}" = "xyes"
>  then
>    AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],[
> -    if pkg-config --modversion libxul >/dev/null 2>&1
> +    if pkg-config --modversion mozilla-plugin >/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}'`
> +      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])
> --- icedtea-web-1.2~pre1.orig/configure
> +++ icedtea-web-1.2~pre1/configure
> @@ -6824,9 +6824,9 @@ if ${xulrunner_cv_collapsed_version+:} f
>    $as_echo_n "(cached) " >&6
>  else
>  
> -    if pkg-config --modversion libxul >/dev/null 2>&1
> +    if pkg-config --modversion mozilla-plugin >/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}'`
> +      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
>        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
>  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
>