[patch] don't link the plugin with libxul libraries

[Deepak Bhole]

* Andrew John Hughes <ahughes at redhat.com> [2010-07-14 05:46]:
> On 13 July 2010 19:07, Deepak Bhole <dbhole at redhat.com> wrote:
> > * Matthias Klose <doko at ubuntu.com> [2010-07-13 08:41]:
> >> On 13.07.2010 12:45, Matthias Klose wrote:
> >> >This was pointed out at http://bugs.debian.org/576361
> >> >It's not necessary to link the plugin with the libraries defined by the
> >> >libxul pkgconfig. Checked that with builds on Debian unstable (1.9.1)
> >> >and Ubuntu lucid (1.9.2).
> >>
> >> that was too easy ... apparently the configure check is the only
> >> thing which needs the libxul libs.  So rewrite the configure test ro
> >> use the version information from pkg-config --modversion libxul and
> >> use an awk script for the collapsed version.
> >>
> >
> > This should be fine. Keep in mind that the build itself will still be
> > version specific, as there were incompatible API changes between
> > xulrunner 1.9.1 and 1.9.2. This issue will be gone once the final
> > Firefox 3.5.x is out sometime in August[1], and then we can remove support
> > for xulrunner < 1.9.2.
> >
> > Your patch will remove linking dependency on libxul altogether though,
> > which is nice.
> >
> > Assuming you have tested this, please go ahead and commit.
> >
> > 1: http://support.mozilla.com/en-US/forum/1/620972
> >
> 
> Why has this also been applied to the stable 1.7 branch?  Especially
> as I haven't heard of anyone testing this on Fedora yet...  Can
> someone please confirm it still works on that platform? We spent a lot
> of time getting the plugin building for 1.7 before release.
> 

I tested it on my F13 system and it was fine. You have more experiences
with releases than me though. And if you have reservations, I am fine 
with backing it out as well.

Cheers,
Deepak

> > Cheers,
> > Deepak
> >
> >>   Matthias
> >
> >> 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.
> >>
> >> diff -r 0a636a2e9b0d acinclude.m4
> >> --- a/acinclude.m4    Mon Jul 12 11:13:35 2010 -0400
> >> +++ b/acinclude.m4    Tue Jul 13 14:35:12 2010 +0200
> >> @@ -1461,15 +1461,7 @@
> >>    AC_SUBST(GTK_CFLAGS)
> >>    AC_SUBST(GTK_LIBS)
> >>
> >> -
> >> -  if $PKG_CONFIG --atleast-version 1.9.2 libxul 2>&AS_MESSAGE_LOG_FD ; then
> >> -    xullibs=libxul
> >> -  else
> >> -    xullibs="libxul libxul-unstable"
> >> -  fi
> >> -
> >> -  PKG_CHECK_MODULES(MOZILLA, \
> >> -    mozilla-plugin ${xullibs})
> >> +  PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
> >>
> >>    AC_SUBST(MOZILLA_CFLAGS)
> >>    AC_SUBST(MOZILLA_LIBS)
> >> @@ -1482,52 +1474,13 @@
> >>  AC_REQUIRE([IT_CHECK_PLUGIN_DEPENDENCIES])
> >>  if test "x${enable_plugin}" = "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
> >>  ])
> >
> >
> 
> 
> 
> -- 
> 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