/hg/release/icedtea6-1.7: Don't link the plugin with libxul libr...

[Andrew John Hughes]

On 13 July 2010 23:51,  <doko at icedtea.classpath.org> wrote:
> changeset 6293abfc6106 in /hg/release/icedtea6-1.7
> details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=6293abfc6106
> author: doko at ubuntu.com
> date: Wed Jul 14 00:51:32 2010 +0200
>
>        Don't link the plugin with libxul libraries
>
>        2010-07-13 Matthias Klose <doko at ubuntu.com>
>
>         * acinclude.m4 (IT_CHECK_PLUGIN_DEPENDENCIES): Don't require
>        libxul libraries. (IT_CHECK_XULRUNNER_VERSION): Use
>        pkgconfig --modversion as version.
>
>
> diffstat:
>
> 2 files changed, 15 insertions(+), 53 deletions(-)
> ChangeLog    |    6 +++++
> acinclude.m4 |   62 ++++++++--------------------------------------------------
>
> diffs (100 lines):
>
> diff -r fe894254bf91 -r 6293abfc6106 ChangeLog
> --- a/ChangeLog Tue Jul 13 14:48:45 2010 -0400
> +++ b/ChangeLog Wed Jul 14 00:51:32 2010 +0200
> @@ -1,3 +1,9 @@ 2010-07-13  Deepak Bhole <dbhole at redhat.
> +2010-07-13  Matthias Klose  <doko at ubuntu.com>
> +
> +       * acinclude.m4 (IT_CHECK_PLUGIN_DEPENDENCIES): Don't require libxul
> +       libraries.
> +       (IT_CHECK_XULRUNNER_VERSION): Use pkgconfig --modversion as version.
> +
>  2010-07-13  Deepak Bhole <dbhole at redhat.com>
>
>        * plugin/icedteanp/IcedTeaJavaRequestProcessor.h: Set timeout to 120
> diff -r fe894254bf91 -r 6293abfc6106 acinclude.m4
> --- a/acinclude.m4      Tue Jul 13 14:48:45 2010 -0400
> +++ b/acinclude.m4      Wed Jul 14 00:51:32 2010 +0200
> @@ -1292,21 +1292,16 @@ if test "x${enable_plugin}" = "xyes" -o
>   AC_SUBST(GTK_CFLAGS)
>   AC_SUBST(GTK_LIBS)
>
> -
>   if $PKG_CONFIG --atleast-version 1.9.2 libxul 2>&AS_MESSAGE_LOG_FD ; then
>     if test "x${enable_npplugin}" != "xyes" ; then
>       AC_MSG_WARN([The old plugin does not work with xulrunner >= 1.9.2.  Enabling new plugin.])
> -      enable_npplugin=yes;
> +      enable_npplugin=yes
>     fi
> -    xullibs=libxul
> -  else
> -    xullibs="libxul libxul-unstable"
>   fi
>
>   if test "x${enable_npplugin}" = "xyes" ;
>   then
> -    PKG_CHECK_MODULES(MOZILLA, \
> -      mozilla-plugin ${xullibs})
> +    PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
>
>     AC_SUBST(MOZILLA_CFLAGS)
>     AC_SUBST(MOZILLA_LIBS)
> @@ -1330,52 +1325,13 @@ AC_REQUIRE([IT_CHECK_PLUGIN_DEPENDENCIES
>  AC_REQUIRE([IT_CHECK_PLUGIN_DEPENDENCIES])
>  if test "x${enable_plugin}" = "xyes" -o "x${enable_npplugin}" = "xyes"
>  then
> -  AC_LANG_PUSH([C++])
> -  OLDCPPFLAGS="$CPPFLAGS"
> -  CPPFLAGS="$CPPFLAGS $MOZILLA_CFLAGS"
> -
> -  AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],
> -      [AC_RUN_IFELSE(
> -        [AC_LANG_PROGRAM([[
> -#include <mozilla-config.h>
> -#include <math.h>
> -#include <string.h>
> -#include <stdlib.h>
> -#include <stdio.h>
> -]],[[
> -int version = 0;
> -const char* token = NULL;
> -int power=6;
> -FILE *datafile;
> -
> -datafile = fopen ("conftest.vdata", "w");
> -if (!datafile) return 1;
> -
> -// 32 chars is more than enough to hold version
> -char* mozilla_version = (char*) malloc(32*sizeof(char));
> -snprintf(mozilla_version, 32, "%s", MOZILLA_VERSION);
> -
> -token = strtok(mozilla_version, ".");
> -while (token)
> -{
> -    version += atoi(token)*(pow(10, power));
> -    power -=2;
> -    token = strtok(NULL, ".");
> -}
> -
> -fprintf (datafile, "%d\n", version);
> -free(mozilla_version);
> -if (fclose(datafile)) return 1;
> -
> -return EXIT_SUCCESS;
> -]])],
> -    [xulrunner_cv_collapsed_version="$(cat conftest.vdata)"],
> -    [AC_MSG_FAILURE([cannot determine xulrunner version])])],
> -  [xulrunner_cv_collapsed_version="190000"])
> -
> -  CPPFLAGS="$OLDCPPFLAGS"
> -  AC_LANG_POP([C++])
> -
> +  AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],[
> +    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}'`
> +    else
> +      AC_MSG_FAILURE([cannot determine xulrunner version])
> +    fi])
>   AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version)
>  fi
>  ])
>

Why has this been backported to 1.7?  It hasn't been approved.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8