r1436 - in /experimental/vlc/debian: ./ bug/ patches/
xtophe-guest at users.alioth.debian.org
xtophe-guest at users.alioth.debian.org
Sun Aug 31 23:06:34 UTC 2008
Author: xtophe-guest
Date: Sun Aug 31 23:06:34 2008
New Revision: 1436
URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1436
Log:
vlc 0.9.1
Taken mainly from the videolan branch
the changelog needs work
not yet lintian clean (man page for vlc-wrapper and somehow vlc-data don't get a changelog.Debian.gz)
the soname needs to be removed from the -dev pkg
i'm wondering if the vlc-plugin-* pkg should depends on vlc-nox because currently some do and some don't
Added:
experimental/vlc/debian/libvlc2-dev.install
experimental/vlc/debian/libvlc2-dev.links
experimental/vlc/debian/libvlc2.install
experimental/vlc/debian/libvlc2.links (with props)
experimental/vlc/debian/libvlc2.symbols
experimental/vlc/debian/libvlccore0-dev.install
experimental/vlc/debian/libvlccore0-dev.links
experimental/vlc/debian/libvlccore0.install
experimental/vlc/debian/libvlccore0.links (with props)
experimental/vlc/debian/libvlccore0.symbols
experimental/vlc/debian/patches/050_iceape.diff
experimental/vlc/debian/patches/051_install_scripts.diff
experimental/vlc/debian/patches/900_rebootstrap.diff
experimental/vlc/debian/vlc-data.install (with props)
experimental/vlc/debian/vlc-dbg.links (contents, props changed)
- copied, changed from r1433, experimental/vlc/debian/vlc-plugin-sdl.links
experimental/vlc/debian/vlc-nox.links
experimental/vlc/debian/vlc-plugin-pulse.install
experimental/vlc/debian/vlc-plugin-pulse.links
Removed:
experimental/vlc/debian/libvlc0-dev.install
experimental/vlc/debian/libvlc0-dev.links
experimental/vlc/debian/libvlc0.install
experimental/vlc/debian/patches/001_am_maintainer_mode.diff
experimental/vlc/debian/patches/010_iceape.diff
experimental/vlc/debian/patches/100_no_wx_updates.diff
experimental/vlc/debian/patches/103_kfreebsd.diff
experimental/vlc/debian/patches/405-CVE-2008-3732.diff
experimental/vlc/debian/patches/406-live555-crash.diff
experimental/vlc/debian/patches/407-mms-overflow.diff
experimental/vlc/debian/patches/900_autoconf.diff
experimental/vlc/debian/vlc-plugin-glide.install
experimental/vlc/debian/vlc-plugin-glide.links
experimental/vlc/debian/vlc.desktop
Modified:
experimental/vlc/debian/README.Debian
experimental/vlc/debian/bug/control
experimental/vlc/debian/changelog
experimental/vlc/debian/control
experimental/vlc/debian/copyright
experimental/vlc/debian/mozilla-plugin-vlc.install
experimental/vlc/debian/mozilla-plugin-vlc.links
experimental/vlc/debian/patches/101_certificates_paths.diff
experimental/vlc/debian/patches/102_dejavu_font.diff
experimental/vlc/debian/patches/104_notify.diff
experimental/vlc/debian/patches/200_osdmenu_paths.diff
experimental/vlc/debian/patches/300_manpage_syntax.diff
experimental/vlc/debian/patches/series
experimental/vlc/debian/rules
experimental/vlc/debian/vlc-nox.install
experimental/vlc/debian/vlc-plugin-esd.links
experimental/vlc/debian/vlc-plugin-ggi.links
experimental/vlc/debian/vlc-plugin-jack.install
experimental/vlc/debian/vlc-plugin-jack.links
experimental/vlc/debian/vlc-plugin-sdl.links
experimental/vlc/debian/vlc-plugin-svgalib.links
experimental/vlc/debian/vlc.install
experimental/vlc/debian/vlc.links
experimental/vlc/debian/vlc.menu
Modified: experimental/vlc/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/README.Debian?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/README.Debian (original)
+++ experimental/vlc/debian/README.Debian Sun Aug 31 23:06:34 2008
@@ -4,12 +4,6 @@
- Default configuration is supposed to be latest unstable.
- - Usually VLC will come with a copy of x264 in the extras/ directory,
- because it is not yet available in Debian.
-
- - If there is no CVS directory in the root, debian/rules will assume a
- full build is requested and will clean x264/.
-
- VLC does not link with libdvdcss by default, thus it will not depend
on the libdvdcss packages. However it will use libdvdread that can
optionally open libdvdcss if found. To build packages that link directly
Modified: experimental/vlc/debian/bug/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/bug/control?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/bug/control (original)
+++ experimental/vlc/debian/bug/control Sun Aug 31 23:06:34 2008
@@ -1,1 +1,1 @@
-report-width: vlc vlc-nox libvlc0
+report-width: vlc vlc-nox libvlc2 libvlccore0
Modified: experimental/vlc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/changelog?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/changelog (original)
+++ experimental/vlc/debian/changelog Sun Aug 31 23:06:34 2008
@@ -1,8 +1,30 @@
vlc (0.9.1-1) UNRELEASED; urgency=low
+ * New upstream release
+ + Soname changed
+ + New packages: libvlccore0, libvlccore-dev, vlc-plugin-pulse
+ + Build-depends on libswsale-dev, libshout3-dev, libxpm-dev,
+ zlib1g-dev, liblua5.1-0-dev, libtag1-dev, libqt4-dev and libqt4-dev-tools
+ + Install new modules:
+ - vlc-nox: alphamask, blendbench, bluescreen, canvas, cc, cdg, chain,
+ colorthres, croppadd, dynamicoverlay, erase, faad, gaussianblur, grain,
+ inhibit, lua, memcpy*, mmap, osd_parser, puzzle, remoteosd, rtmp,
+ seamcarving, sharpen, stats, subusf, t140, telepathy, v4l2, vmem
+ - vlc: qt4
+ - vlc-plugin-jack: access_jack
+ + Remove wx interface and glide plugin as they've been dropped by upstream
+ + Temporarly disable libdca module until a pkg with the new
+ API get out of NEW
+ + Delete or refresh patches
+ + New patches:
+ - 050_iceape: taken upstream, build against iceape
+ - 051_install_scripts: taken upstream, install with correct permissions
* Improve watch file
-
- -- Christophe Mutricy <xtophe at videolan.org> Sat, 30 Aug 2008 15:38:10 +0100
+ * Add a vlc-data package for /usr/share (13 MB)
+ * Add a vlc-dbg package (Closes: #§§§§§)
+ *
+
+ -- Christophe Mutricy <xtophe at videolan.org> Mon, 01 Sep 2008 00:51:32 +0200
vlc (0.8.6.i-2) experimental; urgency=high
Modified: experimental/vlc/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/control?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/control (original)
+++ experimental/vlc/debian/control Sun Aug 31 23:06:34 2008
@@ -1,7 +1,7 @@
Source: vlc
Section: graphics
Priority: optional
-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at ists.alioth.debian.org>
Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
Clément Stenac <zorglub at debian.org>,
Loic Minier <lool at dooz.org>,
@@ -12,7 +12,7 @@
nasm,
yasm [amd64 kfreebsd-amd64],
gettext,
- iceape-dev (>= 1.1.9-4),
+ iceape-dev (>= 1.1.9-4),
libgl1-mesa-dev,
liba52-0.7.4-dev,
libaa1-dev,
@@ -20,28 +20,28 @@
libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libaudiofile-dev,
libavahi-client-dev,
- libavcodec-dev (>= 0.cvs20070307-3),
- libavformat-dev (>= 0.cvs20070307-3),
+ libavcodec-dev (>= 0.cvs20060823),
+ libavformat-dev (>= 0.cvs20060823),
+ libswscale-dev,
libcaca-dev (>= 0.99.beta4),
libcdio-dev,
libdvbpsi4-dev,
libdvdnav-dev,
libdvdread-dev (>= 0.9.5),
- libdts-dev,
libesd0-dev,
- libflac-dev (>= 1.1.4-3),
+ libflac-dev (>= 1.1.2-3),
libfreetype6-dev,
libfribidi-dev,
libggi2-dev,
libglib2.0-0,
- libglide2-dev [i386],
libgnutls-dev (>= 1.2.8),
libhal-dev (>= 0.5.5.1-3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libid3tag0-dev,
libidl0,
libimlib2-dev,
liblircclient-dev,
- liblivemedia-dev (>= 2006.03.17),
+ liblivemedia-dev (>= 2008.07.24),
+ liblua5.1-0-dev,
libmad0-dev,
libmatroska-dev (>= 0.8.0),
libmodplug-dev,
@@ -49,19 +49,21 @@
libmpeg2-4-dev,
libncurses5-dev,
libogg-dev,
- libpostproc-dev (>= 0.cvs20070307-3),
+ libpostproc-dev (>= 0.cvs20060823),
libpng12-dev,
+ libpulse-dev,
libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3),
libsmbclient-dev,
libsvga1-dev [amd64 i386],
libsysfs-dev,
+ libtag1-dev,
libtar-dev,
libtheora-dev,
libvcdinfo-dev,
libvorbis-dev,
- libwxgtk2.6-dev,
libx11-dev,
libxext-dev,
+ libxpm-dev,
libxml2-dev,
libxt-dev,
libxv-dev,
@@ -69,55 +71,33 @@
libavc1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libxosd-dev,
+ libnotify-dev,
libtwolame-dev (>= 0.3.8),
libspeex-dev,
libsdl-image1.2-dev,
- libnotify-dev,
- libgtk2.0-dev,
- python-dev,
+ libshout3-dev,
+ libqt4-dev,
+ qt4-dev-tools,
libfaad-dev,
- libjack-dev
+ libjack-dev,
+ zlib1g-dev
Standards-Version: 3.8.0
Homepage: http://www.videolan.org/vlc
-Vcs-Svn: svn://svn.debian.org/svn/pkg-multimedia/unstable/vlc
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-multimedia/videolan/vlc/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/
Package: vlc
Section: graphics
Architecture: any
-Depends: vlc-nox (= ${binary:Version}),
- ${shlibs:Depends},
+Depends: vlc-nox (= ${binary:Version}),
+ ${shlibs:Depends},
${misc:Depends},
ttf-dejavu-core
Suggests: mozilla-plugin-vlc,
videolan-doc
-Replaces: vlc-plugin-dvb (<< 0.5.2-2),
- vlc-plugin-xosd (<< 0.5.2-2),
- vlc-plugin-dv (<< 0.5.2-2),
- vlc-plugin-mad (<< 0.5.2-2),
- vlc-mad (<< 0.5.0),
- vlc-plugin-a52 (<< 0.5.2-2),
- vlc-plugin-ogg (<< 0.5.2-2),
- vlc-plugin-lirc (<< 0.5.2-2),
- vlc-lirc (<< 0.5.0),
- vlc-plugin-aa (<< 0.5.2-2),
- vlc-aa (<< 0.5.0),
- wxvlc (<< 0.8.5-test3.debian-4),
+Replaces: wxvlc (<< 0.8.5-test3.debian-4),
vlc-plugin-alsa (<< 0.8.5-test3.debian-4)
-Conflicts: vlc-plugin-dvb (<< 0.5.2-2),
- vlc-plugin-xosd (<< 0.5.2-2),
- vlc-plugin-dv (<< 0.5.2-2),
- vlc-plugin-mad (<< 0.5.2-2),
- vlc-mad (<< 0.5.0),
- vlc-plugin-a52 (<< 0.5.2-2),
- vlc-plugin-ogg (<< 0.5.2-2),
- vlc-plugin-lirc (<< 0.5.2-2),
- vlc-lirc (<< 0.5.0),
- vlc-plugin-aa (<< 0.5.2-2),
- vlc-aa (<< 0.5.0),
- wxvlc (<< 0.8.5-test3.debian-4),
- vlc-plugin-alsa (<< 0.8.5-test3.debian-4)
+Conflicts: vlc-plugin-alsa (<< 0.8.5-test3.debian-4)
Provides: mp3-decoder
Description: multimedia player and streamer
VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
@@ -133,40 +113,32 @@
most output methods is provided by this package, but features can be added
by installing additional audio plugins (vlc-plugin-esd, vlc-plugin-sdl,
vlc-plugin-arts) or video plugins (vlc-plugin-sdl, vlc-plugin-ggi,
- vlc-plugin-glide, vlc-plugin-svgalib). There is also a web browser plugin
- in the mozilla-plugin-vlc package.
+ vlc-plugin-svgalib). There is also a web browser plugin in the
+ mozilla-plugin-vlc package.
+
+Package: vlc-dbg
+Section: graphics
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ vlc-nox (= ${binary:Version})
+Description: debugging symbols for vlc
+ VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+ DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+ streams from various network sources.
+ .
+ This package contains the debugging symbols for vlc.
Package: vlc-nox
Section: net
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Replaces: vlc-plugin-dvb (<< 0.5.2-2),
- vlc-plugin-xosd (<< 0.5.2-2),
- vlc-plugin-dv (<< 0.5.2-2),
- vlc-plugin-mad (<< 0.5.2-2),
- vlc-mad (<< 0.5.0),
- vlc-plugin-a52 (<< 0.5.2-2),
- vlc-plugin-ogg (<< 0.5.2-2),
- vlc-plugin-lirc (<< 0.5.2-2),
- vlc-lirc (<< 0.5.0),
- vlc-plugin-aa (<< 0.5.2-2),
- vlc-aa (<< 0.5.0),
- wxvlc (<< 0.8.5-test3.debian-4),
+Replaces: wxvlc (<< 0.8.5-test3.debian-4),
vlc-plugin-alsa (<< 0.8.5-test3.debian-4),
vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
-Conflicts: vlc-plugin-dvb (<< 0.5.2-2),
- vlc-plugin-xosd (<< 0.5.2-2),
- vlc-plugin-dv (<< 0.5.2-2),
- vlc-plugin-mad (<< 0.5.2-2),
- vlc-mad (<< 0.5.0),
- vlc-plugin-a52 (<< 0.5.2-2),
- vlc-plugin-ogg (<< 0.5.2-2),
- vlc-plugin-lirc (<< 0.5.2-2),
- vlc-lirc (<< 0.5.0),
- vlc-plugin-aa (<< 0.5.2-2),
- vlc-aa (<< 0.5.0),
- wxvlc (<< 0.8.5-test3.debian-4),
+Conflicts: wxvlc (<< 0.8.5-test3.debian-4),
vlc-plugin-alsa (<< 0.8.5-test3.debian-4),
vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
Provides: mp3-decoder
@@ -183,20 +155,33 @@
for broadcasting purposes or for movie format transformations. Support for
most output methods is provided by this package, but features can be added
by installing additional audio plugins (vlc-plugin-esd, vlc-plugin-sdl,
- vlc-plugin-arts) or video plugins (vlc-plugin-sdl, vlc-plugin-ggi,
- vlc-plugin-glide, vlc-plugin-svgalib). There is also a web browser plugin
- in the mozilla-plugin-vlc package.
+ vlc-plugin-arts, vlc-plugin-jack) or video plugins (vlc-plugin-sdl,
+ vlc-plugin-ggi, vlc-plugin-svgalib). There is also a web browser plugin in
+ the mozilla-plugin-vlc package.
.
This package contains a version of VLC that does not require X and that is
thus suitable for headless servers.
-Package: libvlc0
+Package: libvlccore0
Section: libs
Architecture: any
+Depends: vlc-data,
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: multimedia player and streamer library
+ This package contains the shared library required by VLC modules and libvlc.
+ .
+ VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+ DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+ streams from various network sources.
+
+Package: libvlc2
+Section: libs
+Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Replaces: vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
-Conflicts: vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
+Replaces: vlc (<< 0.8.6.c-6), libvlc0, libvlc1
+Conflicts: vlc (<< 0.8.6.c-6), libvlc0, libvlc1
Description: multimedia player and streamer library
This package contains the shared library required by applications using VLC
features.
@@ -205,15 +190,27 @@
DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
streams from various network sources.
-Package: libvlc0-dev
+Package: libvlccore0-dev
Section: libdevel
Architecture: any
-Depends: libvlc0 (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
+Depends: libvlccore0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: development files for VLC
This package contains headers and a static library required to build plugins
- for VLC, or standalone applications that use VLC features.
+ for VLC.
+ .
+ VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+ DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+ streams from various network sources.
+
+Package: libvlc2-dev
+Section: libdevel
+Architecture: any
+Depends: libvlc2 (= ${binary:Version}), libvlccore0-dev, ${shlibs:Depends}, ${misc:Depends}
+Replaces: libvlc0-dev, libvlc1-dev
+Conflicts: libvlc0-dev, libvlc1-dev
+Description: development files for VLC
+ This package contains headers and a static library required to build
+ standalone applications that use VLC features.
.
VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
@@ -221,11 +218,7 @@
Package: vlc-plugin-esd
Architecture: any
-Depends: vlc-nox,
- ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: vlc-esd (<< 0.5.0)
-Replaces: vlc-esd (<< 0.5.0)
+Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
Description: Esound audio output plugin for VLC
This plugin adds support for the Enlightened Sound Daemon to the VLC
media player. To activate it, use the `--aout esd' flag or select the
@@ -235,13 +228,19 @@
DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
streams from various network sources.
+Package: vlc-plugin-alsa
+Architecture: all
+Depends: vlc
+Description: dummy transitional package
+ This dummy package is now part of VLC.
+ .
+ VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+ DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+ streams from various network sources.
+
Package: vlc-plugin-sdl
Architecture: any
-Depends: vlc-nox,
- ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: vlc-sdl (<< 0.5.0)
-Replaces: vlc-sdl (<< 0.5.0)
+Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
Description: SDL video and audio output plugin for VLC
This plugin adds support for the Simple DirectMedia Layer library to
the VLC media player. To activate it, use the `--vout sdl' or
@@ -254,11 +253,7 @@
Package: vlc-plugin-ggi
Architecture: any
-Depends: vlc-nox,
- ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: vlc-ggi (<< 0.5.0)
-Replaces: vlc-ggi (<< 0.5.0)
+Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
Description: GGI video output plugin for VLC
This is a GGI plugin for the VLC media player. To activate it, use
the `--vout ggi' flag or select the `ggi' video output plugin from the
@@ -268,28 +263,9 @@
DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
streams from various network sources.
-Package: vlc-plugin-glide
-Architecture: i386
-Depends: vlc-nox,
- ${shlibs:Depends}
-Conflicts: vlc-glide (<< 0.5.0)
-Replaces: vlc-glide (<< 0.5.0)
-Description: Glide video output plugin for VLC
- This is a Glide (3dfx) plugin for the VLC media player. To activate
- it, use the `--vout glide' flag or select the `glide' video output
- plugin from the preferences menu.
- .
- VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
- DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
- streams from various network sources.
-
Package: vlc-plugin-arts
Architecture: any
-Depends: vlc-nox,
- ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: vlc-arts (<< 0.5.0)
-Replaces: vlc-arts (<< 0.5.0)
+Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
Description: aRts audio output plugin for VLC
This plugin adds support for the aRts Sound System to the VLC media
player. To activate it, use the `--aout arts' flag or select the `arts'
@@ -301,10 +277,7 @@
Package: mozilla-plugin-vlc
Architecture: any
-Depends: vlc-nox (= ${binary:Version}),
- vlc,
- ${shlibs:Depends},
- ${misc:Depends}
+Depends: vlc-nox (= ${binary:Version}), vlc, ${shlibs:Depends}, ${misc:Depends}
Description: multimedia plugin for web browsers based on VLC
This plugin adds support for MPEG, MPEG2, DVD, DivX, Ogg/Vorbis and many
more formats to your Gecko-based web browser (Firefox, Galeon, etc.). The
@@ -318,9 +291,7 @@
Package: vlc-plugin-svgalib
Architecture: amd64 i386
-Depends: vlc-nox (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
+Depends: vlc-nox (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: SVGAlib video output plugin for VLC
This plugin adds support for SVGAlib to the VLC media player. To
activate it, use the `--vout svgalib' flag or select the `svgalib' video
@@ -340,8 +311,31 @@
These plugins add support for JACK to the VLC media player. To
activate the audio output module, use the `--aout jack' flag or
select the `jack' audio output plugin from the preferences menu.
- .
- VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
- DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
- streams from various network sources.
-
+ For the jack input, use `vlc jack://channels=...:ports=...'
+ .
+ VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+ DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+ streams from various network sources.
+
+Package: vlc-plugin-pulse
+Architecture: any
+Depends: vlc-nox (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: PulseAudio plugin for VLC
+ This plugin adds support for PulseAudio to the VLC media player. To
+ activate the audio output module, use the `--aout pulse' flag or
+ select the `pulse' audio output plugin from the preferences menu.
+ .
+ VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+ DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+ streams from various network sources.
+
+Package: vlc-data
+Architecture: all
+Description: Common data for VLC
+ Localisations, HTTP interface files, Lua scripts for VLC media player
+ .
+ VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+ DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+ streams from various network sources.
Modified: experimental/vlc/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/copyright?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/copyright (original)
+++ experimental/vlc/debian/copyright Sun Aug 31 23:06:34 2008
@@ -1,8 +1,7 @@
This package was debianized by Sam Hocevar <sam at zoy.org> on
Mon, 13 Mar 2000 02:21:45 +0100.
-It was taken from http://download.videolan.org/pub/vlc/, and the source
-tarball also contains the x264 tree.
+It was taken from http://download.videolan.org/pub/vlc/
1. Copyright holders list
=========================
@@ -10,7 +9,7 @@
With the exception of other files mentioned in this document, all code and
artwork belongs to members of the VideoLAN team <videolan at videolan.org>. See
each file for precise details about its respective authors.
- Copyright (c) 1996-2006 Laurent Aimar <fenrir at via.ecp.fr>
+ Copyright (c) 1996-2008 Laurent Aimar <fenrir at via.ecp.fr>
Marc Ariberti <marcari at via.ecp.fr>
Stephan Assmus <stippi at yellowbites.com>
Olivier Aubert <oaubert at lisi dot univ-lyon1 dot fr>
@@ -22,6 +21,7 @@
Stéphane Borel <stef at via.ecp.fr>
Arnaud de Bossoreille de Ribou <bozo at via.ecp.fr>
Filippo Carone <filippo[dontspam]@carone.org>
+ Rafaël "Hanz, David" Carr é<funman at videolanorg>
Tony Castley <tony at castley.net>
Antoine Cellerier <dionoea at videolan.org>
Renaud Dartus <reno at via.ecp.fr>
@@ -42,11 +42,14 @@
Eugenio Jarosiewicz <ej0 at cise.ufl.edu>
Jon Lech Johansen <jon-vl at nanocrew.net>
Michel Kaempf <maxx at via.ecp.fr>
+ Jean-Baptiste Kempf <jb at videolan.org>
+ Pavlov Konstantin <thresh at videolan.oeg>
Felix Kühne <fkuehne at users.sourceforge.net>
Simon Latapie <garf at via.ecp.fr>
Pascal Levesque <pascal.levesque at mindready.com>
Christophe Massiot <massiot at via.ecp.fr>
- Loïc Minier <lool at via.ecp.fr>
+ Loïc Minier <lool at via.ecp.fr
+ Christophe Mutricy <xtophe at videolan.org>
Florian G. Pflug <fgp at phlo.org>
Heiko Panther <heiko.panther at web.de>
Eric Petit <titer at videolan.org>
@@ -59,35 +62,9 @@
Richard Shepherd <richard at rshepherd.demon.co.uk>
Clément Stenac <zorglub at videolan.org>
Peter Surda <shurdeek at panorama.sth.ac.at>
- Olivier Teulière <ipkiss at via.ecp.fr>
- Licensed under the GNU General Public License, version 2 or later.
-
-extras/x264/extras/getopt.c:
- Copyright (c) 2000 The NetBSD Foundation, Inc.
- This code is derived from software contributed to The NetBSD Foundation
- by Dieter Baron and Thomas Klausner.
- Licensed under the NetBSD license (see below).
-
-Other files in extras/x264:
- Copyright (c) 2003-2006 Laurent Aimar <fenrir at via.ecp.fr>
- Alex Izvorski (aizvorski(at)gmail.com)
- Alex Wright (alexw0885(at)hotmail.com)
- Andrew Dunstan
- bobololo
- Christian Heine (sennindemokrit(at)gmx.net)
- Eric Petit <titer at videolan.org>
- Francesco Corriga
- Justin Clay (justin_clay(at)hotmail.com)
- Loren Merritt (lorenm(at)u.washington.edu)
- Måns Rullgård (mru(at)mru.ath.cx)
- Michael Niedermayer (michaelni(at)gmx.at)
- Mike Matsnev (mike(at)po.cs.msu.su)
- Min Chen <chenm001 at 163.com>
- Phil Jensen (philj(at)csufresno.edu)
- Radek Czyz (radoslaw(at)syskin.cjb.net)
- Riccardo Stievano (walkunafraid(at)tin.it)
- Tuukka Toivonen (tuukkat(at)ee.oulu.fi)
- Vincent Torri (Vincent.Torri(at)iecn.u-nancy.fr)
+ Olivier Teulière <ipkiss at via.ecp.fr
+ Yuehua Zhao <zhao908 at hotmail.com>
+ Bo Wang <silencewang at msn.com>
Licensed under the GNU General Public License, version 2 or later.
mozilla/support/npunix.c:
@@ -133,10 +110,6 @@
2000 Eugene Kuznetsov (divx at euro.ru)
2005 Rémi Denis-Courmont <rem#videolan.org>
Originally distributed under LPGL 2.1 (or later) by the Wine project.
- Licensed under the GNU General Public License, version 2 or later.
-
-Files in intl/:
- Copyright (C) 1984, 1989, 1990, 1995-2002 Free Software Foundation, Inc.
Licensed under the GNU General Public License, version 2 or later.
include/mmx.h:
Added: experimental/vlc/debian/libvlc2-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/libvlc2-dev.install?rev=1436&op=file
==============================================================================
--- experimental/vlc/debian/libvlc2-dev.install (added)
+++ experimental/vlc/debian/libvlc2-dev.install Sun Aug 31 23:06:34 2008
@@ -1,0 +1,13 @@
+usr/lib/libvlc.so
+usr/lib/libvlc.a
+usr/lib/pkgconfig/libvlc.pc
+usr/include/vlc/*.h
+#usr/include/vlc/common.h
+#usr/include/vlc/deprecated.h
+#usr/include/vlc/libvlc_events.h
+#usr/include/vlc/libvlc.h
+#usr/include/vlc/libvlc_media_list.h
+#usr/include/vlc/libvlc_structures.h
+#usr/include/vlc/libvlc_vlm.h
+#usr/include/vlc/mediacontrol.h
+#usr/include/vlc/mediacontrol_structures.h
Added: experimental/vlc/debian/libvlc2-dev.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/libvlc2-dev.links?rev=1436&op=file
==============================================================================
--- experimental/vlc/debian/libvlc2-dev.links (added)
+++ experimental/vlc/debian/libvlc2-dev.links Sun Aug 31 23:06:34 2008
@@ -1,0 +1,2 @@
+/usr/share/doc/libvlc2 /usr/share/doc/libvlc2-dev
+/usr/share/bug/libvlc2 /usr/share/bug/libvlc2-dev
Added: experimental/vlc/debian/libvlc2.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/libvlc2.install?rev=1436&op=file
==============================================================================
--- experimental/vlc/debian/libvlc2.install (added)
+++ experimental/vlc/debian/libvlc2.install Sun Aug 31 23:06:34 2008
@@ -1,0 +1,1 @@
+usr/lib/libvlc.so.*
Added: experimental/vlc/debian/libvlc2.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/libvlc2.links?rev=1436&op=file
==============================================================================
--- experimental/vlc/debian/libvlc2.links (added)
+++ experimental/vlc/debian/libvlc2.links Sun Aug 31 23:06:34 2008
@@ -1,0 +1,2 @@
+/usr/share/doc/libvlccore0 /usr/share/doc/libvlc2
+/usr/share/bug/libvlccore0 /usr/share/bug/libvlc2
Propchange: experimental/vlc/debian/libvlc2.links
------------------------------------------------------------------------------
svn:mergeinfo =
Added: experimental/vlc/debian/libvlc2.symbols
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/libvlc2.symbols?rev=1436&op=file
==============================================================================
--- experimental/vlc/debian/libvlc2.symbols (added)
+++ experimental/vlc/debian/libvlc2.symbols Sun Aug 31 23:06:34 2008
@@ -1,0 +1,239 @@
+libvlc.so.2 libvlc2 #MINVER#
+ libvlc_add_intf at Base 0.9.1
+ libvlc_audio_get_channel at Base 0.9.1
+ libvlc_audio_get_mute at Base 0.9.1
+ libvlc_audio_get_track at Base 0.9.1
+ libvlc_audio_get_track_count at Base 0.9.1
+ libvlc_audio_get_volume at Base 0.9.1
+ libvlc_audio_set_channel at Base 0.9.1
+ libvlc_audio_set_mute at Base 0.9.1
+ libvlc_audio_set_track at Base 0.9.1
+ libvlc_audio_set_volume at Base 0.9.1
+ libvlc_audio_toggle_mute at Base 0.9.1
+ libvlc_event_attach at Base 0.9.1
+ libvlc_event_detach at Base 0.9.1
+ libvlc_event_manager_new at Base 0.9.1
+ libvlc_event_manager_register_event_type at Base 0.9.1
+ libvlc_event_manager_release at Base 0.9.1
+ libvlc_event_send at Base 0.9.1
+ libvlc_event_type_name at Base 0.9.1
+ libvlc_exception_clear at Base 0.9.1
+ libvlc_exception_get_message at Base 0.9.1
+ libvlc_exception_init at Base 0.9.1
+ libvlc_exception_raise at Base 0.9.1
+ libvlc_exception_raised at Base 0.9.1
+ libvlc_get_changeset at Base 0.9.1
+ libvlc_get_compiler at Base 0.9.1
+ libvlc_get_fullscreen at Base 0.9.1
+ libvlc_get_input_thread at Base 0.9.1
+ libvlc_get_log_verbosity at Base 0.9.1
+ libvlc_get_version at Base 0.9.1
+ libvlc_get_vlc_id at Base 0.9.1
+ libvlc_log_clear at Base 0.9.1
+ libvlc_log_close at Base 0.9.1
+ libvlc_log_count at Base 0.9.1
+ libvlc_log_get_iterator at Base 0.9.1
+ libvlc_log_iterator_free at Base 0.9.1
+ libvlc_log_iterator_has_next at Base 0.9.1
+ libvlc_log_iterator_next at Base 0.9.1
+ libvlc_log_open at Base 0.9.1
+ libvlc_media_add_option at Base 0.9.1
+ libvlc_media_discoverer_event_manager at Base 0.9.1
+ libvlc_media_discoverer_is_running at Base 0.9.1
+ libvlc_media_discoverer_localized_name at Base 0.9.1
+ libvlc_media_discoverer_media_list at Base 0.9.1
+ libvlc_media_discoverer_new_from_name at Base 0.9.1
+ libvlc_media_discoverer_release at Base 0.9.1
+ libvlc_media_duplicate at Base 0.9.1
+ libvlc_media_event_manager at Base 0.9.1
+ libvlc_media_get_duration at Base 0.9.1
+ libvlc_media_get_meta at Base 0.9.1
+ libvlc_media_get_mrl at Base 0.9.1
+ libvlc_media_get_state at Base 0.9.1
+ libvlc_media_get_user_data at Base 0.9.1
+ libvlc_media_is_preparsed at Base 0.9.1
+ libvlc_media_library_load at Base 0.9.1
+ libvlc_media_library_media_list at Base 0.9.1
+ libvlc_media_library_new at Base 0.9.1
+ libvlc_media_library_release at Base 0.9.1
+ libvlc_media_library_retain at Base 0.9.1
+ libvlc_media_library_save at Base 0.9.1
+ libvlc_media_list_add_file_content at Base 0.9.1
+ libvlc_media_list_add_media at Base 0.9.1
+ libvlc_media_list_count at Base 0.9.1
+ libvlc_media_list_event_manager at Base 0.9.1
+ libvlc_media_list_flat_view at Base 0.9.1
+ libvlc_media_list_hierarchical_node_view at Base 0.9.1
+ libvlc_media_list_hierarchical_view at Base 0.9.1
+ libvlc_media_list_index_of_item at Base 0.9.1
+ libvlc_media_list_insert_media at Base 0.9.1
+ libvlc_media_list_is_readonly at Base 0.9.1
+ libvlc_media_list_item_at_index at Base 0.9.1
+ libvlc_media_list_lock at Base 0.9.1
+ libvlc_media_list_media at Base 0.9.1
+ libvlc_media_list_new at Base 0.9.1
+ libvlc_media_list_player_get_state at Base 0.9.1
+ libvlc_media_list_player_is_playing at Base 0.9.1
+ libvlc_media_list_player_new at Base 0.9.1
+ libvlc_media_list_player_next at Base 0.9.1
+ libvlc_media_list_player_pause at Base 0.9.1
+ libvlc_media_list_player_play at Base 0.9.1
+ libvlc_media_list_player_play_item at Base 0.9.1
+ libvlc_media_list_player_play_item_at_index at Base 0.9.1
+ libvlc_media_list_player_release at Base 0.9.1
+ libvlc_media_list_player_set_media_list at Base 0.9.1
+ libvlc_media_list_player_set_media_player at Base 0.9.1
+ libvlc_media_list_player_stop at Base 0.9.1
+ libvlc_media_list_release at Base 0.9.1
+ libvlc_media_list_remove_index at Base 0.9.1
+ libvlc_media_list_retain at Base 0.9.1
+ libvlc_media_list_set_media at Base 0.9.1
+ libvlc_media_list_unlock at Base 0.9.1
+ libvlc_media_list_view_children_at_index at Base 0.9.1
+ libvlc_media_list_view_children_for_item at Base 0.9.1
+ libvlc_media_list_view_count at Base 0.9.1
+ libvlc_media_list_view_event_manager at Base 0.9.1
+ libvlc_media_list_view_item_added at Base 0.9.1
+ libvlc_media_list_view_item_at_index at Base 0.9.1
+ libvlc_media_list_view_item_deleted at Base 0.9.1
+ libvlc_media_list_view_new at Base 0.9.1
+ libvlc_media_list_view_parent_media_list at Base 0.9.1
+ libvlc_media_list_view_release at Base 0.9.1
+ libvlc_media_list_view_retain at Base 0.9.1
+ libvlc_media_list_view_set_ml_notification_callback at Base 0.9.1
+ libvlc_media_list_view_will_add_item at Base 0.9.1
+ libvlc_media_list_view_will_delete_item at Base 0.9.1
+ libvlc_media_new at Base 0.9.1
+ libvlc_media_new_as_node at Base 0.9.1
+ libvlc_media_new_from_input_item at Base 0.9.1
+ libvlc_media_player_can_pause at Base 0.9.1
+ libvlc_media_player_destroy at Base 0.9.1
+ libvlc_media_player_event_manager at Base 0.9.1
+ libvlc_media_player_get_chapter at Base 0.9.1
+ libvlc_media_player_get_chapter_count at Base 0.9.1
+ libvlc_media_player_get_drawable at Base 0.9.1
+ libvlc_media_player_get_fps at Base 0.9.1
+ libvlc_media_player_get_length at Base 0.9.1
+ libvlc_media_player_get_media at Base 0.9.1
+ libvlc_media_player_get_position at Base 0.9.1
+ libvlc_media_player_get_rate at Base 0.9.1
+ libvlc_media_player_get_state at Base 0.9.1
+ libvlc_media_player_get_time at Base 0.9.1
+ libvlc_media_player_has_vout at Base 0.9.1
+ libvlc_media_player_is_seekable at Base 0.9.1
+ libvlc_media_player_new at Base 0.9.1
+ libvlc_media_player_new_from_input_thread at Base 0.9.1
+ libvlc_media_player_new_from_media at Base 0.9.1
+ libvlc_media_player_pause at Base 0.9.1
+ libvlc_media_player_play at Base 0.9.1
+ libvlc_media_player_release at Base 0.9.1
+ libvlc_media_player_retain at Base 0.9.1
+ libvlc_media_player_set_chapter at Base 0.9.1
+ libvlc_media_player_set_drawable at Base 0.9.1
+ libvlc_media_player_set_media at Base 0.9.1
+ libvlc_media_player_set_position at Base 0.9.1
+ libvlc_media_player_set_rate at Base 0.9.1
+ libvlc_media_player_set_time at Base 0.9.1
+ libvlc_media_player_stop at Base 0.9.1
+ libvlc_media_player_will_play at Base 0.9.1
+ libvlc_media_release at Base 0.9.1
+ libvlc_media_retain at Base 0.9.1
+ libvlc_media_set_state at Base 0.9.1
+ libvlc_media_set_user_data at Base 0.9.1
+ libvlc_media_subitems at Base 0.9.1
+ libvlc_new at Base 0.9.1
+ libvlc_playlist_add at Base 0.9.1
+ libvlc_playlist_add_extended at Base 0.9.1
+ libvlc_playlist_clear at Base 0.9.1
+ libvlc_playlist_delete_item at Base 0.9.1
+ libvlc_playlist_get_current_index at Base 0.9.1
+ libvlc_playlist_get_media_player at Base 0.9.1
+ libvlc_playlist_isplaying at Base 0.9.1
+ libvlc_playlist_items_count at Base 0.9.1
+ libvlc_playlist_lock at Base 0.9.1
+ libvlc_playlist_loop at Base 0.9.1
+ libvlc_playlist_next at Base 0.9.1
+ libvlc_playlist_pause at Base 0.9.1
+ libvlc_playlist_play at Base 0.9.1
+ libvlc_playlist_prev at Base 0.9.1
+ libvlc_playlist_stop at Base 0.9.1
+ libvlc_playlist_unlock at Base 0.9.1
+ libvlc_release at Base 0.9.1
+ libvlc_retain at Base 0.9.1
+ libvlc_set_fullscreen at Base 0.9.1
+ libvlc_set_log_verbosity at Base 0.9.1
+ libvlc_toggle_fullscreen at Base 0.9.1
+ libvlc_toggle_teletext at Base 0.9.1
+ libvlc_video_destroy at Base 0.9.1
+ libvlc_video_get_aspect_ratio at Base 0.9.1
+ libvlc_video_get_crop_geometry at Base 0.9.1
+ libvlc_video_get_height at Base 0.9.1
+ libvlc_video_get_parent at Base 0.9.1
+ libvlc_video_get_spu at Base 0.9.1
+ libvlc_video_get_teletext at Base 0.9.1
+ libvlc_video_get_width at Base 0.9.1
+ libvlc_video_redraw_rectangle at Base 0.9.1
+ libvlc_video_reparent at Base 0.9.1
+ libvlc_video_resize at Base 0.9.1
+ libvlc_video_set_aspect_ratio at Base 0.9.1
+ libvlc_video_set_crop_geometry at Base 0.9.1
+ libvlc_video_set_parent at Base 0.9.1
+ libvlc_video_set_size at Base 0.9.1
+ libvlc_video_set_spu at Base 0.9.1
+ libvlc_video_set_subtitle_file at Base 0.9.1
+ libvlc_video_set_teletext at Base 0.9.1
+ libvlc_video_set_viewport at Base 0.9.1
+ libvlc_video_take_snapshot at Base 0.9.1
+ libvlc_vlm_add_broadcast at Base 0.9.1
+ libvlc_vlm_add_input at Base 0.9.1
+ libvlc_vlm_add_vod at Base 0.9.1
+ libvlc_vlm_change_media at Base 0.9.1
+ libvlc_vlm_del_media at Base 0.9.1
+ libvlc_vlm_get_media_instance_chapter at Base 0.9.1
+ libvlc_vlm_get_media_instance_length at Base 0.9.1
+ libvlc_vlm_get_media_instance_position at Base 0.9.1
+ libvlc_vlm_get_media_instance_rate at Base 0.9.1
+ libvlc_vlm_get_media_instance_seekable at Base 0.9.1
+ libvlc_vlm_get_media_instance_time at Base 0.9.1
+ libvlc_vlm_get_media_instance_title at Base 0.9.1
+ libvlc_vlm_pause_media at Base 0.9.1
+ libvlc_vlm_play_media at Base 0.9.1
+ libvlc_vlm_release at Base 0.9.1
+ libvlc_vlm_seek_media at Base 0.9.1
+ libvlc_vlm_set_enabled at Base 0.9.1
+ libvlc_vlm_set_input at Base 0.9.1
+ libvlc_vlm_set_loop at Base 0.9.1
+ libvlc_vlm_set_mux at Base 0.9.1
+ libvlc_vlm_set_output at Base 0.9.1
+ libvlc_vlm_show_media at Base 0.9.1
+ libvlc_vlm_stop_media at Base 0.9.1
+ libvlc_wait at Base 0.9.1
+ mediacontrol_RGBPicture__free at Base 0.9.1
+ mediacontrol_StreamInformation__free at Base 0.9.1
+ mediacontrol_display_text at Base 0.9.1
+ mediacontrol_exception_cleanup at Base 0.9.1
+ mediacontrol_exception_create at Base 0.9.1
+ mediacontrol_exception_free at Base 0.9.1
+ mediacontrol_exception_init at Base 0.9.1
+ mediacontrol_exit at Base 0.9.1
+ mediacontrol_get_fullscreen at Base 0.9.1
+ mediacontrol_get_libvlc_instance at Base 0.9.1
+ mediacontrol_get_media_player at Base 0.9.1
+ mediacontrol_get_media_position at Base 0.9.1
+ mediacontrol_get_mrl at Base 0.9.1
+ mediacontrol_get_rate at Base 0.9.1
+ mediacontrol_get_stream_information at Base 0.9.1
+ mediacontrol_new at Base 0.9.1
+ mediacontrol_new_from_instance at Base 0.9.1
+ mediacontrol_pause at Base 0.9.1
+ mediacontrol_resume at Base 0.9.1
+ mediacontrol_set_fullscreen at Base 0.9.1
+ mediacontrol_set_media_position at Base 0.9.1
+ mediacontrol_set_mrl at Base 0.9.1
+ mediacontrol_set_rate at Base 0.9.1
+ mediacontrol_set_visual at Base 0.9.1
+ mediacontrol_snapshot at Base 0.9.1
+ mediacontrol_sound_get_volume at Base 0.9.1
+ mediacontrol_sound_set_volume at Base 0.9.1
+ mediacontrol_start at Base 0.9.1
+ mediacontrol_stop at Base 0.9.1
Added: experimental/vlc/debian/libvlccore0-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/libvlccore0-dev.install?rev=1436&op=file
==============================================================================
--- experimental/vlc/debian/libvlccore0-dev.install (added)
+++ experimental/vlc/debian/libvlccore0-dev.install Sun Aug 31 23:06:34 2008
@@ -1,0 +1,4 @@
+usr/lib/libvlccore.so
+usr/lib/libvlccore.a
+usr/lib/pkgconfig/vlc-plugin.pc
+usr/include/vlc/plugins/*.h
Added: experimental/vlc/debian/libvlccore0-dev.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/libvlccore0-dev.links?rev=1436&op=file
==============================================================================
--- experimental/vlc/debian/libvlccore0-dev.links (added)
+++ experimental/vlc/debian/libvlccore0-dev.links Sun Aug 31 23:06:34 2008
@@ -1,0 +1,2 @@
+/usr/share/doc/libvlccore0 /usr/share/doc/libvlccore0-dev
+/usr/share/bug/libvlccore0 /usr/share/bug/libvlccore0-dev
Added: experimental/vlc/debian/libvlccore0.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/libvlccore0.install?rev=1436&op=file
==============================================================================
--- experimental/vlc/debian/libvlccore0.install (added)
+++ experimental/vlc/debian/libvlccore0.install Sun Aug 31 23:06:34 2008
@@ -1,0 +1,1 @@
+usr/lib/libvlccore.so.*
Added: experimental/vlc/debian/libvlccore0.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/libvlccore0.links?rev=1436&op=file
==============================================================================
--- experimental/vlc/debian/libvlccore0.links (added)
+++ experimental/vlc/debian/libvlccore0.links Sun Aug 31 23:06:34 2008
@@ -1,0 +1,2 @@
+/usr/share/doc/vlc-data /usr/share/doc/libvlccore0
+/usr/share/bug/vlc-data /usr/share/bug/libvlccore0
Propchange: experimental/vlc/debian/libvlccore0.links
------------------------------------------------------------------------------
svn:mergeinfo =
Added: experimental/vlc/debian/libvlccore0.symbols
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/libvlccore0.symbols?rev=1436&op=file
==============================================================================
--- experimental/vlc/debian/libvlccore0.symbols (added)
+++ experimental/vlc/debian/libvlccore0.symbols Sun Aug 31 23:06:34 2008
@@ -1,0 +1,531 @@
+libvlccore.so.0 libvlccore0 #MINVER#
+ ACL_AddNet at Base 0.9.1
+ ACL_Check at Base 0.9.1
+ ACL_Destroy at Base 0.9.1
+ ACL_LoadFile at Base 0.9.1
+ AddMD5 at Base 0.9.1
+ EndMD5 at Base 0.9.1
+ EnsureUTF8 at Base 0.9.1
+ FromLocale at Base 0.9.1
+ FromLocaleDup at Base 0.9.1
+ GetFallbackEncoding at Base 0.9.1
+ GetLang_1 at Base 0.9.1
+ GetLang_2B at Base 0.9.1
+ GetLang_2T at Base 0.9.1
+ InitMD5 at Base 0.9.1
+ IsUTF8 at Base 0.9.1
+ LocaleFree at Base 0.9.1
+ NTPtime64 at Base 0.9.1
+ ToLocale at Base 0.9.1
+ ToLocaleDup at Base 0.9.1
+ VLC_Changeset at Base 0.9.1
+ VLC_CompileBy at Base 0.9.1
+ VLC_CompileDomain at Base 0.9.1
+ VLC_CompileHost at Base 0.9.1
+ VLC_Compiler at Base 0.9.1
+ VLC_Version at Base 0.9.1
+ __ACL_Create at Base 0.9.1
+ __ACL_Duplicate at Base 0.9.1
+ __aout_VolumeDown at Base 0.9.1
+ __aout_VolumeGet at Base 0.9.1
+ __aout_VolumeInfos at Base 0.9.1
+ __aout_VolumeMute at Base 0.9.1
+ __aout_VolumeSet at Base 0.9.1
+ __aout_VolumeUp at Base 0.9.1
+ __config_AddIntf at Base 0.9.1
+ __config_ChainParse at Base 0.9.1
+ __config_ExistIntf at Base 0.9.1
+ __config_GetFloat at Base 0.9.1
+ __config_GetInt at Base 0.9.1
+ __config_GetPsz at Base 0.9.1
+ __config_GetType at Base 0.9.1
+ __config_PutFloat at Base 0.9.1
+ __config_PutInt at Base 0.9.1
+ __config_PutPsz at Base 0.9.1
+ __config_RemoveIntf at Base 0.9.1
+ __config_ResetAll at Base 0.9.1
+ __config_SaveConfigFile at Base 0.9.1
+ __filter_chain_New at Base 0.9.1
+ __image_HandlerCreate at Base 0.9.1
+ __input_CreateThread at Base 0.9.1
+ __input_Preparse at Base 0.9.1
+ __input_Read at Base 0.9.1
+ __input_item_GetById at Base 0.9.1
+ __input_item_NewExt at Base 0.9.1
+ __intf_Create at Base 0.9.1
+ __intf_Eject at Base 0.9.1
+ __intf_Progress at Base 0.9.1
+ __intf_ProgressUpdate at Base 0.9.1
+ __intf_UserFatal at Base 0.9.1
+ __intf_UserHide at Base 0.9.1
+ __intf_UserLoginPassword at Base 0.9.1
+ __intf_UserProgressIsCancelled at Base 0.9.1
+ __intf_UserStringInput at Base 0.9.1
+ __intf_UserWarn at Base 0.9.1
+ __intf_UserYesNo at Base 0.9.1
+ __module_Exists at Base 0.9.1
+ __module_Find at Base 0.9.1
+ __module_GetModulesNamesForCapability at Base 0.9.1
+ __module_Need at Base 0.9.1
+ __module_Unneed at Base 0.9.1
+ __msg_Dbg at Base 0.9.1
+ __msg_Err at Base 0.9.1
+ __msg_Generic at Base 0.9.1
+ __msg_GenericVa at Base 0.9.1
+ __msg_Info at Base 0.9.1
+ __msg_Subscribe at Base 0.9.1
+ __msg_Unsubscribe at Base 0.9.1
+ __msg_Warn at Base 0.9.1
+ __net_Accept at Base 0.9.1
+ __net_Connect at Base 0.9.1
+ __net_ConnectDgram at Base 0.9.1
+ __net_Gets at Base 0.9.1
+ __net_OpenDgram at Base 0.9.1
+ __net_Read at Base 0.9.1
+ __net_Write at Base 0.9.1
+ __net_vaPrintf at Base 0.9.1
+ __osd_ButtonFind at Base 0.9.1
+ __osd_ButtonSelect at Base 0.9.1
+ __osd_MenuActivate at Base 0.9.1
+ __osd_MenuCreate at Base 0.9.1
+ __osd_MenuDelete at Base 0.9.1
+ __osd_MenuDown at Base 0.9.1
+ __osd_MenuHide at Base 0.9.1
+ __osd_MenuNext at Base 0.9.1
+ __osd_MenuPrev at Base 0.9.1
+ __osd_MenuShow at Base 0.9.1
+ __osd_MenuUp at Base 0.9.1
+ __osd_Volume at Base 0.9.1
+ __pl_Release at Base 0.9.1
+ __pl_Yield at Base 0.9.1
+ __services_discovery_GetServicesNames at Base 0.9.1
+ __spu_Create at Base 0.9.1
+ __spu_CreateRegion at Base 0.9.1
+ __spu_DestroyRegion at Base 0.9.1
+ __spu_MakeRegion at Base 0.9.1
+ __stats_ComputeGlobalStats at Base 0.9.1
+ __stats_CounterCreate at Base 0.9.1
+ __stats_Get at Base 0.9.1
+ __stats_TimerClean at Base 0.9.1
+ __stats_TimerDump at Base 0.9.1
+ __stats_TimerStart at Base 0.9.1
+ __stats_TimerStop at Base 0.9.1
+ __stats_TimersCleanAll at Base 0.9.1
+ __stats_TimersDumpAll at Base 0.9.1
+ __stats_Update at Base 0.9.1
+ __str_format at Base 0.9.1
+ __str_format_meta at Base 0.9.1
+ __stream_DemuxNew at Base 0.9.1
+ __stream_MemoryNew at Base 0.9.1
+ __stream_UrlNew at Base 0.9.1
+ __update_New at Base 0.9.1
+ __var_AddCallback at Base 0.9.1
+ __var_Change at Base 0.9.1
+ __var_Command at Base 0.9.1
+ __var_Create at Base 0.9.1
+ __var_DelCallback at Base 0.9.1
+ __var_Destroy at Base 0.9.1
+ __var_Get at Base 0.9.1
+ __var_Set at Base 0.9.1
+ __var_TriggerCallback at Base 0.9.1
+ __var_Type at Base 0.9.1
+ __vlc_cond_destroy at Base 0.9.1
+ __vlc_cond_init at Base 0.9.1
+ __vlc_event_attach at Base 0.9.1
+ __vlc_event_manager_init at Base 0.9.1
+ __vlc_execve at Base 0.9.1
+ __vlc_gc_decref at Base 0.9.1
+ __vlc_gc_incref at Base 0.9.1
+ __vlc_gc_init at Base 0.9.1
+ __vlc_list_children at Base 0.9.1
+ __vlc_list_find at Base 0.9.1
+ __vlc_mutex_destroy at Base 0.9.1
+ __vlc_object_attach at Base 0.9.1
+ __vlc_object_create at Base 0.9.1
+ __vlc_object_detach at Base 0.9.1
+ __vlc_object_dump at Base 0.9.1
+ __vlc_object_find at Base 0.9.1
+ __vlc_object_find_name at Base 0.9.1
+ __vlc_object_kill at Base 0.9.1
+ __vlc_object_lock at Base 0.9.1
+ __vlc_object_release at Base 0.9.1
+ __vlc_object_set_destructor at Base 0.9.1
+ __vlc_object_signal_unlocked at Base 0.9.1
+ __vlc_object_timedwait at Base 0.9.1
+ __vlc_object_unlock at Base 0.9.1
+ __vlc_object_wait at Base 0.9.1
+ __vlc_object_waitpipe at Base 0.9.1
+ __vlc_object_yield at Base 0.9.1
+ __vlc_thread_create at Base 0.9.1
+ __vlc_thread_join at Base 0.9.1
+ __vlc_thread_set_priority at Base 0.9.1
+ __vlm_New at Base 0.9.1
+ __vout_AllocatePicture at Base 0.9.1
+ __vout_CopyPicture at Base 0.9.1
+ __vout_Create at Base 0.9.1
+ __vout_InitPicture at Base 0.9.1
+ __vout_OSDMessage at Base 0.9.1
+ __vout_Request at Base 0.9.1
+ __xml_Create at Base 0.9.1
+ aout_BitsPerSample at Base 0.9.1
+ aout_ChannelReorder at Base 0.9.1
+ aout_ChannelsRestart at Base 0.9.1
+ aout_CheckChannelReorder at Base 0.9.1
+ aout_DateGet at Base 0.9.1
+ aout_DateIncrement at Base 0.9.1
+ aout_DateInit at Base 0.9.1
+ aout_DateMove at Base 0.9.1
+ aout_DateSet at Base 0.9.1
+ aout_EnableFilter at Base 0.9.1
+ aout_FifoFirstDate at Base 0.9.1
+ aout_FifoPop at Base 0.9.1
+ aout_FindAndRestart at Base 0.9.1
+ aout_FormatNbChannels at Base 0.9.1
+ aout_FormatPrepare at Base 0.9.1
+ aout_FormatPrint at Base 0.9.1
+ aout_FormatPrintChannels at Base 0.9.1
+ aout_OutputNextBuffer at Base 0.9.1
+ aout_VisualChange at Base 0.9.1
+ aout_VolumeNoneInit at Base 0.9.1
+ aout_VolumeSoftInit at Base 0.9.1
+ block_Alloc at Base 0.9.1
+ block_FifoCount at Base 0.9.1
+ block_FifoEmpty at Base 0.9.1
+ block_FifoGet at Base 0.9.1
+ block_FifoNew at Base 0.9.1
+ block_FifoPut at Base 0.9.1
+ block_FifoRelease at Base 0.9.1
+ block_FifoShow at Base 0.9.1
+ block_FifoSize at Base 0.9.1
+ block_FifoWake at Base 0.9.1
+ block_File at Base 0.9.1
+ block_Init at Base 0.9.1
+ block_Realloc at Base 0.9.1
+ block_mmap_Alloc at Base 0.9.1
+ config_ChainCreate at Base 0.9.1
+ config_ChainDestroy at Base 0.9.1
+ config_FindConfig at Base 0.9.1
+ config_GetCacheDir at Base 0.9.1
+ config_GetConfDir at Base 0.9.1
+ config_GetDataDir at Base 0.9.1
+ config_GetHomeDir at Base 0.9.1
+ config_GetUserConfDir at Base 0.9.1
+ config_GetUserDataDir at Base 0.9.1
+ convert_xml_special_chars at Base 0.9.1
+ date_Change at Base 0.9.1
+ date_Get at Base 0.9.1
+ date_Increment at Base 0.9.1
+ date_Init at Base 0.9.1
+ date_Move at Base 0.9.1
+ date_Set at Base 0.9.1
+ decode_URI at Base 0.9.1
+ decode_URI_duplicate at Base 0.9.1
+ decoder_GetDisplayDate at Base 0.9.1
+ decoder_GetInputAttachment at Base 0.9.1
+ decoder_GetInputAttachments at Base 0.9.1
+ decoder_SynchroChoose at Base 0.9.1
+ decoder_SynchroDate at Base 0.9.1
+ decoder_SynchroDecode at Base 0.9.1
+ decoder_SynchroEnd at Base 0.9.1
+ decoder_SynchroInit at Base 0.9.1
+ decoder_SynchroNewPicture at Base 0.9.1
+ decoder_SynchroRelease at Base 0.9.1
+ decoder_SynchroReset at Base 0.9.1
+ decoder_SynchroTrash at Base 0.9.1
+ demux_vaControlHelper at Base 0.9.1
+ encode_URI_component at Base 0.9.1
+ es_format_Clean at Base 0.9.1
+ es_format_Copy at Base 0.9.1
+ es_format_Init at Base 0.9.1
+ filename_sanitize at Base 0.9.1
+ filter_chain_AppendFilter at Base 0.9.1
+ filter_chain_AppendFromString at Base 0.9.1
+ filter_chain_AudioFilter at Base 0.9.1
+ filter_chain_Delete at Base 0.9.1
+ filter_chain_DeleteFilter at Base 0.9.1
+ filter_chain_GetFilter at Base 0.9.1
+ filter_chain_GetFmtOut at Base 0.9.1
+ filter_chain_GetLength at Base 0.9.1
+ filter_chain_Reset at Base 0.9.1
+ filter_chain_SubFilter at Base 0.9.1
+ filter_chain_VideoFilter at Base 0.9.1
+ httpd_ClientIP at Base 0.9.1
+ httpd_ClientModeBidir at Base 0.9.1
+ httpd_ClientModeStream at Base 0.9.1
+ httpd_FileDelete at Base 0.9.1
+ httpd_FileNew at Base 0.9.1
+ httpd_HandlerDelete at Base 0.9.1
+ httpd_HandlerNew at Base 0.9.1
+ httpd_HostDelete at Base 0.9.1
+ httpd_HostNew at Base 0.9.1
+ httpd_MsgAdd at Base 0.9.1
+ httpd_MsgClean at Base 0.9.1
+ httpd_MsgGet at Base 0.9.1
+ httpd_MsgInit at Base 0.9.1
+ httpd_RedirectDelete at Base 0.9.1
+ httpd_RedirectNew at Base 0.9.1
+ httpd_ServerIP at Base 0.9.1
+ httpd_StreamDelete at Base 0.9.1
+ httpd_StreamHeader at Base 0.9.1
+ httpd_StreamNew at Base 0.9.1
+ httpd_StreamSend at Base 0.9.1
+ httpd_TLSHostNew at Base 0.9.1
+ httpd_UrlCatch at Base 0.9.1
+ httpd_UrlDelete at Base 0.9.1
+ httpd_UrlNew at Base 0.9.1
+ httpd_UrlNewUnique at Base 0.9.1
+ image_HandlerDelete at Base 0.9.1
+ input_AddSubtitles at Base 0.9.1
+ input_Control at Base 0.9.1
+ input_DecoderDecode at Base 0.9.1
+ input_DecoderDelete at Base 0.9.1
+ input_DecoderNew at Base 0.9.1
+ input_GetItem at Base 0.9.1
+ input_MetaTypeToLocalizedString at Base 0.9.1
+ input_SplitMRL at Base 0.9.1
+ input_StopThread at Base 0.9.1
+ input_get_event_manager at Base 0.9.1
+ input_item_AddInfo at Base 0.9.1
+ input_item_AddOpt at Base 0.9.1
+ input_item_AddOption at Base 0.9.1
+ input_item_AddSubItem at Base 0.9.1
+ input_item_CopyOptions at Base 0.9.1
+ input_item_GetDuration at Base 0.9.1
+ input_item_GetInfo at Base 0.9.1
+ input_item_GetMeta at Base 0.9.1
+ input_item_GetMetaObject at Base 0.9.1
+ input_item_GetName at Base 0.9.1
+ input_item_GetURI at Base 0.9.1
+ input_item_HasErrorWhenReading at Base 0.9.1
+ input_item_IsArtFetched at Base 0.9.1
+ input_item_IsPreparsed at Base 0.9.1
+ input_item_MetaMatch at Base 0.9.1
+ input_item_MetaMerge at Base 0.9.1
+ input_item_NewWithType at Base 0.9.1
+ input_item_SetDuration at Base 0.9.1
+ input_item_SetMeta at Base 0.9.1
+ input_item_SetName at Base 0.9.1
+ input_item_SetURI at Base 0.9.1
+ input_vaControl at Base 0.9.1
+ intf_RunThread at Base 0.9.1
+ intf_StopThread at Base 0.9.1
+ libvlc_InternalAddIntf at Base 0.9.1
+ libvlc_InternalCleanup at Base 0.9.1
+ libvlc_InternalCreate at Base 0.9.1
+ libvlc_InternalDestroy at Base 0.9.1
+ libvlc_InternalInit at Base 0.9.1
+ mdate at Base 0.9.1
+ module_GetConfig at Base 0.9.1
+ module_GetHelp at Base 0.9.1
+ module_GetName at Base 0.9.1
+ module_GetObjName at Base 0.9.1
+ module_IsCapable at Base 0.9.1
+ module_Put at Base 0.9.1
+ module_PutConfig at Base 0.9.1
+ msleep at Base 0.9.1
+ mstrtime at Base 0.9.1
+ mwait at Base 0.9.1
+ net_AcceptSingle at Base 0.9.1
+ net_Listen at Base 0.9.1
+ net_ListenClose at Base 0.9.1
+ net_Printf at Base 0.9.1
+ net_SetCSCov at Base 0.9.1
+ osd_Icon at Base 0.9.1
+ osd_Message at Base 0.9.1
+ osd_ShowTextAbsolute at Base 0.9.1
+ osd_ShowTextRelative at Base 0.9.1
+ osd_Slider at Base 0.9.1
+ path_sanitize at Base 0.9.1
+ picture_CopyPixels at Base 0.9.1
+ picture_Delete at Base 0.9.1
+ picture_New at Base 0.9.1
+ plane_CopyPixels at Base 0.9.1
+ playlist_Add at Base 0.9.1
+ playlist_AddExt at Base 0.9.1
+ playlist_AddInput at Base 0.9.1
+ playlist_AskForArtEnqueue at Base 0.9.1
+ playlist_BothAddInput at Base 0.9.1
+ playlist_ChildSearchName at Base 0.9.1
+ playlist_Clear at Base 0.9.1
+ playlist_Control at Base 0.9.1
+ playlist_CurrentInput at Base 0.9.1
+ playlist_DeleteFromInput at Base 0.9.1
+ playlist_Export at Base 0.9.1
+ playlist_GetLastLeaf at Base 0.9.1
+ playlist_GetNextLeaf at Base 0.9.1
+ playlist_GetPreferredNode at Base 0.9.1
+ playlist_GetPrevLeaf at Base 0.9.1
+ playlist_IsServicesDiscoveryLoaded at Base 0.9.1
+ playlist_ItemGetById at Base 0.9.1
+ playlist_ItemGetByInput at Base 0.9.1
+ playlist_ItemGetByInputId at Base 0.9.1
+ playlist_ItemNewWithType at Base 0.9.1
+ playlist_ItemSetName at Base 0.9.1
+ playlist_ItemToNode at Base 0.9.1
+ playlist_LiveSearchUpdate at Base 0.9.1
+ playlist_NodeAppend at Base 0.9.1
+ playlist_NodeChildrenCount at Base 0.9.1
+ playlist_NodeCreate at Base 0.9.1
+ playlist_NodeDelete at Base 0.9.1
+ playlist_NodeEmpty at Base 0.9.1
+ playlist_NodeInsert at Base 0.9.1
+ playlist_NodeRemoveItem at Base 0.9.1
+ playlist_NodesPairCreate at Base 0.9.1
+ playlist_PreparseEnqueue at Base 0.9.1
+ playlist_PreparseEnqueueItem at Base 0.9.1
+ playlist_RecursiveNodeSort at Base 0.9.1
+ playlist_ServicesDiscoveryAdd at Base 0.9.1
+ playlist_ServicesDiscoveryRemove at Base 0.9.1
+ playlist_TreeMove at Base 0.9.1
+ resolve_xml_special_chars at Base 0.9.1
+ sdp_AddAttribute at Base 0.9.1
+ sdp_AddMedia at Base 0.9.1
+ secstotimestr at Base 0.9.1
+ services_discovery_AddItem at Base 0.9.1
+ services_discovery_Create at Base 0.9.1
+ services_discovery_Destroy at Base 0.9.1
+ services_discovery_EventManager at Base 0.9.1
+ services_discovery_GetLocalizedName at Base 0.9.1
+ services_discovery_RemoveItem at Base 0.9.1
+ services_discovery_SetLocalizedName at Base 0.9.1
+ services_discovery_Start at Base 0.9.1
+ services_discovery_Stop at Base 0.9.1
+ sout_AccessOutControl at Base 0.9.1
+ sout_AccessOutDelete at Base 0.9.1
+ sout_AccessOutNew at Base 0.9.1
+ sout_AccessOutRead at Base 0.9.1
+ sout_AccessOutSeek at Base 0.9.1
+ sout_AccessOutWrite at Base 0.9.1
+ sout_AnnounceRegisterSDP at Base 0.9.1
+ sout_AnnounceUnRegister at Base 0.9.1
+ sout_MethodRelease at Base 0.9.1
+ sout_MuxAddStream at Base 0.9.1
+ sout_MuxDelete at Base 0.9.1
+ sout_MuxDeleteStream at Base 0.9.1
+ sout_MuxNew at Base 0.9.1
+ sout_MuxSendBuffer at Base 0.9.1
+ sout_SAPMethod at Base 0.9.1
+ sout_StreamDelete at Base 0.9.1
+ sout_StreamNew at Base 0.9.1
+ sout_UpdateStatistic at Base 0.9.1
+ spu_CreateSubpicture at Base 0.9.1
+ spu_Destroy at Base 0.9.1
+ spu_DestroySubpicture at Base 0.9.1
+ spu_DisplaySubpicture at Base 0.9.1
+ spu_Init at Base 0.9.1
+ spu_RenderSubpictures at Base 0.9.1
+ spu_SortSubpictures at Base 0.9.1
+ stats_ComputeInputStats at Base 0.9.1
+ stats_CounterClean at Base 0.9.1
+ stats_DumpInputStats at Base 0.9.1
+ stats_ReinitInputStats at Base 0.9.1
+ str_format_time at Base 0.9.1
+ stream_Block at Base 0.9.1
+ stream_Control at Base 0.9.1
+ stream_Delete at Base 0.9.1
+ stream_DemuxDelete at Base 0.9.1
+ stream_DemuxSend at Base 0.9.1
+ stream_Peek at Base 0.9.1
+ stream_Read at Base 0.9.1
+ stream_ReadLine at Base 0.9.1
+ stream_vaControl at Base 0.9.1
+ tls_ClientCreate at Base 0.9.1
+ tls_ClientDelete at Base 0.9.1
+ unescape_URI at Base 0.9.1
+ unescape_URI_duplicate at Base 0.9.1
+ update_Check at Base 0.9.1
+ update_Delete at Base 0.9.1
+ update_Download at Base 0.9.1
+ update_GetRelease at Base 0.9.1
+ update_NeedUpgrade at Base 0.9.1
+ update_WaitDownload at Base 0.9.1
+ us_atof at Base 0.9.1
+ us_strtod at Base 0.9.1
+ utf8_fopen at Base 0.9.1
+ utf8_fprintf at Base 0.9.1
+ utf8_loaddir at Base 0.9.1
+ utf8_lstat at Base 0.9.1
+ utf8_mkdir at Base 0.9.1
+ utf8_open at Base 0.9.1
+ utf8_opendir at Base 0.9.1
+ utf8_readdir at Base 0.9.1
+ utf8_scandir at Base 0.9.1
+ utf8_stat at Base 0.9.1
+ utf8_unlink at Base 0.9.1
+ utf8_vfprintf at Base 0.9.1
+ var_AcquireMutex at Base 0.9.1
+ video_format_FixRgb at Base 0.9.1
+ vlc_CPU at Base 0.9.1
+ vlc_b64_decode at Base 0.9.1
+ vlc_b64_decode_binary at Base 0.9.1
+ vlc_b64_decode_binary_to_buffer at Base 0.9.1
+ vlc_b64_encode at Base 0.9.1
+ vlc_b64_encode_binary at Base 0.9.1
+ vlc_config_create at Base 0.9.1
+ vlc_config_set at Base 0.9.1
+ vlc_error at Base 0.9.1
+ vlc_event_detach at Base 0.9.1
+ vlc_event_manager_fini at Base 0.9.1
+ vlc_event_manager_register_event_type at Base 0.9.1
+ vlc_event_send at Base 0.9.1
+ vlc_fastmem_register at Base 0.9.1
+ vlc_freeaddrinfo at Base 0.9.1
+ vlc_gai_strerror at Base 0.9.1
+ vlc_getaddrinfo at Base 0.9.1
+ vlc_getnameinfo at Base 0.9.1
+ vlc_gettext at Base 0.9.1
+ vlc_iconv at Base 0.9.1
+ vlc_iconv_close at Base 0.9.1
+ vlc_iconv_open at Base 0.9.1
+ vlc_inet_ntop at Base 0.9.1
+ vlc_inet_pton at Base 0.9.1
+ vlc_list_release at Base 0.9.1
+ vlc_memcpy at Base 0.9.1
+ vlc_memset at Base 0.9.1
+ vlc_module_create at Base 0.9.1
+ vlc_module_set at Base 0.9.1
+ vlc_mutex_init at Base 0.9.1
+ vlc_mutex_init_recursive at Base 0.9.1
+ vlc_object_get at Base 0.9.1
+ vlc_poll at Base 0.9.1
+ vlc_pthread_fatal at Base 0.9.1
+ vlc_rand_bytes at Base 0.9.1
+ vlc_recvmsg at Base 0.9.1
+ vlc_sdp_Start at Base 0.9.1
+ vlc_sendmsg at Base 0.9.1
+ vlc_strcasestr at Base 0.9.1
+ vlc_strlcpy at Base 0.9.1
+ vlc_strtoll at Base 0.9.1
+ vlc_submodule_create at Base 0.9.1
+ vlc_threadvar_create at Base 0.9.1
+ vlc_threadvar_delete at Base 0.9.1
+ vlc_ureduce at Base 0.9.1
+ vlc_wclosedir at Base 0.9.1
+ vlc_wraptext at Base 0.9.1
+ vlm_Control at Base 0.9.1
+ vlm_Delete at Base 0.9.1
+ vlm_ExecuteCommand at Base 0.9.1
+ vlm_MessageAdd at Base 0.9.1
+ vlm_MessageDelete at Base 0.9.1
+ vlm_MessageNew at Base 0.9.1
+ vout_ChromaCmp at Base 0.9.1
+ vout_Close at Base 0.9.1
+ vout_ControlWindow at Base 0.9.1
+ vout_CreatePicture at Base 0.9.1
+ vout_DatePicture at Base 0.9.1
+ vout_DestroyPicture at Base 0.9.1
+ vout_DisplayPicture at Base 0.9.1
+ vout_EnableFilter at Base 0.9.1
+ vout_InitFormat at Base 0.9.1
+ vout_LinkPicture at Base 0.9.1
+ vout_OSDIcon at Base 0.9.1
+ vout_OSDSlider at Base 0.9.1
+ vout_PlacePicture at Base 0.9.1
+ vout_ReleaseWindow at Base 0.9.1
+ vout_RequestWindow at Base 0.9.1
+ vout_ShowTextAbsolute at Base 0.9.1
+ vout_ShowTextRelative at Base 0.9.1
+ vout_Snapshot at Base 0.9.1
+ vout_UnlinkPicture at Base 0.9.1
+ vout_vaControlDefault at Base 0.9.1
+ xml_Delete at Base 0.9.1
Modified: experimental/vlc/debian/mozilla-plugin-vlc.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/mozilla-plugin-vlc.install?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/mozilla-plugin-vlc.install (original)
+++ experimental/vlc/debian/mozilla-plugin-vlc.install Sun Aug 31 23:06:34 2008
@@ -1,1 +1,2 @@
usr/lib/mozilla
+usr/share/vlc/mozilla
Modified: experimental/vlc/debian/mozilla-plugin-vlc.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/mozilla-plugin-vlc.links?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/mozilla-plugin-vlc.links (original)
+++ experimental/vlc/debian/mozilla-plugin-vlc.links Sun Aug 31 23:06:34 2008
@@ -1,3 +1,3 @@
/usr/share/doc/vlc /usr/share/doc/mozilla-plugin-vlc
+/usr/share/bug/vlc /usr/share/bug/mozilla-plugin-vlc
/usr/lib/mozilla/plugins/libvlcplugin.so /usr/lib/mozilla-firefox/plugins/libvlcplugin.so
-/usr/share/bug/vlc-nox /usr/share/bug/mozilla-plugin-vlc
Added: experimental/vlc/debian/patches/050_iceape.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/patches/050_iceape.diff?rev=1436&op=file
==============================================================================
--- experimental/vlc/debian/patches/050_iceape.diff (added)
+++ experimental/vlc/debian/patches/050_iceape.diff Sun Aug 31 23:06:34 2008
@@ -1,0 +1,220 @@
+commit ac2f08d8e0d192a74154934d7565bba0e5a3fff1
+Author: Christophe Mutricy <xtophe at videolan.org>
+Date: Sun Aug 24 21:24:41 2008 +0100
+
+ Simplify the detection for mozilla
+
+diff --git a/configure.ac b/configure.ac
+index 1ab846f..a08f5f6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5429,30 +5429,38 @@ AC_ARG_WITH(mozilla-sdk-path,
+ AC_LANG_PUSH(C++)
+ if test "${enable_mozilla}" = "yes"
+ then
+- dnl currently vlc plugin only needs headers, no xpcom support apis are actually used
+- need_xpcom_libs=false
+-
+- if test "${with_mozilla_sdk_path}" = "" -o "${with_mozilla_sdk_path}" = "no"
+- then
+- dnl New firefox-1.5 SDK api
+- PKG_CHECK_MODULES([FIREFOX], [firefox-plugin],
+- [
+- PKG_CHECK_MODULES([FIREFOX_XPCOM], [firefox-xpcom],
+- [],
+- [
+- PKG_CHECK_MODULES([MOZILLA_NSPR], [mozilla-nspr],
+- [],
+- [
+- PKG_CHECK_MODULES([NSPR], [nspr],
+- [],
+- [
+- AC_MSG_ERROR([Please install the nspr development tools.])
+- ]
+- )
+- ]
+- )
+- ])
+- CPPFLAGS="${CPPFLAGS_save} ${FIREFOX_CFLAGS} ${FIREFOX_XPCOM_CFLAGS} ${MOZILLA_NSPR_CFLAGS} ${NSPR_CFLAGS} ${MOZILLA_CPPFLAGS}"
++ AS_IF([test "${with_mozilla_sdk_path}" = "" -o "${with_mozilla_sdk_path}" = "no"],
++ [
++ dnl pkg-config
++ dnl As we want to do a loop due to the number of name possible for the .pc
++ dnl we can't use the pkg-config macros.
++
++ AC_ARG_VAR([MOZILLA_CFLAGS], [C compiler flags for Mozilla, overriding pkg-config])
++ AC_ARG_VAR([MOZILLA_LIBS], [linker flags for Mozilla, overriding pkg-config])
++ AC_MSG_NOTICE([Checking for Mozilla])
++ found=0
++ if test -n "$MOZILLA_CFLAGS" -a -n "$MOZILLA_LIBS"
++ then
++ found=1
++ else
++ if test -n "$PKG_CONFIG"; then
++ for i in seamonkey iceape xulrunner firefox iceweasel mozilla; do
++ echo "Trying to find $i .pc files" >&5
++ i="${i}-xpcom ${i}-plugin"
++ if $PKG_CONFIG --exists --print-errors "$i" 2>&5
++ then
++ echo "Using $i .pc files." >&5
++ echo "Using $i .pc files." >&6
++ found=1
++ MOZILLA_CFLAGS=$( $PKG_CONFIG --cflags "$i" )
++ MOZILLA_LIBS=$( $PKG_CONFIG --libs "$i" )
++ break
++ fi
++ done
++ fi
++ fi
++ AS_IF( [test $found = 1],[
++ CPPFLAGS="${CPPFLAGS_save} ${MOZILLA_CFLAGS}"
+ MOZILLA_REQUIRED_HEADERS=1
+ AC_CHECK_HEADERS(mozilla-config.h,,MOZILLA_REQUIRED_HEADERS=0)
+ AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
+@@ -5466,94 +5474,30 @@ then
+ fi
+ MOZILLA_REQUIRED_HEADERS=
+ mozilla=:
+- firefox_include=`pkg-config --variable=includedir firefox-plugin`
+- if test -f "${firefox_include}/mozilla-config.h" -a -f "${firefox_include}/mozilla-config32.h"; then
+- MOZILLA_CONFIG_H="${firefox_include}/mozilla-config32.h"
+- elif test -f "${firefox_include}/mozilla-config.h" -a -f "${firefox_include}/mozilla-config64.h"; then
+- MOZILLA_CONFIG_H="${firefox_include}/mozilla-config64.h"
+- else
+- MOZILLA_CONFIG_H="${firefox_include}/mozilla-config.h"
+- fi
+- if grep '^#define MOZ_X11 1' ${MOZILLA_CONFIG_H} 2>&1 > /dev/null ; then
+- AC_CHECK_HEADERS(X11/xpm.h,,AC_MSG_ERROR([Please install libXpm-devel library for required X11/xpm.h]))
++ AC_EGREP_CPP(yes,
++ [#include <mozilla-config.h>
++ #ifdef MOZ_X11
++ yes
++ #endif],
++ [AC_CHECK_HEADERS(X11/xpm.h,,AC_MSG_ERROR([Please install libXpm-devel library for required X11/xpm.h]))
+ VLC_ADD_LIBS([mozilla], [${X_LIBS} ${X_PRE_LIBS} -lX11 -lXt -lXpm])
+- fi
++ ])
+ VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS}])
+- VLC_ADD_LDFLAGS([mozilla],[${MOZILLA_LDFLAGS}])
+- VLC_ADD_LIBS([mozilla],[${FIREFOX_LIBS} ${MOZILLA_NSPR_LIBS} ${NSPR_LIBS}])
++ VLC_ADD_LIBS([mozilla],[${MOZILLA_LIBS}])
+ VLC_ADD_PLUGIN([mozilla])
++ PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
+ MOZILLA_CONFIG=
+ CPPFLAGS="${CPPFLAGS_save}"
+- ],
+- [
+- PKG_CHECK_MODULES([XULRUNNER], [libxul],
+- [
+- PKG_CHECK_MODULES([FIREFOX_XPCOM], [firefox-xpcom],
+- [],
+- [
+- PKG_CHECK_MODULES([MOZILLA_NSPR], [mozilla-nspr],
+- [],
+- [
+- PKG_CHECK_MODULES([NSPR], [nspr],
+- [],
+- [
+- AC_MSG_ERROR([Please install the nspr development tools.])
+- ]
+- )
+- ]
+- )
+- ]
+- )
+- CPPFLAGS="${CPPFLAGS_save} ${XULRUNNER_CFLAGS} ${XULRUNNER_CPPFLAGS} ${FIREFOX_XPCOM_CFLAGS} ${MOZILLA_NSPR_CFLAGS} ${NSPR_CFLAGS} ${MOZILLA_CPPFLAGS}"
+- MOZILLA_REQUIRED_HEADERS=1
+- AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
+- AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0,
+- [#if HAVE_NPAPI_H
+- # include <npapi.h>
+- #endif
+- ])
+- if test "${MOZILLA_REQUIRED_HEADERS}" = "0"; then
+- AC_MSG_ERROR([Please install the Mozilla runtime package xulrunner-devel; plugplugin/npapi.h and plugin/npruntime.h were not found.])
+- fi
+- MOZILLA_REQUIRED_HEADERS=
+- mozilla=:
+- AC_DEFINE([XP_UNIX],[1],[Defined for Mozilla as we are Unix])
+- AC_DEFINE([MOZ_X11],[1],[Defined as Unix mozilla uses X11])
+- AC_DEFINE([OJI],[1],[Java Runtime Interface])
+- AC_CHECK_HEADERS(X11/xpm.h,,AC_MSG_ERROR([Please install libXpm-devel library for required X11/xpm.h]))
+- VLC_ADD_LIBS([mozilla], [${X_LIBS} ${X_PRE_LIBS} -lX11 -lXt -lXpm])
+- VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS}])
+- VLC_ADD_LDFLAGS([mozilla],[${MOZILLA_LDFLAGS}])
+- VLC_ADD_LIBS([mozilla],[${FIREFOX_LIBS} ${MOZILLA_NSPR_LIBS} ${NSPR_LIBS}])
+- VLC_ADD_PLUGIN([mozilla])
+- MOZILLA_CONFIG=
+- CPPFLAGS="${CPPFLAGS_save}"
+ ],
+ [
+- AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no)
+- if test "${MOZILLA_CONFIG}" = "no"
+- then
+- AC_PATH_PROG(SEAMONKEY_CONFIG, seamonkey-config, no)
+- if test "${SEAMONKEY_CONFIG}" = "no"
+- then
+- AC_PATH_PROG(XULRUNNER_CONFIG, xulrunner-config, no)
+- if test "${XULRUNNER_CONFIG}" = "no"
+- then
+- AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.])
+- else
+- have_xul=true
+- MOZILLA_CONFIG="${XULRUNNER_CONFIG}"
+- fi
+- else
+- MOZILLA_CONFIG="${SEAMONKEY_CONFIG}"
+- fi
+- fi
++ AC_PATH_PROGS(MOZILLA_CONFIG,
++ [mozilla-config seamonkey-config xulrunner-config],
++ AC_MSG_ERROR([Please install the Mozilla development tools. mozilla-config was not found.])
++ )
+ ]
+ )
+- ]
+- )
+- if test ! -z "${MOZILLA_CONFIG}"
+- then
++ dnl pkg-config failed but we might have found a mozilla-config
++ AS_IF( [test ! -z "${MOZILLA_CONFIG}"],[
+ if ${MOZILLA_CONFIG} --defines | grep -q 'MOZ_X11=1'; then
+ LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}"
+ AC_CHECK_LIB(Xt,XtStrings,
+@@ -5570,13 +5514,8 @@ then
+
+ mozilla=:
+ PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
+- dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490
+- VLC_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]])
+- if ${need_xpcom_libs}; then
+- VLC_ADD_LIBS([mozilla],[`${MOZILLA_CONFIG} --libs plugin xpcom`])
+- else
+- VLC_ADD_LIBS([mozilla],[`${MOZILLA_CONFIG} --libs plugin`])
+- fi
++ VLC_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin java`]])
++ VLC_ADD_LIBS([mozilla],[`${MOZILLA_CONFIG} --libs plugin`])
+ CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mozilla}"
+ MOZILLA_REQUIRED_HEADERS=1
+ AC_CHECK_HEADERS(mozilla-config.h,,MOZILLA_REQUIRED_HEADERS=0)
+@@ -5593,9 +5532,9 @@ then
+ MOZILLA_REQUIRED_HEADERS=
+ CPPFLAGS="${CPPFLAGS_save}"
+ MOZILLA_SDK_PATH="`${MOZILLA_CONFIG} --prefix`"
+- fi
++ ])
+ dnl End of moz_sdk = ""
+- else
++ ],[
+ dnl special case for mingw32
+ if test "${SYS}" = "mingw32"
+ then
+@@ -5640,7 +5579,7 @@ then
+ real_mozilla_sdk="`${CYGPATH} -w ${real_mozilla_sdk}`"
+ fi
+ CPPFLAGS="${CPPFLAGS_save}"
+- fi
++ ])
+ fi
+ AC_LANG_POP(C++)
+ AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
Added: experimental/vlc/debian/patches/051_install_scripts.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/patches/051_install_scripts.diff?rev=1436&op=file
==============================================================================
--- experimental/vlc/debian/patches/051_install_scripts.diff (added)
+++ experimental/vlc/debian/patches/051_install_scripts.diff Sun Aug 31 23:06:34 2008
@@ -1,0 +1,28 @@
+commit 155c19e0f1a7f2fb2c02d4fe3b1aa7e5a2dc6b64
+Author: Christophe Mutricy <xtophe at videolan.org>
+Date: Sun Aug 31 17:47:43 2008 +0100
+
+ Install scripts correctly.
+
+ So that the correct permissions are set
+
+diff --git a/share/Makefile.am b/share/Makefile.am
+index 5a52bfc..0d468c6 100644
+--- a/share/Makefile.am
++++ b/share/Makefile.am
+@@ -9,12 +9,14 @@ dist_pkgdata_DATA = \
+ $(DIST_icons32) \
+ $(DIST_icons48) \
+ $(DIST_icons128)
+-nobase_dist_pkgdata_DATA = \
++nobase_dist_pkgdata_SCRIPTS = \
+ utils/gnome-vlc-default.sh \
+ utils/audio-vlc-default.sh \
+ utils/video-vlc-default.sh \
+ $(NULL)
+
++nobase_dist_pkgdata_DATA = $(NULL)
++
+ EXTRA_DIST = \
+ $(DIST_rsrc) \
+ $(DIST_pda) \
Modified: experimental/vlc/debian/patches/101_certificates_paths.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/patches/101_certificates_paths.diff?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/patches/101_certificates_paths.diff (original)
+++ experimental/vlc/debian/patches/101_certificates_paths.diff Sun Aug 31 23:06:34 2008
@@ -1,13 +1,15 @@
---- a/modules/misc/gnutls.c
-+++ b/modules/misc/gnutls.c
-@@ -714,6 +714,10 @@ gnutls_ClientCreate( tls_t *p_tls )
- p_sys->x509_cred, psz_path, VLC_FALSE );
- free( psz_path );
- }
-+ gnutls_Addx509File( (vlc_object_t *)p_session,
-+ p_sys->x509_cred,
-+ "/etc/ssl/certs/ca-certificates.crt",VLC_FALSE );
-+
- p_session->pf_handshake2 = gnutls_HandshakeAndValidate;
+Index: vlc-debian/modules/misc/gnutls.c
+===================================================================
+--- vlc-debian.orig/modules/misc/gnutls.c 2008-06-01 00:46:01.000000000 +0200
++++ vlc-debian/modules/misc/gnutls.c 2008-06-01 11:38:57.000000000 +0200
+@@ -688,6 +688,10 @@
+ sprintf (path, "%s/ssl/certs/ca-certificates.crt", confdir);
+ gnutls_Addx509File (VLC_OBJECT (p_session),
+ p_sys->x509_cred, path, false);
++ gnutls_Addx509File( VLC_OBJECT(p_session),
++ p_sys->x509_cred,
++ "/etc/ssl/certs/ca-certificates.crt",false );
++
}
- else
+ p_session->pf_handshake = gnutls_HandshakeAndValidate;
+ /*p_session->pf_handshake = gnutls_ContinueHandshake;*/
Modified: experimental/vlc/debian/patches/102_dejavu_font.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/patches/102_dejavu_font.diff?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/patches/102_dejavu_font.diff (original)
+++ experimental/vlc/debian/patches/102_dejavu_font.diff Sun Aug 31 23:06:34 2008
@@ -1,13 +1,13 @@
-Index: vlc-0.8.5-test3.debian/modules/misc/freetype.c
+Index: vlc-debian/modules/misc/freetype.c
===================================================================
---- vlc-0.8.5-test3.debian.orig/modules/misc/freetype.c 2006-04-24 18:20:14.000000000 +0200
-+++ vlc-0.8.5-test3.debian/modules/misc/freetype.c 2006-04-24 18:20:21.000000000 +0200
-@@ -55,7 +55,7 @@
- #elif defined( WIN32 )
+--- vlc-debian.orig/modules/misc/freetype.c 2008-06-01 00:46:01.000000000 +0200
++++ vlc-debian/modules/misc/freetype.c 2008-06-01 11:38:57.000000000 +0200
+@@ -61,7 +61,7 @@
#define DEFAULT_FONT "" /* Default font found at run-time */
+ #define FC_DEFAULT_FONT "Arial"
#else
-#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
+#define DEFAULT_FONT "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf"
+ #define FC_DEFAULT_FONT "Serif Bold"
#endif
- #if defined(HAVE_FRIBIDI)
Modified: experimental/vlc/debian/patches/104_notify.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/patches/104_notify.diff?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/patches/104_notify.diff (original)
+++ experimental/vlc/debian/patches/104_notify.diff Sun Aug 31 23:06:34 2008
@@ -1,13 +1,19 @@
-Index: vlc-0.8.6a.debian/modules/misc/notify.c
+Index: vlc-debian/modules/misc/notify/notify.c
===================================================================
---- vlc-0.8.6a.debian.orig/modules/misc/notify.c 2007-01-03 19:27:57.000000000 +0100
-+++ vlc-0.8.6a.debian/modules/misc/notify.c 2007-01-11 18:30:48.000000000 +0100
-@@ -205,7 +205,7 @@
- NotifyNotification * notification;
- notification = notify_notification_new( _("Now Playing"),
- psz_temp,
-- DATA_PATH "/vlc48x48.png",NULL);
-+ "/usr/share/pixmaps/vlc.png",NULL);
- notify_notification_set_timeout( notification,
- config_GetInt(p_this, "notify-timeout") );
- notify_notification_set_urgency( notification, NOTIFY_URGENCY_LOW );
+--- vlc-debian.orig/modules/misc/notify/notify.c 2008-06-01 00:46:01.000000000 +0200
++++ vlc-debian/modules/misc/notify/notify.c 2008-06-01 11:38:57.000000000 +0200
+@@ -220,13 +220,7 @@
+ free( psz_arturl );
+ }
+ else /* else we show state-of-the art logo */
+- {
+- const char *data_path = config_GetDataDir ();
+- char buf[strlen (data_path) + sizeof ("/vlc48x48.png")];
+-
+- snprintf (buf, sizeof (buf), "%s/vlc48x48.png", data_path);
+- pix = gdk_pixbuf_new_from_file( buf, &p_error );
+- }
++ pix = gdk_pixbuf_new_from_file( "/usr/share/pixmaps/vlc.png", &p_error );
+
+ /* we need to replace '&' with '&' because '&' is a keyword of
+ * notification-daemon parser */
Modified: experimental/vlc/debian/patches/200_osdmenu_paths.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/patches/200_osdmenu_paths.diff?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/patches/200_osdmenu_paths.diff (original)
+++ experimental/vlc/debian/patches/200_osdmenu_paths.diff Sun Aug 31 23:06:34 2008
@@ -1,28 +1,28 @@
-Index: vlc-0.8.5-test3.debian/share/osdmenu/default.cfg
+Index: vlc-debian/share/osdmenu/default.cfg
===================================================================
---- vlc-0.8.5-test3.debian.orig/share/osdmenu/default.cfg 2006-04-19 09:25:02.000000000 +0200
-+++ vlc-0.8.5-test3.debian/share/osdmenu/default.cfg 2006-04-24 16:21:46.000000000 +0200
+--- vlc-debian.orig/share/osdmenu/default.cfg 2008-06-01 00:46:01.000000000 +0200
++++ vlc-debian/share/osdmenu/default.cfg 2008-06-01 11:38:57.000000000 +0200
@@ -1,4 +1,4 @@
-dir share/osdmenu/default
+dir /usr/share/vlc/osdmenu/default
action key-play-pause (0,0)
unselect unselected.png
select selection/play_pause.png
-Index: vlc-0.8.5-test3.debian/share/osdmenu/dvd.cfg
+Index: vlc-debian/share/osdmenu/dvd.cfg
===================================================================
---- vlc-0.8.5-test3.debian.orig/share/osdmenu/dvd.cfg 2006-04-19 09:25:02.000000000 +0200
-+++ vlc-0.8.5-test3.debian/share/osdmenu/dvd.cfg 2006-04-24 16:21:46.000000000 +0200
+--- vlc-debian.orig/share/osdmenu/dvd.cfg 2008-06-01 00:46:01.000000000 +0200
++++ vlc-debian/share/osdmenu/dvd.cfg 2008-06-01 11:38:57.000000000 +0200
@@ -1,4 +1,4 @@
-dir share/osdmenu/dvd
+dir /usr/share/vlc/osdmenu/dvd
action key-play (0,0)
unselect unselect/barroff.png
select selection/play.png
-Index: vlc-0.8.5-test3.debian/modules/video_filter/osdmenu.c
+Index: vlc-debian/modules/video_filter/osdmenu.c
===================================================================
---- vlc-0.8.5-test3.debian.orig/modules/video_filter/osdmenu.c 2006-04-19 09:25:11.000000000 +0200
-+++ vlc-0.8.5-test3.debian/modules/video_filter/osdmenu.c 2006-04-24 16:21:46.000000000 +0200
-@@ -92,7 +92,7 @@
+--- vlc-debian.orig/modules/video_filter/osdmenu.c 2008-06-01 00:46:01.000000000 +0200
++++ vlc-debian/modules/video_filter/osdmenu.c 2008-06-01 11:38:57.000000000 +0200
+@@ -105,7 +105,7 @@
#if defined( WIN32 ) || defined( UNDER_CE )
#define OSD_DEFAULT_CFG "osdmenu/default.cfg"
#else
Modified: experimental/vlc/debian/patches/300_manpage_syntax.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/patches/300_manpage_syntax.diff?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/patches/300_manpage_syntax.diff (original)
+++ experimental/vlc/debian/patches/300_manpage_syntax.diff Sun Aug 31 23:06:34 2008
@@ -1,7 +1,7 @@
-Index: vlc-0.8.6.i/doc/vlc.1
+Index: vlc-debian/doc/vlc.1
===================================================================
---- vlc-0.8.6.i.orig/doc/vlc.1 2008-07-08 20:59:22.000000000 +0000
-+++ vlc-0.8.6.i/doc/vlc.1 2008-08-26 22:02:33.000000000 +0000
+--- vlc-debian.orig/doc/vlc.1 2008-01-20 00:13:51.000000000 +0000
++++ vlc-debian/doc/vlc.1 2008-01-20 00:16:31.000000000 +0000
@@ -70,6 +70,11 @@
(close VLC).
@@ -14,16 +14,3 @@
Online documentation: http://www.videolan.org/doc/
.PP
.SH AUTHOR
-Index: vlc-0.8.6.i/doc/vlc-config.1
-===================================================================
---- vlc-0.8.6.i.orig/doc/vlc-config.1 2008-08-26 23:24:13.000000000 +0000
-+++ vlc-0.8.6.i/doc/vlc-config.1 2008-08-26 23:24:29.000000000 +0000
-@@ -11,7 +11,7 @@
- and link programs that use \fIlibvlc\fP.
- .
- .SH OPTIONS
--.l
-+.PP
- \fIvlc-config\fP accepts the following options:
- .TP 8
- .B \-\-version
Added: experimental/vlc/debian/patches/900_rebootstrap.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/patches/900_rebootstrap.diff?rev=1436&op=file
==============================================================================
--- experimental/vlc/debian/patches/900_rebootstrap.diff (added)
+++ experimental/vlc/debian/patches/900_rebootstrap.diff Sun Aug 31 23:06:34 2008
@@ -1,0 +1,9337 @@
+diff -Naur vlc-0.9.1.orig/Makefile.in vlc-0.9.1/Makefile.in
+--- vlc-0.9.1.orig/Makefile.in 2008-08-25 23:50:23.000000000 +0200
++++ vlc-0.9.1/Makefile.in 2008-08-31 22:34:15.000000000 +0200
+@@ -168,10 +168,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -526,9 +522,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -538,8 +534,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -573,7 +567,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -608,9 +601,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/bin/Makefile.in vlc-0.9.1/bin/Makefile.in
+--- vlc-0.9.1.orig/bin/Makefile.in 2008-08-25 23:49:32.000000000 +0200
++++ vlc-0.9.1/bin/Makefile.in 2008-08-31 22:33:18.000000000 +0200
+@@ -151,10 +151,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -509,9 +505,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -521,8 +517,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -556,7 +550,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -591,9 +584,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/config.h.in vlc-0.9.1/config.h.in
+--- vlc-0.9.1.orig/config.h.in 2008-08-25 23:49:21.000000000 +0200
++++ vlc-0.9.1/config.h.in 2008-08-31 22:32:58.000000000 +0200
+@@ -835,9 +835,6 @@
+ /* Dynamic object extension */
+ #undef LIBEXT
+
+-/* Defined as Unix mozilla uses X11 */
+-#undef MOZ_X11
+-
+ /* Define to 1 if debug code should NOT be compiled */
+ #undef NDEBUG
+
+@@ -847,9 +844,6 @@
+ /* Define if <sys/param.h> defines ntohl. */
+ #undef NTOHL_IN_SYS_PARAM_H
+
+-/* Java Runtime Interface */
+-#undef OJI
+-
+ /* Define if you want to optimize memory usage over performance */
+ #undef OPTIMIZE_MEMORY
+
+@@ -937,9 +931,6 @@
+ first (like Motorola and SPARC, unlike Intel and VAX). */
+ #undef WORDS_BIGENDIAN
+
+-/* Defined for Mozilla as we are Unix */
+-#undef XP_UNIX
+-
+ /* Define to 1 if the X Window System is missing or not being used. */
+ #undef X_DISPLAY_MISSING
+
+diff -Naur vlc-0.9.1.orig/configure vlc-0.9.1/configure
+--- vlc-0.9.1.orig/configure 2008-08-25 23:49:11.000000000 +0200
++++ vlc-0.9.1/configure 2008-08-31 22:32:43.000000000 +0200
+@@ -1330,20 +1330,10 @@
+ HAS_WIDL_COMPILER_FALSE
+ BUILD_ACTIVEX_TRUE
+ BUILD_ACTIVEX_FALSE
+-FIREFOX_CFLAGS
+-FIREFOX_LIBS
+-XULRUNNER_CFLAGS
+-XULRUNNER_LIBS
+-MOZILLA_CONFIG
+-SEAMONKEY_CONFIG
+-XULRUNNER_CONFIG
+-FIREFOX_XPCOM_CFLAGS
+-FIREFOX_XPCOM_LIBS
+-MOZILLA_NSPR_CFLAGS
+-MOZILLA_NSPR_LIBS
+-NSPR_CFLAGS
+-NSPR_LIBS
++MOZILLA_CFLAGS
++MOZILLA_LIBS
+ LTLIBmozilla
++MOZILLA_CONFIG
+ CYGPATH
+ BUILD_MOZILLA_TRUE
+ BUILD_MOZILLA_FALSE
+@@ -1480,16 +1470,8 @@
+ GNUTLS_LIBS
+ MIDL
+ WIDL
+-FIREFOX_CFLAGS
+-FIREFOX_LIBS
+-XULRUNNER_CFLAGS
+-XULRUNNER_LIBS
+-FIREFOX_XPCOM_CFLAGS
+-FIREFOX_XPCOM_LIBS
+-MOZILLA_NSPR_CFLAGS
+-MOZILLA_NSPR_LIBS
+-NSPR_CFLAGS
+-NSPR_LIBS
++MOZILLA_CFLAGS
++MOZILLA_LIBS
+ GLIB2_CFLAGS
+ GLIB2_LIBS'
+
+@@ -2476,24 +2458,10 @@
+ GNUTLS_LIBS linker flags for GNUTLS, overriding pkg-config
+ MIDL Microsoft IDL compiler (Win32 platform only)
+ WIDL Wine IDL compiler (requires Wine SDK)
+- FIREFOX_CFLAGS
+- C compiler flags for FIREFOX, overriding pkg-config
+- FIREFOX_LIBS
+- linker flags for FIREFOX, overriding pkg-config
+- XULRUNNER_CFLAGS
+- C compiler flags for XULRUNNER, overriding pkg-config
+- XULRUNNER_LIBS
+- linker flags for XULRUNNER, overriding pkg-config
+- FIREFOX_XPCOM_CFLAGS
+- C compiler flags for FIREFOX_XPCOM, overriding pkg-config
+- FIREFOX_XPCOM_LIBS
+- linker flags for FIREFOX_XPCOM, overriding pkg-config
+- MOZILLA_NSPR_CFLAGS
+- C compiler flags for MOZILLA_NSPR, overriding pkg-config
+- MOZILLA_NSPR_LIBS
+- linker flags for MOZILLA_NSPR, overriding pkg-config
+- NSPR_CFLAGS C compiler flags for NSPR, overriding pkg-config
+- NSPR_LIBS linker flags for NSPR, overriding pkg-config
++ MOZILLA_CFLAGS
++ C compiler flags for Mozilla, overriding pkg-config
++ MOZILLA_LIBS
++ linker flags for Mozilla, overriding pkg-config
+ GLIB2_CFLAGS
+ C compiler flags for GLIB2, overriding pkg-config
+ GLIB2_LIBS linker flags for GLIB2, overriding pkg-config
+@@ -9508,7 +9476,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 9511 "configure"' > conftest.$ac_ext
++ echo '#line 9479 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -11645,11 +11613,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:11648: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11616: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:11652: \$? = $ac_status" >&5
++ echo "$as_me:11620: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -11935,11 +11903,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:11938: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11906: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:11942: \$? = $ac_status" >&5
++ echo "$as_me:11910: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -12039,11 +12007,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:12042: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12010: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:12046: \$? = $ac_status" >&5
++ echo "$as_me:12014: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -14416,7 +14384,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 14419 "configure"
++#line 14387 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -14516,7 +14484,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 14519 "configure"
++#line 14487 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -16917,11 +16885,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:16920: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16888: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:16924: \$? = $ac_status" >&5
++ echo "$as_me:16892: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -17021,11 +16989,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:17024: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16992: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:17028: \$? = $ac_status" >&5
++ echo "$as_me:16996: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -18619,11 +18587,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18622: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18590: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18626: \$? = $ac_status" >&5
++ echo "$as_me:18594: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -18723,11 +18691,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18726: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18694: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:18730: \$? = $ac_status" >&5
++ echo "$as_me:18698: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -20943,11 +20911,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:20946: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20914: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:20950: \$? = $ac_status" >&5
++ echo "$as_me:20918: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -21233,11 +21201,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:21236: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:21204: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:21240: \$? = $ac_status" >&5
++ echo "$as_me:21208: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -21337,11 +21305,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:21340: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:21308: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:21344: \$? = $ac_status" >&5
++ echo "$as_me:21312: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -68961,3596 +68929,383 @@
+
+ if test "${enable_mozilla}" = "yes"
+ then
+- need_xpcom_libs=false
++ if test "${with_mozilla_sdk_path}" = "" -o "${with_mozilla_sdk_path}" = "no"; then
+
+- if test "${with_mozilla_sdk_path}" = "" -o "${with_mozilla_sdk_path}" = "no"
+- then
+
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for FIREFOX" >&5
+-echo $ECHO_N "checking for FIREFOX... $ECHO_C" >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$FIREFOX_CFLAGS"; then
+- pkg_cv_FIREFOX_CFLAGS="$FIREFOX_CFLAGS"
++
++ { echo "$as_me:$LINENO: Checking for Mozilla" >&5
++echo "$as_me: Checking for Mozilla" >&6;}
++ found=0
++ if test -n "$MOZILLA_CFLAGS" -a -n "$MOZILLA_LIBS"
++ then
++ found=1
+ else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin\"") >&5
+- ($PKG_CONFIG --exists --print-errors "firefox-plugin") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_FIREFOX_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
++ if test -n "$PKG_CONFIG"; then
++ for i in seamonkey iceape xulrunner firefox iceweasel mozilla; do
++ echo "Trying to find $i .pc files" >&5
++ i="${i}-xpcom ${i}-plugin"
++ if $PKG_CONFIG --exists --print-errors "$i" 2>&5
++ then
++ echo "Using $i .pc files." >&5
++ echo "Using $i .pc files." >&6
++ found=1
++ MOZILLA_CFLAGS=$( $PKG_CONFIG --cflags "$i" )
++ MOZILLA_LIBS=$( $PKG_CONFIG --libs "$i" )
++ break
++ fi
++ done
++ fi
+ fi
+-else
+- pkg_failed=untried
++ if test $found = 1; then
++
++ CPPFLAGS="${CPPFLAGS_save} ${MOZILLA_CFLAGS}"
++ MOZILLA_REQUIRED_HEADERS=1
++
++for ac_header in mozilla-config.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$FIREFOX_LIBS"; then
+- pkg_cv_FIREFOX_LIBS="$FIREFOX_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin\"") >&5
+- ($PKG_CONFIG --exists --print-errors "firefox-plugin") 2>&5
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++else
++ # Is the header compilable?
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_FIREFOX_LIBS=`$PKG_CONFIG --libs "firefox-plugin" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
++ (exit $ac_status); } && {
++ test -z "$ac_cxx_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_header_compiler=yes
+ else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
++ ac_header_compiler=no
+ fi
+- if test $_pkg_short_errors_supported = yes; then
+- FIREFOX_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "firefox-plugin"`
+- else
+- FIREFOX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-plugin"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$FIREFOX_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for XULRUNNER" >&5
+-echo $ECHO_N "checking for XULRUNNER... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$XULRUNNER_CFLAGS"; then
+- pkg_cv_XULRUNNER_CFLAGS="$XULRUNNER_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libxul") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_XULRUNNER_CFLAGS=`$PKG_CONFIG --cflags "libxul" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$XULRUNNER_LIBS"; then
+- pkg_cv_XULRUNNER_LIBS="$XULRUNNER_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libxul") 2>&5
++# Is the header present?
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <$ac_header>
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_XULRUNNER_LIBS=`$PKG_CONFIG --libs "libxul" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++ test ! -s conftest.err
++ }; then
++ ac_header_preproc=yes
+ else
+- pkg_failed=untried
+-fi
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_header_preproc=no
++fi
+
++rm -f conftest.err conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+-if test $pkg_failed = yes; then
++# So? What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
++ yes:no: )
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ ac_header_preproc=yes
++ ;;
++ no:yes:* )
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
++ ;;
++esac
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- _pkg_short_errors_supported=no
++ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+- if test $_pkg_short_errors_supported = yes; then
+- XULRUNNER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxul"`
+- else
+- XULRUNNER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxul"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$XULRUNNER_PKG_ERRORS" >&5
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+
+- # Extract the first word of "mozilla-config", so it can be a program name with args.
+-set dummy mozilla-config; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_MOZILLA_CONFIG+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- case $MOZILLA_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_MOZILLA_CONFIG="$MOZILLA_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_MOZILLA_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
++ MOZILLA_REQUIRED_HEADERS=0
++fi
++
+ done
+-IFS=$as_save_IFS
+
+- test -z "$ac_cv_path_MOZILLA_CONFIG" && ac_cv_path_MOZILLA_CONFIG="no"
+- ;;
+-esac
++
++for ac_header in npapi.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-MOZILLA_CONFIG=$ac_cv_path_MOZILLA_CONFIG
+-if test -n "$MOZILLA_CONFIG"; then
+- { echo "$as_me:$LINENO: result: $MOZILLA_CONFIG" >&5
+-echo "${ECHO_T}$MOZILLA_CONFIG" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
++ # Is the header compilable?
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_cxx_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_header_compiler=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_header_compiler=no
++fi
+
+- if test "${MOZILLA_CONFIG}" = "no"
+- then
+- # Extract the first word of "seamonkey-config", so it can be a program name with args.
+-set dummy seamonkey-config; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_SEAMONKEY_CONFIG+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $SEAMONKEY_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_SEAMONKEY_CONFIG="$SEAMONKEY_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_SEAMONKEY_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+- test -z "$ac_cv_path_SEAMONKEY_CONFIG" && ac_cv_path_SEAMONKEY_CONFIG="no"
+- ;;
++# Is the header present?
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <$ac_header>
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+-fi
+-SEAMONKEY_CONFIG=$ac_cv_path_SEAMONKEY_CONFIG
+-if test -n "$SEAMONKEY_CONFIG"; then
+- { echo "$as_me:$LINENO: result: $SEAMONKEY_CONFIG" >&5
+-echo "${ECHO_T}$SEAMONKEY_CONFIG" >&6; }
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++ test ! -s conftest.err
++ }; then
++ ac_header_preproc=yes
+ else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_header_preproc=no
+ fi
+
++rm -f conftest.err conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+- if test "${SEAMONKEY_CONFIG}" = "no"
+- then
+- # Extract the first word of "xulrunner-config", so it can be a program name with args.
+-set dummy xulrunner-config; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_XULRUNNER_CONFIG+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $XULRUNNER_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_XULRUNNER_CONFIG="$XULRUNNER_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_XULRUNNER_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
++# So? What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
++ yes:no: )
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ ac_header_preproc=yes
++ ;;
++ no:yes:* )
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+- test -z "$ac_cv_path_XULRUNNER_CONFIG" && ac_cv_path_XULRUNNER_CONFIG="no"
+- ;;
++ ;;
+ esac
+-fi
+-XULRUNNER_CONFIG=$ac_cv_path_XULRUNNER_CONFIG
+-if test -n "$XULRUNNER_CONFIG"; then
+- { echo "$as_me:$LINENO: result: $XULRUNNER_CONFIG" >&5
+-echo "${ECHO_T}$XULRUNNER_CONFIG" >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+
+- if test "${XULRUNNER_CONFIG}" = "no"
+- then
+- { { echo "$as_me:$LINENO: error: Please install the Mozilla development tools, mozilla-config was not found." >&5
+-echo "$as_me: error: Please install the Mozilla development tools, mozilla-config was not found." >&2;}
+- { (exit 1); exit 1; }; }
+- else
+- have_xul=true
+- MOZILLA_CONFIG="${XULRUNNER_CONFIG}"
+- fi
+- else
+- MOZILLA_CONFIG="${SEAMONKEY_CONFIG}"
+- fi
+- fi
++else
++ MOZILLA_REQUIRED_HEADERS=0
++fi
+
++done
+
+-elif test $pkg_failed = untried; then
+
+- # Extract the first word of "mozilla-config", so it can be a program name with args.
+-set dummy mozilla-config; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_MOZILLA_CONFIG+set}" = set; then
++for ac_header in npruntime.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- case $MOZILLA_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_MOZILLA_CONFIG="$MOZILLA_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_MOZILLA_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#if HAVE_NPAPI_H
++ # include <npapi.h>
++ #endif
+
+- test -z "$ac_cv_path_MOZILLA_CONFIG" && ac_cv_path_MOZILLA_CONFIG="no"
+- ;;
++
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+-fi
+-MOZILLA_CONFIG=$ac_cv_path_MOZILLA_CONFIG
+-if test -n "$MOZILLA_CONFIG"; then
+- { echo "$as_me:$LINENO: result: $MOZILLA_CONFIG" >&5
+-echo "${ECHO_T}$MOZILLA_CONFIG" >&6; }
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_cxx_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ eval "$as_ac_Header=yes"
+ else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ eval "$as_ac_Header=no"
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+
+- if test "${MOZILLA_CONFIG}" = "no"
+- then
+- # Extract the first word of "seamonkey-config", so it can be a program name with args.
+-set dummy seamonkey-config; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_SEAMONKEY_CONFIG+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- case $SEAMONKEY_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_SEAMONKEY_CONFIG="$SEAMONKEY_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_SEAMONKEY_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_SEAMONKEY_CONFIG" && ac_cv_path_SEAMONKEY_CONFIG="no"
+- ;;
+-esac
+-fi
+-SEAMONKEY_CONFIG=$ac_cv_path_SEAMONKEY_CONFIG
+-if test -n "$SEAMONKEY_CONFIG"; then
+- { echo "$as_me:$LINENO: result: $SEAMONKEY_CONFIG" >&5
+-echo "${ECHO_T}$SEAMONKEY_CONFIG" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+- if test "${SEAMONKEY_CONFIG}" = "no"
+- then
+- # Extract the first word of "xulrunner-config", so it can be a program name with args.
+-set dummy xulrunner-config; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_XULRUNNER_CONFIG+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $XULRUNNER_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_XULRUNNER_CONFIG="$XULRUNNER_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_XULRUNNER_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_XULRUNNER_CONFIG" && ac_cv_path_XULRUNNER_CONFIG="no"
+- ;;
+-esac
+-fi
+-XULRUNNER_CONFIG=$ac_cv_path_XULRUNNER_CONFIG
+-if test -n "$XULRUNNER_CONFIG"; then
+- { echo "$as_me:$LINENO: result: $XULRUNNER_CONFIG" >&5
+-echo "${ECHO_T}$XULRUNNER_CONFIG" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+- if test "${XULRUNNER_CONFIG}" = "no"
+- then
+- { { echo "$as_me:$LINENO: error: Please install the Mozilla development tools, mozilla-config was not found." >&5
+-echo "$as_me: error: Please install the Mozilla development tools, mozilla-config was not found." >&2;}
+- { (exit 1); exit 1; }; }
+- else
+- have_xul=true
+- MOZILLA_CONFIG="${XULRUNNER_CONFIG}"
+- fi
+- else
+- MOZILLA_CONFIG="${SEAMONKEY_CONFIG}"
+- fi
+- fi
+-
+-
+-else
+- XULRUNNER_CFLAGS=$pkg_cv_XULRUNNER_CFLAGS
+- XULRUNNER_LIBS=$pkg_cv_XULRUNNER_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for FIREFOX_XPCOM" >&5
+-echo $ECHO_N "checking for FIREFOX_XPCOM... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$FIREFOX_XPCOM_CFLAGS"; then
+- pkg_cv_FIREFOX_XPCOM_CFLAGS="$FIREFOX_XPCOM_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-xpcom\"") >&5
+- ($PKG_CONFIG --exists --print-errors "firefox-xpcom") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_FIREFOX_XPCOM_CFLAGS=`$PKG_CONFIG --cflags "firefox-xpcom" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$FIREFOX_XPCOM_LIBS"; then
+- pkg_cv_FIREFOX_XPCOM_LIBS="$FIREFOX_XPCOM_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-xpcom\"") >&5
+- ($PKG_CONFIG --exists --print-errors "firefox-xpcom") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_FIREFOX_XPCOM_LIBS=`$PKG_CONFIG --libs "firefox-xpcom" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- FIREFOX_XPCOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "firefox-xpcom"`
+- else
+- FIREFOX_XPCOM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-xpcom"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$FIREFOX_XPCOM_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for MOZILLA_NSPR" >&5
+-echo $ECHO_N "checking for MOZILLA_NSPR... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$MOZILLA_NSPR_CFLAGS"; then
+- pkg_cv_MOZILLA_NSPR_CFLAGS="$MOZILLA_NSPR_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "mozilla-nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_MOZILLA_NSPR_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$MOZILLA_NSPR_LIBS"; then
+- pkg_cv_MOZILLA_NSPR_LIBS="$MOZILLA_NSPR_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "mozilla-nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_MOZILLA_NSPR_LIBS=`$PKG_CONFIG --libs "mozilla-nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- MOZILLA_NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-nspr"`
+- else
+- MOZILLA_NSPR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-nspr"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$MOZILLA_NSPR_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for NSPR" >&5
+-echo $ECHO_N "checking for NSPR... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_CFLAGS"; then
+- pkg_cv_NSPR_CFLAGS="$NSPR_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_LIBS"; then
+- pkg_cv_NSPR_LIBS="$NSPR_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nspr"`
+- else
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$NSPR_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-elif test $pkg_failed = untried; then
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-else
+- NSPR_CFLAGS=$pkg_cv_NSPR_CFLAGS
+- NSPR_LIBS=$pkg_cv_NSPR_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+-
+-
+-elif test $pkg_failed = untried; then
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for NSPR" >&5
+-echo $ECHO_N "checking for NSPR... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_CFLAGS"; then
+- pkg_cv_NSPR_CFLAGS="$NSPR_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_LIBS"; then
+- pkg_cv_NSPR_LIBS="$NSPR_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nspr"`
+- else
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$NSPR_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-elif test $pkg_failed = untried; then
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-else
+- NSPR_CFLAGS=$pkg_cv_NSPR_CFLAGS
+- NSPR_LIBS=$pkg_cv_NSPR_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+-
+-
+-else
+- MOZILLA_NSPR_CFLAGS=$pkg_cv_MOZILLA_NSPR_CFLAGS
+- MOZILLA_NSPR_LIBS=$pkg_cv_MOZILLA_NSPR_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+-
+-
+-elif test $pkg_failed = untried; then
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for MOZILLA_NSPR" >&5
+-echo $ECHO_N "checking for MOZILLA_NSPR... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$MOZILLA_NSPR_CFLAGS"; then
+- pkg_cv_MOZILLA_NSPR_CFLAGS="$MOZILLA_NSPR_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "mozilla-nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_MOZILLA_NSPR_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$MOZILLA_NSPR_LIBS"; then
+- pkg_cv_MOZILLA_NSPR_LIBS="$MOZILLA_NSPR_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "mozilla-nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_MOZILLA_NSPR_LIBS=`$PKG_CONFIG --libs "mozilla-nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- MOZILLA_NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-nspr"`
+- else
+- MOZILLA_NSPR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-nspr"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$MOZILLA_NSPR_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for NSPR" >&5
+-echo $ECHO_N "checking for NSPR... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_CFLAGS"; then
+- pkg_cv_NSPR_CFLAGS="$NSPR_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_LIBS"; then
+- pkg_cv_NSPR_LIBS="$NSPR_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nspr"`
+- else
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$NSPR_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-elif test $pkg_failed = untried; then
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-else
+- NSPR_CFLAGS=$pkg_cv_NSPR_CFLAGS
+- NSPR_LIBS=$pkg_cv_NSPR_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+-
+-
+-elif test $pkg_failed = untried; then
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for NSPR" >&5
+-echo $ECHO_N "checking for NSPR... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_CFLAGS"; then
+- pkg_cv_NSPR_CFLAGS="$NSPR_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_LIBS"; then
+- pkg_cv_NSPR_LIBS="$NSPR_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nspr"`
+- else
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$NSPR_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-elif test $pkg_failed = untried; then
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-else
+- NSPR_CFLAGS=$pkg_cv_NSPR_CFLAGS
+- NSPR_LIBS=$pkg_cv_NSPR_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+-
+-
+-else
+- MOZILLA_NSPR_CFLAGS=$pkg_cv_MOZILLA_NSPR_CFLAGS
+- MOZILLA_NSPR_LIBS=$pkg_cv_MOZILLA_NSPR_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+-
+-
+-else
+- FIREFOX_XPCOM_CFLAGS=$pkg_cv_FIREFOX_XPCOM_CFLAGS
+- FIREFOX_XPCOM_LIBS=$pkg_cv_FIREFOX_XPCOM_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+- CPPFLAGS="${CPPFLAGS_save} ${XULRUNNER_CFLAGS} ${XULRUNNER_CPPFLAGS} ${FIREFOX_XPCOM_CFLAGS} ${MOZILLA_NSPR_CFLAGS} ${NSPR_CFLAGS} ${MOZILLA_CPPFLAGS}"
+- MOZILLA_REQUIRED_HEADERS=1
+-
+-for ac_header in npapi.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-else
+- # Is the header compilable?
+-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6; }
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-
+- ;;
+-esac
+-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-else
+- MOZILLA_REQUIRED_HEADERS=0
+-fi
+-
+-done
+-
+-
+-for ac_header in npruntime.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#if HAVE_NPAPI_H
+- # include <npapi.h>
+- #endif
+-
+-
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- eval "$as_ac_Header=yes"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_Header=no"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-else
+- MOZILLA_REQUIRED_HEADERS=0
+-fi
+-
+-done
+-
+- if test "${MOZILLA_REQUIRED_HEADERS}" = "0"; then
+- { { echo "$as_me:$LINENO: error: Please install the Mozilla runtime package xulrunner-devel; plugplugin/npapi.h and plugin/npruntime.h were not found." >&5
+-echo "$as_me: error: Please install the Mozilla runtime package xulrunner-devel; plugplugin/npapi.h and plugin/npruntime.h were not found." >&2;}
+- { (exit 1); exit 1; }; }
+- fi
+- MOZILLA_REQUIRED_HEADERS=
+- mozilla=:
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define XP_UNIX 1
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define MOZ_X11 1
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define OJI 1
+-_ACEOF
+-
+-
+-for ac_header in X11/xpm.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-else
+- # Is the header compilable?
+-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6; }
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-
+- ;;
+-esac
+-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-else
+- { { echo "$as_me:$LINENO: error: Please install libXpm-devel library for required X11/xpm.h" >&5
+-echo "$as_me: error: Please install libXpm-devel library for required X11/xpm.h" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-
+-done
+-
+-
+- for element in mozilla; do
+- eval "LIBS_${element}="'"'"${X_LIBS} ${X_PRE_LIBS} -lX11 -lXt -lXpm "'$'"{LIBS_${element}} "'"'
+- am_modules_with_libs="${am_modules_with_libs} ${element}"
+- done
+-
+-
+- for element in mozilla; do
+- eval "CPPFLAGS_${element}="'"$'"{CPPFLAGS_${element}} ${CPPFLAGS}"'"'
+- am_modules_with_cppflags="${am_modules_with_cppflags} ${element}"
+- done
+-
+-
+- for element in mozilla; do
+- eval "LDFLAGS_${element}="'"'"${MOZILLA_LDFLAGS} "'$'"{LDFLAGS_${element}} "'"'
+- am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+- done
+-
+-
+- for element in mozilla; do
+- eval "LIBS_${element}="'"'"${FIREFOX_LIBS} ${MOZILLA_NSPR_LIBS} ${NSPR_LIBS} "'$'"{LIBS_${element}} "'"'
+- am_modules_with_libs="${am_modules_with_libs} ${element}"
+- done
+-
+-
+- PLUGINS="${PLUGINS} mozilla"
+- LTLIBmozilla="libmozilla_plugin.la"
+-
+-
+- MOZILLA_CONFIG=
+- CPPFLAGS="${CPPFLAGS_save}"
+-
+-fi
+-
+-
+-elif test $pkg_failed = untried; then
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for XULRUNNER" >&5
+-echo $ECHO_N "checking for XULRUNNER... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$XULRUNNER_CFLAGS"; then
+- pkg_cv_XULRUNNER_CFLAGS="$XULRUNNER_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libxul") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_XULRUNNER_CFLAGS=`$PKG_CONFIG --cflags "libxul" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$XULRUNNER_LIBS"; then
+- pkg_cv_XULRUNNER_LIBS="$XULRUNNER_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libxul") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_XULRUNNER_LIBS=`$PKG_CONFIG --libs "libxul" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- XULRUNNER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxul"`
+- else
+- XULRUNNER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxul"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$XULRUNNER_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+- # Extract the first word of "mozilla-config", so it can be a program name with args.
+-set dummy mozilla-config; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_MOZILLA_CONFIG+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $MOZILLA_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_MOZILLA_CONFIG="$MOZILLA_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_MOZILLA_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_MOZILLA_CONFIG" && ac_cv_path_MOZILLA_CONFIG="no"
+- ;;
+-esac
+-fi
+-MOZILLA_CONFIG=$ac_cv_path_MOZILLA_CONFIG
+-if test -n "$MOZILLA_CONFIG"; then
+- { echo "$as_me:$LINENO: result: $MOZILLA_CONFIG" >&5
+-echo "${ECHO_T}$MOZILLA_CONFIG" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+- if test "${MOZILLA_CONFIG}" = "no"
+- then
+- # Extract the first word of "seamonkey-config", so it can be a program name with args.
+-set dummy seamonkey-config; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_SEAMONKEY_CONFIG+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $SEAMONKEY_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_SEAMONKEY_CONFIG="$SEAMONKEY_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_SEAMONKEY_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_SEAMONKEY_CONFIG" && ac_cv_path_SEAMONKEY_CONFIG="no"
+- ;;
+-esac
+-fi
+-SEAMONKEY_CONFIG=$ac_cv_path_SEAMONKEY_CONFIG
+-if test -n "$SEAMONKEY_CONFIG"; then
+- { echo "$as_me:$LINENO: result: $SEAMONKEY_CONFIG" >&5
+-echo "${ECHO_T}$SEAMONKEY_CONFIG" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+- if test "${SEAMONKEY_CONFIG}" = "no"
+- then
+- # Extract the first word of "xulrunner-config", so it can be a program name with args.
+-set dummy xulrunner-config; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_XULRUNNER_CONFIG+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $XULRUNNER_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_XULRUNNER_CONFIG="$XULRUNNER_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_XULRUNNER_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_XULRUNNER_CONFIG" && ac_cv_path_XULRUNNER_CONFIG="no"
+- ;;
+-esac
+-fi
+-XULRUNNER_CONFIG=$ac_cv_path_XULRUNNER_CONFIG
+-if test -n "$XULRUNNER_CONFIG"; then
+- { echo "$as_me:$LINENO: result: $XULRUNNER_CONFIG" >&5
+-echo "${ECHO_T}$XULRUNNER_CONFIG" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+- if test "${XULRUNNER_CONFIG}" = "no"
+- then
+- { { echo "$as_me:$LINENO: error: Please install the Mozilla development tools, mozilla-config was not found." >&5
+-echo "$as_me: error: Please install the Mozilla development tools, mozilla-config was not found." >&2;}
+- { (exit 1); exit 1; }; }
+- else
+- have_xul=true
+- MOZILLA_CONFIG="${XULRUNNER_CONFIG}"
+- fi
+- else
+- MOZILLA_CONFIG="${SEAMONKEY_CONFIG}"
+- fi
+- fi
+-
+-
+-elif test $pkg_failed = untried; then
+-
+- # Extract the first word of "mozilla-config", so it can be a program name with args.
+-set dummy mozilla-config; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_MOZILLA_CONFIG+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $MOZILLA_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_MOZILLA_CONFIG="$MOZILLA_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_MOZILLA_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_MOZILLA_CONFIG" && ac_cv_path_MOZILLA_CONFIG="no"
+- ;;
+-esac
+-fi
+-MOZILLA_CONFIG=$ac_cv_path_MOZILLA_CONFIG
+-if test -n "$MOZILLA_CONFIG"; then
+- { echo "$as_me:$LINENO: result: $MOZILLA_CONFIG" >&5
+-echo "${ECHO_T}$MOZILLA_CONFIG" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+- if test "${MOZILLA_CONFIG}" = "no"
+- then
+- # Extract the first word of "seamonkey-config", so it can be a program name with args.
+-set dummy seamonkey-config; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_SEAMONKEY_CONFIG+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $SEAMONKEY_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_SEAMONKEY_CONFIG="$SEAMONKEY_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_SEAMONKEY_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_SEAMONKEY_CONFIG" && ac_cv_path_SEAMONKEY_CONFIG="no"
+- ;;
+-esac
+-fi
+-SEAMONKEY_CONFIG=$ac_cv_path_SEAMONKEY_CONFIG
+-if test -n "$SEAMONKEY_CONFIG"; then
+- { echo "$as_me:$LINENO: result: $SEAMONKEY_CONFIG" >&5
+-echo "${ECHO_T}$SEAMONKEY_CONFIG" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+- if test "${SEAMONKEY_CONFIG}" = "no"
+- then
+- # Extract the first word of "xulrunner-config", so it can be a program name with args.
+-set dummy xulrunner-config; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_XULRUNNER_CONFIG+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $XULRUNNER_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_XULRUNNER_CONFIG="$XULRUNNER_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_XULRUNNER_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_XULRUNNER_CONFIG" && ac_cv_path_XULRUNNER_CONFIG="no"
+- ;;
+-esac
+-fi
+-XULRUNNER_CONFIG=$ac_cv_path_XULRUNNER_CONFIG
+-if test -n "$XULRUNNER_CONFIG"; then
+- { echo "$as_me:$LINENO: result: $XULRUNNER_CONFIG" >&5
+-echo "${ECHO_T}$XULRUNNER_CONFIG" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+- if test "${XULRUNNER_CONFIG}" = "no"
+- then
+- { { echo "$as_me:$LINENO: error: Please install the Mozilla development tools, mozilla-config was not found." >&5
+-echo "$as_me: error: Please install the Mozilla development tools, mozilla-config was not found." >&2;}
+- { (exit 1); exit 1; }; }
+- else
+- have_xul=true
+- MOZILLA_CONFIG="${XULRUNNER_CONFIG}"
+- fi
+- else
+- MOZILLA_CONFIG="${SEAMONKEY_CONFIG}"
+- fi
+- fi
+-
+-
+-else
+- XULRUNNER_CFLAGS=$pkg_cv_XULRUNNER_CFLAGS
+- XULRUNNER_LIBS=$pkg_cv_XULRUNNER_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for FIREFOX_XPCOM" >&5
+-echo $ECHO_N "checking for FIREFOX_XPCOM... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$FIREFOX_XPCOM_CFLAGS"; then
+- pkg_cv_FIREFOX_XPCOM_CFLAGS="$FIREFOX_XPCOM_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-xpcom\"") >&5
+- ($PKG_CONFIG --exists --print-errors "firefox-xpcom") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_FIREFOX_XPCOM_CFLAGS=`$PKG_CONFIG --cflags "firefox-xpcom" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$FIREFOX_XPCOM_LIBS"; then
+- pkg_cv_FIREFOX_XPCOM_LIBS="$FIREFOX_XPCOM_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-xpcom\"") >&5
+- ($PKG_CONFIG --exists --print-errors "firefox-xpcom") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_FIREFOX_XPCOM_LIBS=`$PKG_CONFIG --libs "firefox-xpcom" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- FIREFOX_XPCOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "firefox-xpcom"`
+- else
+- FIREFOX_XPCOM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-xpcom"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$FIREFOX_XPCOM_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for MOZILLA_NSPR" >&5
+-echo $ECHO_N "checking for MOZILLA_NSPR... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$MOZILLA_NSPR_CFLAGS"; then
+- pkg_cv_MOZILLA_NSPR_CFLAGS="$MOZILLA_NSPR_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "mozilla-nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_MOZILLA_NSPR_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$MOZILLA_NSPR_LIBS"; then
+- pkg_cv_MOZILLA_NSPR_LIBS="$MOZILLA_NSPR_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "mozilla-nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_MOZILLA_NSPR_LIBS=`$PKG_CONFIG --libs "mozilla-nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- MOZILLA_NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-nspr"`
+- else
+- MOZILLA_NSPR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-nspr"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$MOZILLA_NSPR_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for NSPR" >&5
+-echo $ECHO_N "checking for NSPR... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_CFLAGS"; then
+- pkg_cv_NSPR_CFLAGS="$NSPR_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_LIBS"; then
+- pkg_cv_NSPR_LIBS="$NSPR_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nspr"`
+- else
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$NSPR_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-elif test $pkg_failed = untried; then
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-else
+- NSPR_CFLAGS=$pkg_cv_NSPR_CFLAGS
+- NSPR_LIBS=$pkg_cv_NSPR_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+-
+-
+-elif test $pkg_failed = untried; then
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for NSPR" >&5
+-echo $ECHO_N "checking for NSPR... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_CFLAGS"; then
+- pkg_cv_NSPR_CFLAGS="$NSPR_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_LIBS"; then
+- pkg_cv_NSPR_LIBS="$NSPR_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nspr"`
+- else
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$NSPR_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-elif test $pkg_failed = untried; then
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-else
+- NSPR_CFLAGS=$pkg_cv_NSPR_CFLAGS
+- NSPR_LIBS=$pkg_cv_NSPR_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+-
+-
+-else
+- MOZILLA_NSPR_CFLAGS=$pkg_cv_MOZILLA_NSPR_CFLAGS
+- MOZILLA_NSPR_LIBS=$pkg_cv_MOZILLA_NSPR_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+-
+-
+-elif test $pkg_failed = untried; then
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for MOZILLA_NSPR" >&5
+-echo $ECHO_N "checking for MOZILLA_NSPR... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$MOZILLA_NSPR_CFLAGS"; then
+- pkg_cv_MOZILLA_NSPR_CFLAGS="$MOZILLA_NSPR_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "mozilla-nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_MOZILLA_NSPR_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$MOZILLA_NSPR_LIBS"; then
+- pkg_cv_MOZILLA_NSPR_LIBS="$MOZILLA_NSPR_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "mozilla-nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_MOZILLA_NSPR_LIBS=`$PKG_CONFIG --libs "mozilla-nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- MOZILLA_NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-nspr"`
+- else
+- MOZILLA_NSPR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-nspr"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$MOZILLA_NSPR_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for NSPR" >&5
+-echo $ECHO_N "checking for NSPR... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_CFLAGS"; then
+- pkg_cv_NSPR_CFLAGS="$NSPR_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_LIBS"; then
+- pkg_cv_NSPR_LIBS="$NSPR_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nspr"`
+- else
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$NSPR_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-elif test $pkg_failed = untried; then
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-else
+- NSPR_CFLAGS=$pkg_cv_NSPR_CFLAGS
+- NSPR_LIBS=$pkg_cv_NSPR_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+-
+-
+-elif test $pkg_failed = untried; then
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for NSPR" >&5
+-echo $ECHO_N "checking for NSPR... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_CFLAGS"; then
+- pkg_cv_NSPR_CFLAGS="$NSPR_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_LIBS"; then
+- pkg_cv_NSPR_LIBS="$NSPR_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nspr"`
+- else
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$NSPR_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-elif test $pkg_failed = untried; then
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-else
+- NSPR_CFLAGS=$pkg_cv_NSPR_CFLAGS
+- NSPR_LIBS=$pkg_cv_NSPR_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+-
+-
+-else
+- MOZILLA_NSPR_CFLAGS=$pkg_cv_MOZILLA_NSPR_CFLAGS
+- MOZILLA_NSPR_LIBS=$pkg_cv_MOZILLA_NSPR_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+-
+-
+-else
+- FIREFOX_XPCOM_CFLAGS=$pkg_cv_FIREFOX_XPCOM_CFLAGS
+- FIREFOX_XPCOM_LIBS=$pkg_cv_FIREFOX_XPCOM_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+- CPPFLAGS="${CPPFLAGS_save} ${XULRUNNER_CFLAGS} ${XULRUNNER_CPPFLAGS} ${FIREFOX_XPCOM_CFLAGS} ${MOZILLA_NSPR_CFLAGS} ${NSPR_CFLAGS} ${MOZILLA_CPPFLAGS}"
+- MOZILLA_REQUIRED_HEADERS=1
+-
+-for ac_header in npapi.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-else
+- # Is the header compilable?
+-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6; }
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-
+- ;;
+-esac
+-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-else
+- MOZILLA_REQUIRED_HEADERS=0
+-fi
+-
+-done
+-
+-
+-for ac_header in npruntime.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#if HAVE_NPAPI_H
+- # include <npapi.h>
+- #endif
+-
+-
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- eval "$as_ac_Header=yes"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_Header=no"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-else
+- MOZILLA_REQUIRED_HEADERS=0
+-fi
+-
+-done
+-
+- if test "${MOZILLA_REQUIRED_HEADERS}" = "0"; then
+- { { echo "$as_me:$LINENO: error: Please install the Mozilla runtime package xulrunner-devel; plugplugin/npapi.h and plugin/npruntime.h were not found." >&5
+-echo "$as_me: error: Please install the Mozilla runtime package xulrunner-devel; plugplugin/npapi.h and plugin/npruntime.h were not found." >&2;}
+- { (exit 1); exit 1; }; }
+- fi
+- MOZILLA_REQUIRED_HEADERS=
+- mozilla=:
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define XP_UNIX 1
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define MOZ_X11 1
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define OJI 1
+-_ACEOF
+-
+-
+-for ac_header in X11/xpm.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-else
+- # Is the header compilable?
+-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6; }
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-
+- ;;
+-esac
+-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-else
+- { { echo "$as_me:$LINENO: error: Please install libXpm-devel library for required X11/xpm.h" >&5
+-echo "$as_me: error: Please install libXpm-devel library for required X11/xpm.h" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-
+-done
+-
+-
+- for element in mozilla; do
+- eval "LIBS_${element}="'"'"${X_LIBS} ${X_PRE_LIBS} -lX11 -lXt -lXpm "'$'"{LIBS_${element}} "'"'
+- am_modules_with_libs="${am_modules_with_libs} ${element}"
+- done
+-
+-
+- for element in mozilla; do
+- eval "CPPFLAGS_${element}="'"$'"{CPPFLAGS_${element}} ${CPPFLAGS}"'"'
+- am_modules_with_cppflags="${am_modules_with_cppflags} ${element}"
+- done
+-
+-
+- for element in mozilla; do
+- eval "LDFLAGS_${element}="'"'"${MOZILLA_LDFLAGS} "'$'"{LDFLAGS_${element}} "'"'
+- am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+- done
+-
+-
+- for element in mozilla; do
+- eval "LIBS_${element}="'"'"${FIREFOX_LIBS} ${MOZILLA_NSPR_LIBS} ${NSPR_LIBS} "'$'"{LIBS_${element}} "'"'
+- am_modules_with_libs="${am_modules_with_libs} ${element}"
+- done
+-
+-
+- PLUGINS="${PLUGINS} mozilla"
+- LTLIBmozilla="libmozilla_plugin.la"
+-
+-
+- MOZILLA_CONFIG=
+- CPPFLAGS="${CPPFLAGS_save}"
+-
+-fi
+-
+-
+-else
+- FIREFOX_CFLAGS=$pkg_cv_FIREFOX_CFLAGS
+- FIREFOX_LIBS=$pkg_cv_FIREFOX_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for FIREFOX_XPCOM" >&5
+-echo $ECHO_N "checking for FIREFOX_XPCOM... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$FIREFOX_XPCOM_CFLAGS"; then
+- pkg_cv_FIREFOX_XPCOM_CFLAGS="$FIREFOX_XPCOM_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-xpcom\"") >&5
+- ($PKG_CONFIG --exists --print-errors "firefox-xpcom") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_FIREFOX_XPCOM_CFLAGS=`$PKG_CONFIG --cflags "firefox-xpcom" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$FIREFOX_XPCOM_LIBS"; then
+- pkg_cv_FIREFOX_XPCOM_LIBS="$FIREFOX_XPCOM_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-xpcom\"") >&5
+- ($PKG_CONFIG --exists --print-errors "firefox-xpcom") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_FIREFOX_XPCOM_LIBS=`$PKG_CONFIG --libs "firefox-xpcom" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- FIREFOX_XPCOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "firefox-xpcom"`
+- else
+- FIREFOX_XPCOM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-xpcom"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$FIREFOX_XPCOM_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for MOZILLA_NSPR" >&5
+-echo $ECHO_N "checking for MOZILLA_NSPR... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$MOZILLA_NSPR_CFLAGS"; then
+- pkg_cv_MOZILLA_NSPR_CFLAGS="$MOZILLA_NSPR_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "mozilla-nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_MOZILLA_NSPR_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$MOZILLA_NSPR_LIBS"; then
+- pkg_cv_MOZILLA_NSPR_LIBS="$MOZILLA_NSPR_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "mozilla-nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_MOZILLA_NSPR_LIBS=`$PKG_CONFIG --libs "mozilla-nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- MOZILLA_NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-nspr"`
+- else
+- MOZILLA_NSPR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-nspr"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$MOZILLA_NSPR_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for NSPR" >&5
+-echo $ECHO_N "checking for NSPR... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_CFLAGS"; then
+- pkg_cv_NSPR_CFLAGS="$NSPR_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_LIBS"; then
+- pkg_cv_NSPR_LIBS="$NSPR_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nspr"`
+- else
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$NSPR_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-elif test $pkg_failed = untried; then
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-else
+- NSPR_CFLAGS=$pkg_cv_NSPR_CFLAGS
+- NSPR_LIBS=$pkg_cv_NSPR_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+-
+-
+-elif test $pkg_failed = untried; then
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for NSPR" >&5
+-echo $ECHO_N "checking for NSPR... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_CFLAGS"; then
+- pkg_cv_NSPR_CFLAGS="$NSPR_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_LIBS"; then
+- pkg_cv_NSPR_LIBS="$NSPR_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nspr"`
+- else
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$NSPR_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-elif test $pkg_failed = untried; then
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-else
+- NSPR_CFLAGS=$pkg_cv_NSPR_CFLAGS
+- NSPR_LIBS=$pkg_cv_NSPR_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+-
+-
+-else
+- MOZILLA_NSPR_CFLAGS=$pkg_cv_MOZILLA_NSPR_CFLAGS
+- MOZILLA_NSPR_LIBS=$pkg_cv_MOZILLA_NSPR_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+-
+-elif test $pkg_failed = untried; then
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for MOZILLA_NSPR" >&5
+-echo $ECHO_N "checking for MOZILLA_NSPR... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$MOZILLA_NSPR_CFLAGS"; then
+- pkg_cv_MOZILLA_NSPR_CFLAGS="$MOZILLA_NSPR_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "mozilla-nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_MOZILLA_NSPR_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$MOZILLA_NSPR_LIBS"; then
+- pkg_cv_MOZILLA_NSPR_LIBS="$MOZILLA_NSPR_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "mozilla-nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_MOZILLA_NSPR_LIBS=`$PKG_CONFIG --libs "mozilla-nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- MOZILLA_NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-nspr"`
+- else
+- MOZILLA_NSPR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-nspr"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$MOZILLA_NSPR_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for NSPR" >&5
+-echo $ECHO_N "checking for NSPR... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_CFLAGS"; then
+- pkg_cv_NSPR_CFLAGS="$NSPR_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_LIBS"; then
+- pkg_cv_NSPR_LIBS="$NSPR_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nspr"`
+- else
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$NSPR_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-elif test $pkg_failed = untried; then
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-else
+- NSPR_CFLAGS=$pkg_cv_NSPR_CFLAGS
+- NSPR_LIBS=$pkg_cv_NSPR_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+-
+-
+-elif test $pkg_failed = untried; then
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for NSPR" >&5
+-echo $ECHO_N "checking for NSPR... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_CFLAGS"; then
+- pkg_cv_NSPR_CFLAGS="$NSPR_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NSPR_LIBS"; then
+- pkg_cv_NSPR_LIBS="$NSPR_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr\"") >&5
+- ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "nspr" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nspr"`
+- else
+- NSPR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$NSPR_PKG_ERRORS" >&5
+-
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-elif test $pkg_failed = untried; then
+-
+- { { echo "$as_me:$LINENO: error: Please install the nspr development tools." >&5
+-echo "$as_me: error: Please install the nspr development tools." >&2;}
+- { (exit 1); exit 1; }; }
+-
+-
+-else
+- NSPR_CFLAGS=$pkg_cv_NSPR_CFLAGS
+- NSPR_LIBS=$pkg_cv_NSPR_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+-
+-
+-else
+- MOZILLA_NSPR_CFLAGS=$pkg_cv_MOZILLA_NSPR_CFLAGS
+- MOZILLA_NSPR_LIBS=$pkg_cv_MOZILLA_NSPR_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+-
+-else
+- FIREFOX_XPCOM_CFLAGS=$pkg_cv_FIREFOX_XPCOM_CFLAGS
+- FIREFOX_XPCOM_LIBS=$pkg_cv_FIREFOX_XPCOM_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+- CPPFLAGS="${CPPFLAGS_save} ${FIREFOX_CFLAGS} ${FIREFOX_XPCOM_CFLAGS} ${MOZILLA_NSPR_CFLAGS} ${NSPR_CFLAGS} ${MOZILLA_CPPFLAGS}"
+- MOZILLA_REQUIRED_HEADERS=1
+-
+-for ac_header in mozilla-config.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-else
+- # Is the header compilable?
+-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6; }
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-
+- ;;
+-esac
+-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-else
+- MOZILLA_REQUIRED_HEADERS=0
+-fi
+-
+-done
+-
+-
+-for ac_header in npapi.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-else
+- # Is the header compilable?
+-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6; }
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-
+- ;;
+-esac
+-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-else
+- MOZILLA_REQUIRED_HEADERS=0
+-fi
+-
+-done
+-
+-
+-for ac_header in npruntime.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#if HAVE_NPAPI_H
+- # include <npapi.h>
+- #endif
+-
+-
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- eval "$as_ac_Header=yes"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_Header=no"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-else
+- MOZILLA_REQUIRED_HEADERS=0
+-fi
+-
++ MOZILLA_REQUIRED_HEADERS=0
++fi
++
+ done
+
+ if test "${MOZILLA_REQUIRED_HEADERS}" = "0"; then
+@@ -72560,15 +69315,19 @@
+ fi
+ MOZILLA_REQUIRED_HEADERS=
+ mozilla=:
+- firefox_include=`pkg-config --variable=includedir firefox-plugin`
+- if test -f "${firefox_include}/mozilla-config.h" -a -f "${firefox_include}/mozilla-config32.h"; then
+- MOZILLA_CONFIG_H="${firefox_include}/mozilla-config32.h"
+- elif test -f "${firefox_include}/mozilla-config.h" -a -f "${firefox_include}/mozilla-config64.h"; then
+- MOZILLA_CONFIG_H="${firefox_include}/mozilla-config64.h"
+- else
+- MOZILLA_CONFIG_H="${firefox_include}/mozilla-config.h"
+- fi
+- if grep '^#define MOZ_X11 1' ${MOZILLA_CONFIG_H} 2>&1 > /dev/null ; then
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <mozilla-config.h>
++ #ifdef MOZ_X11
++ yes
++ #endif
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "yes" >/dev/null 2>&1; then
+
+ for ac_header in X11/xpm.h
+ do
+@@ -72719,22 +69478,19 @@
+ am_modules_with_libs="${am_modules_with_libs} ${element}"
+ done
+
+- fi
+
+- for element in mozilla; do
+- eval "CPPFLAGS_${element}="'"$'"{CPPFLAGS_${element}} ${CPPFLAGS}"'"'
+- am_modules_with_cppflags="${am_modules_with_cppflags} ${element}"
+- done
++fi
++rm -f conftest*
+
+
+ for element in mozilla; do
+- eval "LDFLAGS_${element}="'"'"${MOZILLA_LDFLAGS} "'$'"{LDFLAGS_${element}} "'"'
+- am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
++ eval "CPPFLAGS_${element}="'"$'"{CPPFLAGS_${element}} ${CPPFLAGS}"'"'
++ am_modules_with_cppflags="${am_modules_with_cppflags} ${element}"
+ done
+
+
+ for element in mozilla; do
+- eval "LIBS_${element}="'"'"${FIREFOX_LIBS} ${MOZILLA_NSPR_LIBS} ${NSPR_LIBS} "'$'"{LIBS_${element}} "'"'
++ eval "LIBS_${element}="'"'"${MOZILLA_LIBS} "'$'"{LIBS_${element}} "'"'
+ am_modules_with_libs="${am_modules_with_libs} ${element}"
+ done
+
+@@ -72743,12 +69499,67 @@
+ LTLIBmozilla="libmozilla_plugin.la"
+
+
++ PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
+ MOZILLA_CONFIG=
+ CPPFLAGS="${CPPFLAGS_save}"
+
++else
++
++ for ac_prog in mozilla-config seamonkey-config xulrunner-config
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_MOZILLA_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $MOZILLA_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_MOZILLA_CONFIG="$MOZILLA_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_MOZILLA_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
+ fi
+- if test ! -z "${MOZILLA_CONFIG}"
+- then
++MOZILLA_CONFIG=$ac_cv_path_MOZILLA_CONFIG
++if test -n "$MOZILLA_CONFIG"; then
++ { echo "$as_me:$LINENO: result: $MOZILLA_CONFIG" >&5
++echo "${ECHO_T}$MOZILLA_CONFIG" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++ test -n "$MOZILLA_CONFIG" && break
++done
++test -n "$MOZILLA_CONFIG" || MOZILLA_CONFIG="{ { echo "$as_me:$LINENO: error: Please install the Mozilla development tools. mozilla-config was not found." >&5
++echo "$as_me: error: Please install the Mozilla development tools. mozilla-config was not found." >&2;}
++ { (exit 1); exit 1; }; }
++ "
++
++
++
++fi
++
++ if test ! -z "${MOZILLA_CONFIG}"; then
++
+ if ${MOZILLA_CONFIG} --defines | grep -q 'MOZ_X11=1'; then
+ LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}"
+ { echo "$as_me:$LINENO: checking for XtStrings in -lXt" >&5
+@@ -72981,25 +69792,16 @@
+ PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
+
+ for element in mozilla; do
+- eval "CPPFLAGS_${element}="'"$'"{CPPFLAGS_${element}} `${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`"'"'
++ eval "CPPFLAGS_${element}="'"$'"{CPPFLAGS_${element}} `${MOZILLA_CONFIG} --cflags plugin java`"'"'
+ am_modules_with_cppflags="${am_modules_with_cppflags} ${element}"
+ done
+
+- if ${need_xpcom_libs}; then
+-
+- for element in mozilla; do
+- eval "LIBS_${element}="'"'"`${MOZILLA_CONFIG} --libs plugin xpcom` "'$'"{LIBS_${element}} "'"'
+- am_modules_with_libs="${am_modules_with_libs} ${element}"
+- done
+-
+- else
+
+ for element in mozilla; do
+ eval "LIBS_${element}="'"'"`${MOZILLA_CONFIG} --libs plugin` "'$'"{LIBS_${element}} "'"'
+ am_modules_with_libs="${am_modules_with_libs} ${element}"
+ done
+
+- fi
+ CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mozilla}"
+ MOZILLA_REQUIRED_HEADERS=1
+
+@@ -73358,8 +70160,12 @@
+ MOZILLA_REQUIRED_HEADERS=
+ CPPFLAGS="${CPPFLAGS_save}"
+ MOZILLA_SDK_PATH="`${MOZILLA_CONFIG} --prefix`"
+- fi
+- else
++
++fi
++
++
++else
++
+ if test "${SYS}" = "mingw32"
+ then
+ if test -n "$ac_tool_prefix"; then
+@@ -73853,7 +70659,9 @@
+ real_mozilla_sdk="`${CYGPATH} -w ${real_mozilla_sdk}`"
+ fi
+ CPPFLAGS="${CPPFLAGS_save}"
+- fi
++
++fi
++
+ fi
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -76250,26 +73058,26 @@
+ HAS_WIDL_COMPILER_FALSE!$HAS_WIDL_COMPILER_FALSE$ac_delim
+ BUILD_ACTIVEX_TRUE!$BUILD_ACTIVEX_TRUE$ac_delim
+ BUILD_ACTIVEX_FALSE!$BUILD_ACTIVEX_FALSE$ac_delim
+-FIREFOX_CFLAGS!$FIREFOX_CFLAGS$ac_delim
+-FIREFOX_LIBS!$FIREFOX_LIBS$ac_delim
+-XULRUNNER_CFLAGS!$XULRUNNER_CFLAGS$ac_delim
+-XULRUNNER_LIBS!$XULRUNNER_LIBS$ac_delim
+-MOZILLA_CONFIG!$MOZILLA_CONFIG$ac_delim
+-SEAMONKEY_CONFIG!$SEAMONKEY_CONFIG$ac_delim
+-XULRUNNER_CONFIG!$XULRUNNER_CONFIG$ac_delim
+-FIREFOX_XPCOM_CFLAGS!$FIREFOX_XPCOM_CFLAGS$ac_delim
+-FIREFOX_XPCOM_LIBS!$FIREFOX_XPCOM_LIBS$ac_delim
+-MOZILLA_NSPR_CFLAGS!$MOZILLA_NSPR_CFLAGS$ac_delim
+-MOZILLA_NSPR_LIBS!$MOZILLA_NSPR_LIBS$ac_delim
+-NSPR_CFLAGS!$NSPR_CFLAGS$ac_delim
+-NSPR_LIBS!$NSPR_LIBS$ac_delim
++MOZILLA_CFLAGS!$MOZILLA_CFLAGS$ac_delim
++MOZILLA_LIBS!$MOZILLA_LIBS$ac_delim
+ LTLIBmozilla!$LTLIBmozilla$ac_delim
++MOZILLA_CONFIG!$MOZILLA_CONFIG$ac_delim
+ CYGPATH!$CYGPATH$ac_delim
+ BUILD_MOZILLA_TRUE!$BUILD_MOZILLA_TRUE$ac_delim
+ BUILD_MOZILLA_FALSE!$BUILD_MOZILLA_FALSE$ac_delim
+ GLIB2_CFLAGS!$GLIB2_CFLAGS$ac_delim
+ GLIB2_LIBS!$GLIB2_LIBS$ac_delim
+ LTLIBtest1!$LTLIBtest1$ac_delim
++LTLIBtest2!$LTLIBtest2$ac_delim
++LTLIBtest3!$LTLIBtest3$ac_delim
++LTLIBtest4!$LTLIBtest4$ac_delim
++LTLIBgtk_main!$LTLIBgtk_main$ac_delim
++LTLIBgnome_main!$LTLIBgnome_main$ac_delim
++LTLIBgtk2_main!$LTLIBgtk2_main$ac_delim
++LTLIBgnome2_main!$LTLIBgnome2_main$ac_delim
++LTLIBqte_main!$LTLIBqte_main$ac_delim
++HAVE_PLUGINS_TRUE!$HAVE_PLUGINS_TRUE$ac_delim
++HAVE_PLUGINS_FALSE!$HAVE_PLUGINS_FALSE$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -76311,16 +73119,6 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
+-LTLIBtest2!$LTLIBtest2$ac_delim
+-LTLIBtest3!$LTLIBtest3$ac_delim
+-LTLIBtest4!$LTLIBtest4$ac_delim
+-LTLIBgtk_main!$LTLIBgtk_main$ac_delim
+-LTLIBgnome_main!$LTLIBgnome_main$ac_delim
+-LTLIBgtk2_main!$LTLIBgtk2_main$ac_delim
+-LTLIBgnome2_main!$LTLIBgnome2_main$ac_delim
+-LTLIBqte_main!$LTLIBqte_main$ac_delim
+-HAVE_PLUGINS_TRUE!$HAVE_PLUGINS_TRUE$ac_delim
+-HAVE_PLUGINS_FALSE!$HAVE_PLUGINS_FALSE$ac_delim
+ COPYRIGHT_MESSAGE!$COPYRIGHT_MESSAGE$ac_delim
+ VERSION_MESSAGE!$VERSION_MESSAGE$ac_delim
+ VERSION_MAJOR!$VERSION_MAJOR$ac_delim
+@@ -76344,7 +73142,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 31; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+diff -Naur vlc-0.9.1.orig/doc/Makefile.in vlc-0.9.1/doc/Makefile.in
+--- vlc-0.9.1.orig/doc/Makefile.in 2008-08-25 23:49:33.000000000 +0200
++++ vlc-0.9.1/doc/Makefile.in 2008-08-31 22:33:19.000000000 +0200
+@@ -122,10 +122,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -480,9 +476,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -492,8 +488,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -527,7 +521,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -562,9 +555,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/extras/package/ipkg/Makefile.in vlc-0.9.1/extras/package/ipkg/Makefile.in
+--- vlc-0.9.1.orig/extras/package/ipkg/Makefile.in 2008-08-25 23:49:33.000000000 +0200
++++ vlc-0.9.1/extras/package/ipkg/Makefile.in 2008-08-31 22:33:19.000000000 +0200
+@@ -112,10 +112,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -470,9 +466,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -482,8 +478,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -517,7 +511,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -552,9 +545,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/libs/loader/Makefile.in vlc-0.9.1/libs/loader/Makefile.in
+--- vlc-0.9.1.orig/libs/loader/Makefile.in 2008-08-25 23:49:33.000000000 +0200
++++ vlc-0.9.1/libs/loader/Makefile.in 2008-08-31 22:33:20.000000000 +0200
+@@ -158,10 +158,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -516,9 +512,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -528,8 +524,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -563,7 +557,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -598,9 +591,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/libs/srtp/Makefile.in vlc-0.9.1/libs/srtp/Makefile.in
+--- vlc-0.9.1.orig/libs/srtp/Makefile.in 2008-08-25 23:49:34.000000000 +0200
++++ vlc-0.9.1/libs/srtp/Makefile.in 2008-08-31 22:33:20.000000000 +0200
+@@ -167,10 +167,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -525,9 +521,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -537,8 +533,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -572,7 +566,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -607,9 +600,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/m4/Makefile.in vlc-0.9.1/m4/Makefile.in
+--- vlc-0.9.1.orig/m4/Makefile.in 2008-08-25 23:49:34.000000000 +0200
++++ vlc-0.9.1/m4/Makefile.in 2008-08-31 22:33:21.000000000 +0200
+@@ -112,10 +112,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -470,9 +466,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -482,8 +478,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -517,7 +511,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -552,9 +545,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/Makefile.in vlc-0.9.1/modules/Makefile.in
+--- vlc-0.9.1.orig/modules/Makefile.in 2008-08-25 23:49:34.000000000 +0200
++++ vlc-0.9.1/modules/Makefile.in 2008-08-31 22:33:21.000000000 +0200
+@@ -129,10 +129,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -487,9 +483,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -499,8 +495,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -534,7 +528,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -569,9 +562,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/access/Makefile.in vlc-0.9.1/modules/access/Makefile.in
+--- vlc-0.9.1.orig/modules/access/Makefile.in 2008-08-25 23:49:35.000000000 +0200
++++ vlc-0.9.1/modules/access/Makefile.in 2008-08-31 22:33:22.000000000 +0200
+@@ -412,10 +412,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -774,9 +770,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -786,8 +782,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -821,7 +815,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -856,9 +849,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/access/bda/Makefile.in vlc-0.9.1/modules/access/bda/Makefile.in
+--- vlc-0.9.1.orig/modules/access/bda/Makefile.in 2008-08-25 23:49:35.000000000 +0200
++++ vlc-0.9.1/modules/access/bda/Makefile.in 2008-08-31 22:33:23.000000000 +0200
+@@ -167,10 +167,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -525,9 +521,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -537,8 +533,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -572,7 +566,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -607,9 +600,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/access/cdda/Makefile.in vlc-0.9.1/modules/access/cdda/Makefile.in
+--- vlc-0.9.1.orig/modules/access/cdda/Makefile.in 2008-08-25 23:49:35.000000000 +0200
++++ vlc-0.9.1/modules/access/cdda/Makefile.in 2008-08-31 22:33:23.000000000 +0200
+@@ -161,10 +161,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -519,9 +515,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -531,8 +527,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -566,7 +560,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -601,9 +594,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/access/dshow/Makefile.in vlc-0.9.1/modules/access/dshow/Makefile.in
+--- vlc-0.9.1.orig/modules/access/dshow/Makefile.in 2008-08-25 23:49:36.000000000 +0200
++++ vlc-0.9.1/modules/access/dshow/Makefile.in 2008-08-31 22:33:24.000000000 +0200
+@@ -168,10 +168,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -526,9 +522,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -538,8 +534,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -573,7 +567,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -608,9 +601,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/access/dvb/Makefile.in vlc-0.9.1/modules/access/dvb/Makefile.in
+--- vlc-0.9.1.orig/modules/access/dvb/Makefile.in 2008-08-25 23:49:36.000000000 +0200
++++ vlc-0.9.1/modules/access/dvb/Makefile.in 2008-08-31 22:33:24.000000000 +0200
+@@ -160,10 +160,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -518,9 +514,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -530,8 +526,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -565,7 +559,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -600,9 +593,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/access/mms/Makefile.in vlc-0.9.1/modules/access/mms/Makefile.in
+--- vlc-0.9.1.orig/modules/access/mms/Makefile.in 2008-08-25 23:49:37.000000000 +0200
++++ vlc-0.9.1/modules/access/mms/Makefile.in 2008-08-31 22:33:25.000000000 +0200
+@@ -164,10 +164,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -522,9 +518,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -534,8 +530,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -569,7 +563,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -604,9 +597,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/access/rtmp/Makefile.in vlc-0.9.1/modules/access/rtmp/Makefile.in
+--- vlc-0.9.1.orig/modules/access/rtmp/Makefile.in 2008-08-25 23:49:37.000000000 +0200
++++ vlc-0.9.1/modules/access/rtmp/Makefile.in 2008-08-31 22:33:25.000000000 +0200
+@@ -161,10 +161,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -519,9 +515,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -531,8 +527,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -566,7 +560,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -601,9 +594,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/access/rtsp/Makefile.in vlc-0.9.1/modules/access/rtsp/Makefile.in
+--- vlc-0.9.1.orig/modules/access/rtsp/Makefile.in 2008-08-25 23:49:37.000000000 +0200
++++ vlc-0.9.1/modules/access/rtsp/Makefile.in 2008-08-31 22:33:26.000000000 +0200
+@@ -165,10 +165,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -523,9 +519,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -535,8 +531,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -570,7 +564,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -605,9 +598,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/access/screen/Makefile.in vlc-0.9.1/modules/access/screen/Makefile.in
+--- vlc-0.9.1.orig/modules/access/screen/Makefile.in 2008-08-25 23:49:38.000000000 +0200
++++ vlc-0.9.1/modules/access/screen/Makefile.in 2008-08-31 22:33:26.000000000 +0200
+@@ -176,10 +176,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -534,9 +530,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -546,8 +542,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -581,7 +575,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -616,9 +609,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/access/v4l2/Makefile.in vlc-0.9.1/modules/access/v4l2/Makefile.in
+--- vlc-0.9.1.orig/modules/access/v4l2/Makefile.in 2008-08-25 23:49:39.000000000 +0200
++++ vlc-0.9.1/modules/access/v4l2/Makefile.in 2008-08-31 22:33:27.000000000 +0200
+@@ -158,10 +158,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -516,9 +512,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -528,8 +524,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -563,7 +557,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -598,9 +591,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/access/vcd/Makefile.in vlc-0.9.1/modules/access/vcd/Makefile.in
+--- vlc-0.9.1.orig/modules/access/vcd/Makefile.in 2008-08-25 23:49:39.000000000 +0200
++++ vlc-0.9.1/modules/access/vcd/Makefile.in 2008-08-31 22:33:27.000000000 +0200
+@@ -159,10 +159,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -517,9 +513,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -529,8 +525,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -564,7 +558,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -599,9 +592,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/access/vcdx/Makefile.in vlc-0.9.1/modules/access/vcdx/Makefile.in
+--- vlc-0.9.1.orig/modules/access/vcdx/Makefile.in 2008-08-25 23:49:40.000000000 +0200
++++ vlc-0.9.1/modules/access/vcdx/Makefile.in 2008-08-31 22:33:28.000000000 +0200
+@@ -161,10 +161,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -519,9 +515,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -531,8 +527,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -566,7 +560,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -601,9 +594,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/access_filter/Makefile.in vlc-0.9.1/modules/access_filter/Makefile.in
+--- vlc-0.9.1.orig/modules/access_filter/Makefile.in 2008-08-25 23:49:41.000000000 +0200
++++ vlc-0.9.1/modules/access_filter/Makefile.in 2008-08-31 22:33:28.000000000 +0200
+@@ -198,10 +198,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -556,9 +552,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -568,8 +564,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -603,7 +597,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -638,9 +631,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/access_output/Makefile.in vlc-0.9.1/modules/access_output/Makefile.in
+--- vlc-0.9.1.orig/modules/access_output/Makefile.in 2008-08-25 23:49:41.000000000 +0200
++++ vlc-0.9.1/modules/access_output/Makefile.in 2008-08-31 22:33:29.000000000 +0200
+@@ -226,10 +226,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -584,9 +580,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -596,8 +592,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -631,7 +625,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -666,9 +659,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/audio_filter/Makefile.in vlc-0.9.1/modules/audio_filter/Makefile.in
+--- vlc-0.9.1.orig/modules/audio_filter/Makefile.in 2008-08-25 23:49:42.000000000 +0200
++++ vlc-0.9.1/modules/audio_filter/Makefile.in 2008-08-31 22:33:30.000000000 +0200
+@@ -218,10 +218,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -576,9 +572,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -588,8 +584,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -623,7 +617,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -658,9 +651,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/audio_filter/channel_mixer/Makefile.in vlc-0.9.1/modules/audio_filter/channel_mixer/Makefile.in
+--- vlc-0.9.1.orig/modules/audio_filter/channel_mixer/Makefile.in 2008-08-25 23:49:43.000000000 +0200
++++ vlc-0.9.1/modules/audio_filter/channel_mixer/Makefile.in 2008-08-31 22:33:30.000000000 +0200
+@@ -210,10 +210,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -568,9 +564,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -580,8 +576,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -615,7 +609,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -650,9 +643,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/audio_filter/converter/Makefile.in vlc-0.9.1/modules/audio_filter/converter/Makefile.in
+--- vlc-0.9.1.orig/modules/audio_filter/converter/Makefile.in 2008-08-25 23:49:43.000000000 +0200
++++ vlc-0.9.1/modules/audio_filter/converter/Makefile.in 2008-08-31 22:33:31.000000000 +0200
+@@ -237,10 +237,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -595,9 +591,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -607,8 +603,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -642,7 +636,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -677,9 +670,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/audio_filter/resampler/Makefile.in vlc-0.9.1/modules/audio_filter/resampler/Makefile.in
+--- vlc-0.9.1.orig/modules/audio_filter/resampler/Makefile.in 2008-08-25 23:49:44.000000000 +0200
++++ vlc-0.9.1/modules/audio_filter/resampler/Makefile.in 2008-08-31 22:33:31.000000000 +0200
+@@ -198,10 +198,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -556,9 +552,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -568,8 +564,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -603,7 +597,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -638,9 +631,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/audio_filter/spatializer/Makefile.in vlc-0.9.1/modules/audio_filter/spatializer/Makefile.in
+--- vlc-0.9.1.orig/modules/audio_filter/spatializer/Makefile.in 2008-08-25 23:49:44.000000000 +0200
++++ vlc-0.9.1/modules/audio_filter/spatializer/Makefile.in 2008-08-31 22:33:32.000000000 +0200
+@@ -171,10 +171,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -529,9 +525,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -541,8 +537,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -576,7 +570,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -611,9 +604,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/audio_mixer/Makefile.in vlc-0.9.1/modules/audio_mixer/Makefile.in
+--- vlc-0.9.1.orig/modules/audio_mixer/Makefile.in 2008-08-25 23:49:45.000000000 +0200
++++ vlc-0.9.1/modules/audio_mixer/Makefile.in 2008-08-31 22:33:32.000000000 +0200
+@@ -185,10 +185,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -543,9 +539,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -555,8 +551,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -590,7 +584,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -625,9 +618,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/audio_output/Makefile.in vlc-0.9.1/modules/audio_output/Makefile.in
+--- vlc-0.9.1.orig/modules/audio_output/Makefile.in 2008-08-25 23:49:45.000000000 +0200
++++ vlc-0.9.1/modules/audio_output/Makefile.in 2008-08-31 22:33:33.000000000 +0200
+@@ -303,10 +303,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -661,9 +657,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -673,8 +669,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -708,7 +702,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -743,9 +736,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/codec/Makefile.in vlc-0.9.1/modules/codec/Makefile.in
+--- vlc-0.9.1.orig/modules/codec/Makefile.in 2008-08-25 23:49:47.000000000 +0200
++++ vlc-0.9.1/modules/codec/Makefile.in 2008-08-31 22:33:35.000000000 +0200
+@@ -601,10 +601,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -959,9 +955,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -971,8 +967,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -1006,7 +1000,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -1041,9 +1034,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/codec/avcodec/Makefile.in vlc-0.9.1/modules/codec/avcodec/Makefile.in
+--- vlc-0.9.1.orig/modules/codec/avcodec/Makefile.in 2008-08-25 23:49:47.000000000 +0200
++++ vlc-0.9.1/modules/codec/avcodec/Makefile.in 2008-08-31 22:33:36.000000000 +0200
+@@ -168,10 +168,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -526,9 +522,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -538,8 +534,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -573,7 +567,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -608,9 +601,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/codec/cmml/Makefile.in vlc-0.9.1/modules/codec/cmml/Makefile.in
+--- vlc-0.9.1.orig/modules/codec/cmml/Makefile.in 2008-08-25 23:49:47.000000000 +0200
++++ vlc-0.9.1/modules/codec/cmml/Makefile.in 2008-08-31 22:33:36.000000000 +0200
+@@ -162,10 +162,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -520,9 +516,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -532,8 +528,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -567,7 +561,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -602,9 +595,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/codec/dmo/Makefile.in vlc-0.9.1/modules/codec/dmo/Makefile.in
+--- vlc-0.9.1.orig/modules/codec/dmo/Makefile.in 2008-08-25 23:49:48.000000000 +0200
++++ vlc-0.9.1/modules/codec/dmo/Makefile.in 2008-08-31 22:33:37.000000000 +0200
+@@ -157,10 +157,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -515,9 +511,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -527,8 +523,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -562,7 +556,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -597,9 +590,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/codec/spudec/Makefile.in vlc-0.9.1/modules/codec/spudec/Makefile.in
+--- vlc-0.9.1.orig/modules/codec/spudec/Makefile.in 2008-08-25 23:49:48.000000000 +0200
++++ vlc-0.9.1/modules/codec/spudec/Makefile.in 2008-08-31 22:33:37.000000000 +0200
+@@ -160,10 +160,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -518,9 +514,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -530,8 +526,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -565,7 +559,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -600,9 +593,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/codec/subtitles/Makefile.in vlc-0.9.1/modules/codec/subtitles/Makefile.in
+--- vlc-0.9.1.orig/modules/codec/subtitles/Makefile.in 2008-08-25 23:49:49.000000000 +0200
++++ vlc-0.9.1/modules/codec/subtitles/Makefile.in 2008-08-31 22:33:38.000000000 +0200
+@@ -182,10 +182,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -540,9 +536,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -552,8 +548,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -587,7 +581,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -622,9 +615,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/codec/xvmc/Makefile.in vlc-0.9.1/modules/codec/xvmc/Makefile.in
+--- vlc-0.9.1.orig/modules/codec/xvmc/Makefile.in 2008-08-25 23:49:49.000000000 +0200
++++ vlc-0.9.1/modules/codec/xvmc/Makefile.in 2008-08-31 22:33:38.000000000 +0200
+@@ -165,10 +165,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -523,9 +519,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -535,8 +531,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -570,7 +564,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -605,9 +598,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/control/Makefile.in vlc-0.9.1/modules/control/Makefile.in
+--- vlc-0.9.1.orig/modules/control/Makefile.in 2008-08-25 23:49:50.000000000 +0200
++++ vlc-0.9.1/modules/control/Makefile.in 2008-08-31 22:33:39.000000000 +0200
+@@ -289,10 +289,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -647,9 +643,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -659,8 +655,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -694,7 +688,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -729,9 +722,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/control/http/Makefile.in vlc-0.9.1/modules/control/http/Makefile.in
+--- vlc-0.9.1.orig/modules/control/http/Makefile.in 2008-08-25 23:49:50.000000000 +0200
++++ vlc-0.9.1/modules/control/http/Makefile.in 2008-08-31 22:33:40.000000000 +0200
+@@ -161,10 +161,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -519,9 +515,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -531,8 +527,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -566,7 +560,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -601,9 +594,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/demux/Makefile.in vlc-0.9.1/modules/demux/Makefile.in
+--- vlc-0.9.1.orig/modules/demux/Makefile.in 2008-08-25 23:49:52.000000000 +0200
++++ vlc-0.9.1/modules/demux/Makefile.in 2008-08-31 22:33:41.000000000 +0200
+@@ -529,10 +529,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -887,9 +883,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -899,8 +895,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -934,7 +928,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -969,9 +962,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/demux/asf/Makefile.in vlc-0.9.1/modules/demux/asf/Makefile.in
+--- vlc-0.9.1.orig/modules/demux/asf/Makefile.in 2008-08-25 23:49:52.000000000 +0200
++++ vlc-0.9.1/modules/demux/asf/Makefile.in 2008-08-31 22:33:42.000000000 +0200
+@@ -159,10 +159,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -517,9 +513,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -529,8 +525,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -564,7 +558,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -599,9 +592,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/demux/avformat/Makefile.in vlc-0.9.1/modules/demux/avformat/Makefile.in
+--- vlc-0.9.1.orig/modules/demux/avformat/Makefile.in 2008-08-25 23:49:53.000000000 +0200
++++ vlc-0.9.1/modules/demux/avformat/Makefile.in 2008-08-31 22:33:42.000000000 +0200
+@@ -167,10 +167,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -525,9 +521,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -537,8 +533,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -572,7 +566,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -607,9 +600,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/demux/avi/Makefile.in vlc-0.9.1/modules/demux/avi/Makefile.in
+--- vlc-0.9.1.orig/modules/demux/avi/Makefile.in 2008-08-25 23:49:53.000000000 +0200
++++ vlc-0.9.1/modules/demux/avi/Makefile.in 2008-08-31 22:33:43.000000000 +0200
+@@ -159,10 +159,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -517,9 +513,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -529,8 +525,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -564,7 +558,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -599,9 +592,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/demux/mp4/Makefile.in vlc-0.9.1/modules/demux/mp4/Makefile.in
+--- vlc-0.9.1.orig/modules/demux/mp4/Makefile.in 2008-08-25 23:49:53.000000000 +0200
++++ vlc-0.9.1/modules/demux/mp4/Makefile.in 2008-08-31 22:33:43.000000000 +0200
+@@ -159,10 +159,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -517,9 +513,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -529,8 +525,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -564,7 +558,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -599,9 +592,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/demux/mpeg/Makefile.in vlc-0.9.1/modules/demux/mpeg/Makefile.in
+--- vlc-0.9.1.orig/modules/demux/mpeg/Makefile.in 2008-08-25 23:49:54.000000000 +0200
++++ vlc-0.9.1/modules/demux/mpeg/Makefile.in 2008-08-31 22:33:44.000000000 +0200
+@@ -200,10 +200,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -558,9 +554,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -570,8 +566,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -605,7 +599,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -640,9 +633,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/demux/playlist/Makefile.in vlc-0.9.1/modules/demux/playlist/Makefile.in
+--- vlc-0.9.1.orig/modules/demux/playlist/Makefile.in 2008-08-25 23:49:55.000000000 +0200
++++ vlc-0.9.1/modules/demux/playlist/Makefile.in 2008-08-31 22:33:44.000000000 +0200
+@@ -167,10 +167,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -525,9 +521,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -537,8 +533,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -572,7 +566,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -607,9 +600,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/gui/Makefile.in vlc-0.9.1/modules/gui/Makefile.in
+--- vlc-0.9.1.orig/modules/gui/Makefile.in 2008-08-25 23:49:55.000000000 +0200
++++ vlc-0.9.1/modules/gui/Makefile.in 2008-08-31 22:33:45.000000000 +0200
+@@ -185,10 +185,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -543,9 +539,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -555,8 +551,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -590,7 +584,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -625,9 +618,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/gui/beos/Makefile.in vlc-0.9.1/modules/gui/beos/Makefile.in
+--- vlc-0.9.1.orig/modules/gui/beos/Makefile.in 2008-08-25 23:49:56.000000000 +0200
++++ vlc-0.9.1/modules/gui/beos/Makefile.in 2008-08-31 22:33:46.000000000 +0200
+@@ -179,10 +179,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -537,9 +533,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -549,8 +545,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -584,7 +578,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -619,9 +612,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/gui/macosx/Makefile.in vlc-0.9.1/modules/gui/macosx/Makefile.in
+--- vlc-0.9.1.orig/modules/gui/macosx/Makefile.in 2008-08-25 23:49:56.000000000 +0200
++++ vlc-0.9.1/modules/gui/macosx/Makefile.in 2008-08-31 22:33:46.000000000 +0200
+@@ -187,10 +187,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -549,9 +545,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -561,8 +557,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -596,7 +590,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -631,9 +624,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/gui/minimal_macosx/Makefile.in vlc-0.9.1/modules/gui/minimal_macosx/Makefile.in
+--- vlc-0.9.1.orig/modules/gui/minimal_macosx/Makefile.in 2008-08-25 23:49:57.000000000 +0200
++++ vlc-0.9.1/modules/gui/minimal_macosx/Makefile.in 2008-08-31 22:33:47.000000000 +0200
+@@ -177,10 +177,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -539,9 +535,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -551,8 +547,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -586,7 +580,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -621,9 +614,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/gui/pda/Makefile.in vlc-0.9.1/modules/gui/pda/Makefile.in
+--- vlc-0.9.1.orig/modules/gui/pda/Makefile.in 2008-08-25 23:49:57.000000000 +0200
++++ vlc-0.9.1/modules/gui/pda/Makefile.in 2008-08-31 22:33:47.000000000 +0200
+@@ -161,10 +161,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -519,9 +515,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -531,8 +527,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -566,7 +560,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -601,9 +594,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/gui/qnx/Makefile.in vlc-0.9.1/modules/gui/qnx/Makefile.in
+--- vlc-0.9.1.orig/modules/gui/qnx/Makefile.in 2008-08-25 23:49:58.000000000 +0200
++++ vlc-0.9.1/modules/gui/qnx/Makefile.in 2008-08-31 22:33:48.000000000 +0200
+@@ -158,10 +158,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -516,9 +512,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -528,8 +524,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -563,7 +557,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -598,9 +591,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/gui/qt4/Makefile.in vlc-0.9.1/modules/gui/qt4/Makefile.in
+--- vlc-0.9.1.orig/modules/gui/qt4/Makefile.in 2008-08-25 23:49:59.000000000 +0200
++++ vlc-0.9.1/modules/gui/qt4/Makefile.in 2008-08-31 22:33:49.000000000 +0200
+@@ -245,10 +245,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -603,9 +599,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -615,8 +611,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -650,7 +644,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -685,9 +678,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/gui/skins2/Makefile.in vlc-0.9.1/modules/gui/skins2/Makefile.in
+--- vlc-0.9.1.orig/modules/gui/skins2/Makefile.in 2008-08-25 23:50:00.000000000 +0200
++++ vlc-0.9.1/modules/gui/skins2/Makefile.in 2008-08-31 22:33:51.000000000 +0200
+@@ -264,10 +264,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -622,9 +618,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -634,8 +630,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -669,7 +663,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -704,9 +697,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/gui/wince/Makefile.in vlc-0.9.1/modules/gui/wince/Makefile.in
+--- vlc-0.9.1.orig/modules/gui/wince/Makefile.in 2008-08-25 23:50:01.000000000 +0200
++++ vlc-0.9.1/modules/gui/wince/Makefile.in 2008-08-31 22:33:52.000000000 +0200
+@@ -176,10 +176,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -534,9 +530,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -546,8 +542,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -581,7 +575,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -616,9 +609,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/meta_engine/Makefile.in vlc-0.9.1/modules/meta_engine/Makefile.in
+--- vlc-0.9.1.orig/modules/meta_engine/Makefile.in 2008-08-25 23:50:02.000000000 +0200
++++ vlc-0.9.1/modules/meta_engine/Makefile.in 2008-08-31 22:33:52.000000000 +0200
+@@ -205,10 +205,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -563,9 +559,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -575,8 +571,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -610,7 +604,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -645,9 +638,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/misc/Makefile.in vlc-0.9.1/modules/misc/Makefile.in
+--- vlc-0.9.1.orig/modules/misc/Makefile.in 2008-08-25 23:50:03.000000000 +0200
++++ vlc-0.9.1/modules/misc/Makefile.in 2008-08-31 22:33:53.000000000 +0200
+@@ -351,10 +351,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -709,9 +705,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -721,8 +717,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -756,7 +750,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -791,9 +784,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/misc/dummy/Makefile.in vlc-0.9.1/modules/misc/dummy/Makefile.in
+--- vlc-0.9.1.orig/modules/misc/dummy/Makefile.in 2008-08-25 23:50:03.000000000 +0200
++++ vlc-0.9.1/modules/misc/dummy/Makefile.in 2008-08-31 22:33:54.000000000 +0200
+@@ -163,10 +163,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -521,9 +517,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -533,8 +529,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -568,7 +562,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -603,9 +596,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/misc/lua/Makefile.in vlc-0.9.1/modules/misc/lua/Makefile.in
+--- vlc-0.9.1.orig/modules/misc/lua/Makefile.in 2008-08-25 23:50:04.000000000 +0200
++++ vlc-0.9.1/modules/misc/lua/Makefile.in 2008-08-31 22:33:54.000000000 +0200
+@@ -168,10 +168,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -526,9 +522,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -538,8 +534,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -573,7 +567,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -608,9 +601,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/misc/memcpy/Makefile.in vlc-0.9.1/modules/misc/memcpy/Makefile.in
+--- vlc-0.9.1.orig/modules/misc/memcpy/Makefile.in 2008-08-25 23:50:04.000000000 +0200
++++ vlc-0.9.1/modules/misc/memcpy/Makefile.in 2008-08-31 22:33:55.000000000 +0200
+@@ -210,10 +210,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -568,9 +564,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -580,8 +576,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -615,7 +609,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -650,9 +643,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/misc/notify/Makefile.in vlc-0.9.1/modules/misc/notify/Makefile.in
+--- vlc-0.9.1.orig/modules/misc/notify/Makefile.in 2008-08-25 23:50:05.000000000 +0200
++++ vlc-0.9.1/modules/misc/notify/Makefile.in 2008-08-31 22:33:55.000000000 +0200
+@@ -223,10 +223,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -585,9 +581,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -597,8 +593,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -632,7 +626,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -667,9 +660,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/misc/osd/Makefile.in vlc-0.9.1/modules/misc/osd/Makefile.in
+--- vlc-0.9.1.orig/modules/misc/osd/Makefile.in 2008-08-25 23:50:05.000000000 +0200
++++ vlc-0.9.1/modules/misc/osd/Makefile.in 2008-08-31 22:33:56.000000000 +0200
+@@ -163,10 +163,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -521,9 +517,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -533,8 +529,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -568,7 +562,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -603,9 +596,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/misc/playlist/Makefile.in vlc-0.9.1/modules/misc/playlist/Makefile.in
+--- vlc-0.9.1.orig/modules/misc/playlist/Makefile.in 2008-08-25 23:50:06.000000000 +0200
++++ vlc-0.9.1/modules/misc/playlist/Makefile.in 2008-08-31 22:33:56.000000000 +0200
+@@ -161,10 +161,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -519,9 +515,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -531,8 +527,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -566,7 +560,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -601,9 +594,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/misc/probe/Makefile.in vlc-0.9.1/modules/misc/probe/Makefile.in
+--- vlc-0.9.1.orig/modules/misc/probe/Makefile.in 2008-08-25 23:50:06.000000000 +0200
++++ vlc-0.9.1/modules/misc/probe/Makefile.in 2008-08-31 22:33:57.000000000 +0200
+@@ -158,10 +158,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -516,9 +512,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -528,8 +524,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -563,7 +557,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -598,9 +591,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/misc/stats/Makefile.in vlc-0.9.1/modules/misc/stats/Makefile.in
+--- vlc-0.9.1.orig/modules/misc/stats/Makefile.in 2008-08-25 23:50:07.000000000 +0200
++++ vlc-0.9.1/modules/misc/stats/Makefile.in 2008-08-31 22:33:57.000000000 +0200
+@@ -162,10 +162,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -520,9 +516,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -532,8 +528,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -567,7 +561,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -602,9 +595,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/misc/testsuite/Makefile.in vlc-0.9.1/modules/misc/testsuite/Makefile.in
+--- vlc-0.9.1.orig/modules/misc/testsuite/Makefile.in 2008-08-25 23:50:07.000000000 +0200
++++ vlc-0.9.1/modules/misc/testsuite/Makefile.in 2008-08-31 22:33:58.000000000 +0200
+@@ -211,10 +211,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -569,9 +565,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -581,8 +577,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -616,7 +610,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -651,9 +644,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/misc/xml/Makefile.in vlc-0.9.1/modules/misc/xml/Makefile.in
+--- vlc-0.9.1.orig/modules/misc/xml/Makefile.in 2008-08-25 23:50:08.000000000 +0200
++++ vlc-0.9.1/modules/misc/xml/Makefile.in 2008-08-31 22:33:59.000000000 +0200
+@@ -169,10 +169,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -527,9 +523,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -539,8 +535,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -574,7 +568,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -609,9 +602,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/mux/Makefile.in vlc-0.9.1/modules/mux/Makefile.in
+--- vlc-0.9.1.orig/modules/mux/Makefile.in 2008-08-25 23:50:08.000000000 +0200
++++ vlc-0.9.1/modules/mux/Makefile.in 2008-08-31 22:33:59.000000000 +0200
+@@ -241,10 +241,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -599,9 +595,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -611,8 +607,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -646,7 +640,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -681,9 +674,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/mux/mpeg/Makefile.in vlc-0.9.1/modules/mux/mpeg/Makefile.in
+--- vlc-0.9.1.orig/modules/mux/mpeg/Makefile.in 2008-08-25 23:50:09.000000000 +0200
++++ vlc-0.9.1/modules/mux/mpeg/Makefile.in 2008-08-31 22:34:00.000000000 +0200
+@@ -173,10 +173,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -531,9 +527,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -543,8 +539,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -578,7 +572,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -613,9 +606,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/packetizer/Makefile.in vlc-0.9.1/modules/packetizer/Makefile.in
+--- vlc-0.9.1.orig/modules/packetizer/Makefile.in 2008-08-25 23:50:09.000000000 +0200
++++ vlc-0.9.1/modules/packetizer/Makefile.in 2008-08-31 22:34:01.000000000 +0200
+@@ -227,10 +227,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -585,9 +581,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -597,8 +593,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -632,7 +626,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -667,9 +660,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/services_discovery/Makefile.in vlc-0.9.1/modules/services_discovery/Makefile.in
+--- vlc-0.9.1.orig/modules/services_discovery/Makefile.in 2008-08-25 23:50:10.000000000 +0200
++++ vlc-0.9.1/modules/services_discovery/Makefile.in 2008-08-31 22:34:01.000000000 +0200
+@@ -234,10 +234,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -592,9 +588,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -604,8 +600,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -639,7 +633,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -674,9 +667,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/stream_out/Makefile.in vlc-0.9.1/modules/stream_out/Makefile.in
+--- vlc-0.9.1.orig/modules/stream_out/Makefile.in 2008-08-25 23:50:10.000000000 +0200
++++ vlc-0.9.1/modules/stream_out/Makefile.in 2008-08-31 22:34:02.000000000 +0200
+@@ -335,10 +335,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -693,9 +689,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -705,8 +701,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -740,7 +734,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -775,9 +768,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/stream_out/transrate/Makefile.in vlc-0.9.1/modules/stream_out/transrate/Makefile.in
+--- vlc-0.9.1.orig/modules/stream_out/transrate/Makefile.in 2008-08-25 23:50:11.000000000 +0200
++++ vlc-0.9.1/modules/stream_out/transrate/Makefile.in 2008-08-31 22:34:02.000000000 +0200
+@@ -161,10 +161,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -519,9 +515,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -531,8 +527,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -566,7 +560,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -601,9 +594,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/video_chroma/Makefile.in vlc-0.9.1/modules/video_chroma/Makefile.in
+--- vlc-0.9.1.orig/modules/video_chroma/Makefile.in 2008-08-25 23:50:12.000000000 +0200
++++ vlc-0.9.1/modules/video_chroma/Makefile.in 2008-08-31 22:34:03.000000000 +0200
+@@ -357,10 +357,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -715,9 +711,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -727,8 +723,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -762,7 +756,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -797,9 +790,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/video_filter/Makefile.in vlc-0.9.1/modules/video_filter/Makefile.in
+--- vlc-0.9.1.orig/modules/video_filter/Makefile.in 2008-08-25 23:50:13.000000000 +0200
++++ vlc-0.9.1/modules/video_filter/Makefile.in 2008-08-31 22:34:05.000000000 +0200
+@@ -695,10 +695,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -1053,9 +1049,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -1065,8 +1061,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -1100,7 +1094,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -1135,9 +1128,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/video_filter/atmo/Makefile.in vlc-0.9.1/modules/video_filter/atmo/Makefile.in
+--- vlc-0.9.1.orig/modules/video_filter/atmo/Makefile.in 2008-08-25 23:50:14.000000000 +0200
++++ vlc-0.9.1/modules/video_filter/atmo/Makefile.in 2008-08-31 22:34:05.000000000 +0200
+@@ -178,10 +178,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -536,9 +532,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -548,8 +544,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -583,7 +577,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -618,9 +611,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/video_filter/dynamicoverlay/Makefile.in vlc-0.9.1/modules/video_filter/dynamicoverlay/Makefile.in
+--- vlc-0.9.1.orig/modules/video_filter/dynamicoverlay/Makefile.in 2008-08-25 23:50:14.000000000 +0200
++++ vlc-0.9.1/modules/video_filter/dynamicoverlay/Makefile.in 2008-08-31 22:34:06.000000000 +0200
+@@ -166,10 +166,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -524,9 +520,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -536,8 +532,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -571,7 +565,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -606,9 +599,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/video_output/Makefile.in vlc-0.9.1/modules/video_output/Makefile.in
+--- vlc-0.9.1.orig/modules/video_output/Makefile.in 2008-08-25 23:50:15.000000000 +0200
++++ vlc-0.9.1/modules/video_output/Makefile.in 2008-08-31 22:34:07.000000000 +0200
+@@ -330,10 +330,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -691,9 +687,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -703,8 +699,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -738,7 +732,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -773,9 +766,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/video_output/msw/Makefile.in vlc-0.9.1/modules/video_output/msw/Makefile.in
+--- vlc-0.9.1.orig/modules/video_output/msw/Makefile.in 2008-08-25 23:50:16.000000000 +0200
++++ vlc-0.9.1/modules/video_output/msw/Makefile.in 2008-08-31 22:34:07.000000000 +0200
+@@ -212,10 +212,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -570,9 +566,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -582,8 +578,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -617,7 +611,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -652,9 +645,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/video_output/qte/Makefile.in vlc-0.9.1/modules/video_output/qte/Makefile.in
+--- vlc-0.9.1.orig/modules/video_output/qte/Makefile.in 2008-08-25 23:50:16.000000000 +0200
++++ vlc-0.9.1/modules/video_output/qte/Makefile.in 2008-08-31 22:34:07.000000000 +0200
+@@ -168,10 +168,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -526,9 +522,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -538,8 +534,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -573,7 +567,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -608,9 +601,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/video_output/x11/Makefile.in vlc-0.9.1/modules/video_output/x11/Makefile.in
+--- vlc-0.9.1.orig/modules/video_output/x11/Makefile.in 2008-08-25 23:50:17.000000000 +0200
++++ vlc-0.9.1/modules/video_output/x11/Makefile.in 2008-08-31 22:34:08.000000000 +0200
+@@ -194,10 +194,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -552,9 +548,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -564,8 +560,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -599,7 +593,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -634,9 +627,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/visualization/Makefile.in vlc-0.9.1/modules/visualization/Makefile.in
+--- vlc-0.9.1.orig/modules/visualization/Makefile.in 2008-08-25 23:50:17.000000000 +0200
++++ vlc-0.9.1/modules/visualization/Makefile.in 2008-08-31 22:34:08.000000000 +0200
+@@ -168,10 +168,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -526,9 +522,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -538,8 +534,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -573,7 +567,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -608,9 +601,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/visualization/galaktos/Makefile.in vlc-0.9.1/modules/visualization/galaktos/Makefile.in
+--- vlc-0.9.1.orig/modules/visualization/galaktos/Makefile.in 2008-08-25 23:50:18.000000000 +0200
++++ vlc-0.9.1/modules/visualization/galaktos/Makefile.in 2008-08-31 22:34:09.000000000 +0200
+@@ -173,10 +173,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -531,9 +527,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -543,8 +539,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -578,7 +572,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -613,9 +606,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/modules/visualization/visual/Makefile.in vlc-0.9.1/modules/visualization/visual/Makefile.in
+--- vlc-0.9.1.orig/modules/visualization/visual/Makefile.in 2008-08-25 23:50:18.000000000 +0200
++++ vlc-0.9.1/modules/visualization/visual/Makefile.in 2008-08-31 22:34:09.000000000 +0200
+@@ -159,10 +159,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -517,9 +513,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -529,8 +525,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -564,7 +558,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -599,9 +592,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/projects/activex/Makefile.in vlc-0.9.1/projects/activex/Makefile.in
+--- vlc-0.9.1.orig/projects/activex/Makefile.in 2008-08-25 23:50:19.000000000 +0200
++++ vlc-0.9.1/projects/activex/Makefile.in 2008-08-31 22:34:10.000000000 +0200
+@@ -184,10 +184,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -542,9 +538,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -554,8 +550,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -589,7 +583,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -624,9 +617,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/projects/mozilla/Makefile.in vlc-0.9.1/projects/mozilla/Makefile.in
+--- vlc-0.9.1.orig/projects/mozilla/Makefile.in 2008-08-25 23:50:20.000000000 +0200
++++ vlc-0.9.1/projects/mozilla/Makefile.in 2008-08-31 22:34:11.000000000 +0200
+@@ -203,10 +203,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -561,9 +557,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -573,8 +569,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -608,7 +602,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -643,9 +636,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/share/Makefile.in vlc-0.9.1/share/Makefile.in
+--- vlc-0.9.1.orig/share/Makefile.in 2008-08-25 23:50:20.000000000 +0200
++++ vlc-0.9.1/share/Makefile.in 2008-08-31 22:34:12.000000000 +0200
+@@ -14,6 +14,7 @@
+
+ @SET_MAKE@
+
++
+ VPATH = @srcdir@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+@@ -46,8 +47,9 @@
+ subdir = share
+ DIST_COMMON = $(am__nobase_dist_pkgdata_DATA_DIST) \
+ $(dist_pkgdata_DATA) $(nobase_dist_data_DATA) \
+- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(srcdir)/libvlc_win32_rc.rc.in $(srcdir)/vlc_win32_rc.rc.in
++ $(nobase_dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \
++ $(srcdir)/Makefile.in $(srcdir)/libvlc_win32_rc.rc.in \
++ $(srcdir)/vlc_win32_rc.rc.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/flags.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
+@@ -61,33 +63,34 @@
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES = vlc_win32_rc.rc libvlc_win32_rc.rc
+-SOURCES =
+-DIST_SOURCES =
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(datadir)" \
+- "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"
++am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" \
++ "$(DESTDIR)$(datadir)" "$(DESTDIR)$(pkgdatadir)" \
++ "$(DESTDIR)$(pkgdatadir)"
++nobase_dist_pkgdataSCRIPT_INSTALL = $(install_sh_SCRIPT)
++SCRIPTS = $(nobase_dist_pkgdata_SCRIPTS)
++SOURCES =
++DIST_SOURCES =
+ dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
+ nobase_dist_dataDATA_INSTALL = $(install_sh_DATA)
+-am__nobase_dist_pkgdata_DATA_DIST = utils/gnome-vlc-default.sh \
+- utils/audio-vlc-default.sh utils/video-vlc-default.sh \
+- skins2/fonts/FreeSans.ttf skins2/fonts/FreeSansBold.ttf \
+- skins2/skin.dtd skins2/skin.catalog skins2/winamp2.xml \
+- pda-forwardb16x16.xpm pda-openb16x16.xpm pda-pauseb16x16.xpm \
+- pda-playb16x16.xpm pda-playlistb16x16.xpm \
+- pda-preferencesb16x16.xpm pda-rewindb16x16.xpm \
+- pda-stopb16x16.xpm http/.hosts http/dialogs/.hosts \
+- http/dialogs/browse http/dialogs/footer http/dialogs/input \
+- http/dialogs/main http/dialogs/mosaic http/dialogs/playlist \
+- http/dialogs/sout http/dialogs/vlm http/favicon.ico \
+- http/images/delete.png http/images/delete_small.png \
+- http/images/eject.png http/images/empty.png \
+- http/images/fullscreen.png http/images/help.png \
+- http/images/info.png http/images/loop.png \
++am__nobase_dist_pkgdata_DATA_DIST = skins2/fonts/FreeSans.ttf \
++ skins2/fonts/FreeSansBold.ttf skins2/skin.dtd \
++ skins2/skin.catalog skins2/winamp2.xml pda-forwardb16x16.xpm \
++ pda-openb16x16.xpm pda-pauseb16x16.xpm pda-playb16x16.xpm \
++ pda-playlistb16x16.xpm pda-preferencesb16x16.xpm \
++ pda-rewindb16x16.xpm pda-stopb16x16.xpm http/.hosts \
++ http/dialogs/.hosts http/dialogs/browse http/dialogs/footer \
++ http/dialogs/input http/dialogs/main http/dialogs/mosaic \
++ http/dialogs/playlist http/dialogs/sout http/dialogs/vlm \
++ http/favicon.ico http/images/delete.png \
++ http/images/delete_small.png http/images/eject.png \
++ http/images/empty.png http/images/fullscreen.png \
++ http/images/help.png http/images/info.png http/images/loop.png \
+ http/images/minus.png http/images/next.png \
+ http/images/pause.png http/images/play.png \
+ http/images/playlist.png http/images/playlist_small.png \
+@@ -287,10 +290,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -645,9 +644,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -657,8 +656,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -692,7 +689,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -727,9 +723,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+@@ -795,11 +788,15 @@
+ $(DIST_icons48) \
+ $(DIST_icons128)
+
+-nobase_dist_pkgdata_DATA = utils/gnome-vlc-default.sh \
+- utils/audio-vlc-default.sh utils/video-vlc-default.sh $(NULL) \
+- $(am__append_1) $(am__append_2) $(am__append_3) \
+- $(am__append_4) $(am__append_5) $(am__append_6) \
+- $(am__append_7)
++nobase_dist_pkgdata_SCRIPTS = \
++ utils/gnome-vlc-default.sh \
++ utils/audio-vlc-default.sh \
++ utils/video-vlc-default.sh \
++ $(NULL)
++
++nobase_dist_pkgdata_DATA = $(NULL) $(am__append_1) $(am__append_2) \
++ $(am__append_3) $(am__append_4) $(am__append_5) \
++ $(am__append_6) $(am__append_7)
+ EXTRA_DIST = \
+ $(DIST_rsrc) \
+ $(DIST_pda) \
+@@ -1168,6 +1165,31 @@
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ libvlc_win32_rc.rc: $(top_builddir)/config.status $(srcdir)/libvlc_win32_rc.rc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
++install-nobase_dist_pkgdataSCRIPTS: $(nobase_dist_pkgdata_SCRIPTS)
++ @$(NORMAL_INSTALL)
++ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
++ @$(am__vpath_adj_setup) \
++ list='$(nobase_dist_pkgdata_SCRIPTS)'; for p in $$list; do \
++ $(am__vpath_adj) p=$$f; \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ if test -f $$d$$p; then \
++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
++ f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \
++ echo " $(nobase_dist_pkgdataSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
++ $(nobase_dist_pkgdataSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
++ else :; fi; \
++ done
++
++uninstall-nobase_dist_pkgdataSCRIPTS:
++ @$(NORMAL_UNINSTALL)
++ @$(am__vpath_adj_setup) \
++ list='$(nobase_dist_pkgdata_SCRIPTS)'; for p in $$list; do \
++ $(am__vpath_adj) p=$$f; \
++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
++ f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \
++ echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
++ rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
++ done
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -1283,9 +1305,9 @@
+ done
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(DATA)
++all-am: Makefile $(SCRIPTS) $(DATA)
+ installdirs:
+- for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \
++ for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
+@@ -1332,7 +1354,8 @@
+ info-am:
+
+ install-data-am: install-dist_pkgdataDATA install-nobase_dist_dataDATA \
+- install-nobase_dist_pkgdataDATA install-nobase_pkgdataDATA
++ install-nobase_dist_pkgdataDATA \
++ install-nobase_dist_pkgdataSCRIPTS install-nobase_pkgdataDATA
+
+ install-dvi: install-dvi-am
+
+@@ -1368,7 +1391,9 @@
+
+ uninstall-am: uninstall-dist_pkgdataDATA \
+ uninstall-nobase_dist_dataDATA \
+- uninstall-nobase_dist_pkgdataDATA uninstall-nobase_pkgdataDATA
++ uninstall-nobase_dist_pkgdataDATA \
++ uninstall-nobase_dist_pkgdataSCRIPTS \
++ uninstall-nobase_pkgdataDATA
+
+ .MAKE: install-am install-strip
+
+@@ -1379,14 +1404,17 @@
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-man install-nobase_dist_dataDATA \
+- install-nobase_dist_pkgdataDATA install-nobase_pkgdataDATA \
++ install-nobase_dist_pkgdataDATA \
++ install-nobase_dist_pkgdataSCRIPTS install-nobase_pkgdataDATA \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-am uninstall-dist_pkgdataDATA \
+ uninstall-nobase_dist_dataDATA \
+- uninstall-nobase_dist_pkgdataDATA uninstall-nobase_pkgdataDATA
++ uninstall-nobase_dist_pkgdataDATA \
++ uninstall-nobase_dist_pkgdataSCRIPTS \
++ uninstall-nobase_pkgdataDATA
+
+
+ skins2/default.vlt: $(skins2_default_vlt_FILES)
+diff -Naur vlc-0.9.1.orig/src/Makefile.in vlc-0.9.1/src/Makefile.in
+--- vlc-0.9.1.orig/src/Makefile.in 2008-08-25 23:50:22.000000000 +0200
++++ vlc-0.9.1/src/Makefile.in 2008-08-31 22:34:14.000000000 +0200
+@@ -340,10 +340,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -698,9 +694,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -710,8 +706,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -745,7 +739,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -780,9 +773,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/src/test/Makefile.in vlc-0.9.1/src/test/Makefile.in
+--- vlc-0.9.1.orig/src/test/Makefile.in 2008-08-25 23:50:22.000000000 +0200
++++ vlc-0.9.1/src/test/Makefile.in 2008-08-31 22:34:14.000000000 +0200
+@@ -157,10 +157,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -515,9 +511,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -527,8 +523,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -562,7 +556,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -597,9 +590,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+diff -Naur vlc-0.9.1.orig/test/Makefile.in vlc-0.9.1/test/Makefile.in
+--- vlc-0.9.1.orig/test/Makefile.in 2008-08-25 23:50:23.000000000 +0200
++++ vlc-0.9.1/test/Makefile.in 2008-08-31 22:34:15.000000000 +0200
+@@ -191,10 +191,6 @@
+ EXEEXT = @EXEEXT@
+ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@
+ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@
+-FIREFOX_CFLAGS = @FIREFOX_CFLAGS@
+-FIREFOX_LIBS = @FIREFOX_LIBS@
+-FIREFOX_XPCOM_CFLAGS = @FIREFOX_XPCOM_CFLAGS@
+-FIREFOX_XPCOM_LIBS = @FIREFOX_XPCOM_LIBS@
+ FLUIDSYNTH_CFLAGS = @FLUIDSYNTH_CFLAGS@
+ FLUIDSYNTH_LIBS = @FLUIDSYNTH_LIBS@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+@@ -549,9 +545,9 @@
+ MIDL = @MIDL@
+ MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
++MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+ MOZILLA_CONFIG = @MOZILLA_CONFIG@
+-MOZILLA_NSPR_CFLAGS = @MOZILLA_NSPR_CFLAGS@
+-MOZILLA_NSPR_LIBS = @MOZILLA_NSPR_LIBS@
++MOZILLA_LIBS = @MOZILLA_LIBS@
+ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+@@ -561,8 +557,6 @@
+ NMEDIT = @NMEDIT@
+ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+ NOTIFY_LIBS = @NOTIFY_LIBS@
+-NSPR_CFLAGS = @NSPR_CFLAGS@
+-NSPR_LIBS = @NSPR_LIBS@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -596,7 +590,6 @@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+ SDL_CONFIG = @SDL_CONFIG@
+-SEAMONKEY_CONFIG = @SEAMONKEY_CONFIG@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -631,9 +624,6 @@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ XMKMF = @XMKMF@
+ XML2_CONFIG = @XML2_CONFIG@
+-XULRUNNER_CFLAGS = @XULRUNNER_CFLAGS@
+-XULRUNNER_CONFIG = @XULRUNNER_CONFIG@
+-XULRUNNER_LIBS = @XULRUNNER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
Modified: experimental/vlc/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/patches/series?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/patches/series (original)
+++ experimental/vlc/debian/patches/series Sun Aug 31 23:06:34 2008
@@ -1,12 +1,8 @@
-001_am_maintainer_mode.diff
-010_iceape.diff
+050_iceape.diff
+051_install_scripts.diff
101_certificates_paths.diff
102_dejavu_font.diff
-103_kfreebsd.diff
104_notify.diff
200_osdmenu_paths.diff
300_manpage_syntax.diff
-405-CVE-2008-3732.diff
-406-live555-crash.diff
-407-mms-overflow.diff
-900_autoconf.diff
+900_rebootstrap.diff
Modified: experimental/vlc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/rules?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/rules (original)
+++ experimental/vlc/debian/rules Sun Aug 31 23:06:34 2008
@@ -1,23 +1,26 @@
#!/usr/bin/make -f
+#DH_VERBOSE=1
+
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-
ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
confflags := --build=$(DEB_BUILD_GNU_TYPE)
else
confflags := --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
endif
-# how to call quilt
-QUILT := QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
+include /usr/share/quilt/quilt.make
+
# configure flags
-confflags += --enable-release --prefix=/usr
+confflags += --enable-maintaner-mode --enable-release --prefix=/usr
confflags += \
--enable-libtool \
+ --enable-fast-install \
+ --disable-update-check \
--disable-gnome \
--disable-gtk \
--disable-familiar \
@@ -25,11 +28,12 @@
--enable-ggi \
--enable-sdl \
--enable-esd \
- --disable-qt \
--enable-mad \
--enable-arts \
+ --enable-alsa \
--enable-jack \
- --enable-lirc \
+ --enable-pulse \
+ --enable-lirc \
--enable-a52 \
--enable-aa \
--enable-dvbpsi \
@@ -40,8 +44,8 @@
--disable-satellite \
--enable-ogg \
--enable-vorbis \
- --enable-wxwidgets \
- --with-wx-config=wx-config \
+ --enable-shout \
+ --enable-qt4 \
--disable-slp \
--enable-flac \
--disable-skins \
@@ -53,7 +57,6 @@
--enable-caca \
--enable-live555 \
--enable-libmpeg2 \
- --enable-dts \
--enable-fribidi \
--enable-cdio \
--enable-mod \
@@ -69,26 +72,27 @@
--enable-mpc \
--enable-vcd \
--enable-vcdx \
- --enable-xosd \
+ --enable-notify \
--enable-twolame \
- --enable-notify \
+ --enable-x264 \
--enable-faad \
+ --disable-zvbi \
+ --enable-telx \
--enable-mediacontrol-bindings \
--disable-x264 \
+ --disable-atmo \
+ --enable-taglib \
$(NULL)
+
+# --enable-dts \
# Linux specific flags
ifeq ($(DEB_HOST_ARCH_OS),linux)
-confflags += --enable-alsa --enable-dv --enable-v4l --enable-pvr
-endif
-
-# Glide is only for x86 on Linux
-ifeq ($(DEB_HOST_ARCH),i386)
-confflags += --enable-glide
+confflags += --enable-alsa --enable-dv --enable-v4l --enable-v4l2 --enable-pvr
endif
# svgalib is only for x86 and x86-64 on Linux
-ifneq ($(filter $(DEB_HOST_ARCH), amd64 i386),)
+ifneq ($(filter $(DEB_BUILD_ARCH), amd64 i386),)
confflags += --enable-svgalib
endif
@@ -100,33 +104,31 @@
PIXDIR := usr/share/pixmaps
build: build-stamp
-build-stamp:
- dh_testdir
- $(QUILT) push -a || test $$? = 2
+build-stamp: $(QUILT_STAMPFN)
+ dh_testdir
./configure --enable-static --mandir=$${prefix}/share/man $(confflags)
- $(MAKE) src/libvlc.la
- cp src/.libs/libvlc.a src/libvlc.a
+ $(MAKE) -C src libvlccore.la libvlc.la
+ mkdir -p tmp
+ cp src/.libs/libvlccore.a tmp/libvlccore.a
+ cp src/.libs/libvlc.a tmp/libvlc.a
./configure --mandir=$${prefix}/share/man $(confflags)
$(MAKE)
ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
# Check which plugins were built and whether they load properly.
- ./vlc --reset-plugins-cache -l -I rc vlc:quit
+ ./vlc -vvv --reset-plugins-cache --list --no-color
endif
endif
touch $@
-clean:
- dh_testdir
- dh_testroot
- sed -e '/lib\(alsa\|dvb\|v4l\|pvr\)_/d' debian/vlc-nox.install \
- >debian/vlc-nox.install.kfreebsd-i386
- cp debian/vlc-nox.install.kfreebsd-i386 \
- debian/vlc-nox.install.kfreebsd-amd64
+clean: clean-real unpatch
+clean-real:
+ dh_testdir
+ dh_testroot
rm -f build-stamp
# Clean VLC
[ ! -f Makefile ] || $(MAKE) distclean
- rm -f src/libvlc.a
+ rm -rf tmp/
# Clean zsh completion stuff
rm -f extras/zsh
# Removed ugly cruft
@@ -135,16 +137,20 @@
# Remove spurious autotools stuff
rm -f config.log confdefs.h
# Unpatch package
- $(QUILT) pop -a -R || test $$? = 2
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
+ sed -e '/lib\(alsa\|dvb\|v4l\|pvr\)_/d' debian/vlc-nox.install \
+ >debian/vlc-nox.install.kfreebsd-i386
+ cp debian/vlc-nox.install.kfreebsd-i386 \
+ debian/vlc-nox.install.kfreebsd-amd64
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
- cp src/libvlc.a debian/tmp/usr/lib
+ cp tmp/libvlc.a debian/tmp/usr/lib
+ cp tmp/libvlccore.a debian/tmp/usr/lib
# Clean up libtool crap
find debian/tmp -name '*.la' -exec rm '{}' ';'
# Remove useless stuff
@@ -159,7 +165,7 @@
-mv debian/tmp/$(VIDDIR)/vlc32x32.xpm debian/tmp/$(VIDDIR)/vlc.xpm
# Install stuff
dh_install -si --fail-missing --sourcedir=debian/tmp
- # install BTS stuff
+ #install BTS stuff
mkdir -p debian/vlc-nox/usr/share/bug/vlc-nox
cp debian/bug/* debian/vlc-nox/usr/share/bug/vlc-nox
# Clean up
@@ -194,21 +200,21 @@
dh_testroot
dh_link -s
dh_installdocs -p vlc-nox
- dh_installdocs -p libvlc0
+ dh_installdocs -p vlc-data
dh_buildinfo -p vlc-nox
dh_installmenu -s
dh_installmime -s
dh_installman doc/vlc.1 -p vlc-nox
- dh_installman doc/vlc-config.1 -p libvlc0-dev
dh_installchangelogs ChangeLog -p vlc-nox
- dh_installchangelogs ChangeLog -p libvlc0
+ dh_installchangelogs ChangeLog -p vlc-data
dh_desktop
- dh_strip -s
+ dh_strip -s --dbg-package=vlc-dbg
dh_compress -s
dh_fixperms -s
- dh_makeshlibs -plibvlc0 -V # -V is nasty, but I mean it
+ dh_makeshlibs -plibvlc2 -V # -V is nasty, but I mean it
+ dh_makeshlibs -plibvlccore0 -V # -V is nasty, but I mean it
dh_installdeb -s
- dh_shlibdeps -s -ldebian/libvlc0/usr/lib
+ dh_shlibdeps -s -ldebian/libvlc2/usr/lib:debian/libvlccore0/usr/lib
dh_gencontrol -s
dh_md5sums -s
dh_builddeb -s
Added: experimental/vlc/debian/vlc-data.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/vlc-data.install?rev=1436&op=file
==============================================================================
--- experimental/vlc/debian/vlc-data.install (added)
+++ experimental/vlc/debian/vlc-data.install Sun Aug 31 23:06:34 2008
@@ -1,0 +1,5 @@
+usr/share/doc
+usr/share/locale
+usr/share/vlc/http
+usr/share/vlc/osdmenu
+usr/share/vlc/lua
Propchange: experimental/vlc/debian/vlc-data.install
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: experimental/vlc/debian/vlc-dbg.links (from r1433, experimental/vlc/debian/vlc-plugin-sdl.links)
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/vlc-dbg.links?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/vlc-plugin-sdl.links (original)
+++ experimental/vlc/debian/vlc-dbg.links Sun Aug 31 23:06:34 2008
@@ -1,2 +1,2 @@
-usr/share/doc/vlc-nox usr/share/doc/vlc-plugin-sdl
-usr/share/bug/vlc-nox usr/share/bug/vlc-plugin-sdl
+/usr/share/doc/vlc-nox /usr/share/doc/vlc-dbg
+/usr/share/bug/vlc-nox /usr/share/bug/vlc-dbg
Propchange: experimental/vlc/debian/vlc-dbg.links
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: experimental/vlc/debian/vlc-nox.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/vlc-nox.install?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/vlc-nox.install (original)
+++ experimental/vlc/debian/vlc-nox.install Sun Aug 31 23:06:34 2008
@@ -1,17 +1,29 @@
usr/bin/vlc
-usr/share/doc
-usr/share/locale
-usr/share/vlc/http
-usr/share/vlc/osdmenu
+usr/bin/vlc-wrapper
+usr/bin/cvlc
+usr/bin/nvlc
+usr/bin/rvlc
+usr/lib/vlc/access/libaccess_fake_plugin.so
+usr/lib/vlc/access/libaccess_udp_plugin.so
+usr/lib/vlc/access/libaccess_file_plugin.so
+usr/lib/vlc/access/libaccess_dv_plugin.so
+usr/lib/vlc/access/libaccess_directory_plugin.so
+usr/lib/vlc/access/libaccess_smb_plugin.so
+usr/lib/vlc/access/libaccess_mmap_plugin.so
+usr/lib/vlc/access/libaccess_mms_plugin.so
+usr/lib/vlc/access/libaccess_http_plugin.so
+usr/lib/vlc/access/libaccess_ftp_plugin.so
+usr/lib/vlc/access/libaccess_tcp_plugin.so
+usr/lib/vlc/access/libaccess_rtmp_plugin.so
+usr/lib/vlc/access/libcdda_plugin.so
usr/lib/vlc/access/libdvb_plugin.so
+usr/lib/vlc/access/libdvdnav_plugin.so
+usr/lib/vlc/access/libdvdread_plugin.so
usr/lib/vlc/access/libpvr_plugin.so
usr/lib/vlc/access/libv4l_plugin.so
+usr/lib/vlc/access/libv4l2_plugin.so
usr/lib/vlc/access/libvcd_plugin.so
usr/lib/vlc/access/libvcdx_plugin.so
-usr/lib/vlc/access/libaccess_*.so
-usr/lib/vlc/access/libdvdnav_plugin.so
-usr/lib/vlc/access/libdvdread_plugin.so
-usr/lib/vlc/access/libcdda_plugin.so
usr/lib/vlc/access_filter
usr/lib/vlc/access_output
usr/lib/vlc/audio_filter
@@ -19,52 +31,110 @@
usr/lib/vlc/audio_output/libalsa_plugin.so
usr/lib/vlc/audio_output/libaout_file_plugin.so
usr/lib/vlc/audio_output/liboss_plugin.so
+usr/lib/vlc/codec/liba52_plugin.so
+usr/lib/vlc/codec/libadpcm_plugin.so
+usr/lib/vlc/codec/libaraw_plugin.so
+usr/lib/vlc/codec/libavcodec_plugin.so
+usr/lib/vlc/codec/libcc_plugin.so
+usr/lib/vlc/codec/libcdg_plugin.so
+usr/lib/vlc/codec/libcinepak_plugin.so
usr/lib/vlc/codec/libcmml_plugin.so
-usr/lib/vlc/codec/libffmpeg_plugin.so
+usr/lib/vlc/codec/libcvdsub_plugin.so
+usr/lib/vlc/codec/libdts_plugin.so
+usr/lib/vlc/codec/libdvbsub_plugin.so
+usr/lib/vlc/codec/libfaad_plugin.so
+usr/lib/vlc/codec/libfake_plugin.so
+usr/lib/vlc/codec/libflac_plugin.so
+usr/lib/vlc/codec/liblibmpeg2_plugin.so
+usr/lib/vlc/codec/liblpcm_plugin.so
+usr/lib/vlc/codec/libmpeg_audio_plugin.so
+usr/lib/vlc/codec/libpng_plugin.so
+usr/lib/vlc/codec/librawvideo_plugin.so
+usr/lib/vlc/codec/libspeex_plugin.so
usr/lib/vlc/codec/libspudec_plugin.so
-usr/lib/vlc/codec/liba52_plugin.so
-usr/lib/vlc/codec/libcinepak_plugin.so
-usr/lib/vlc/codec/libdts_plugin.so
-usr/lib/vlc/codec/libflacdec_plugin.so
-usr/lib/vlc/codec/liblpcm_plugin.so
-usr/lib/vlc/codec/libaraw_plugin.so
+usr/lib/vlc/codec/libsubsdec_plugin.so
+usr/lib/vlc/codec/libsvcdsub_plugin.so
+usr/lib/vlc/codec/libt140_plugin.so
+usr/lib/vlc/codec/libtelx_plugin.so
+usr/lib/vlc/codec/libtheora_plugin.so
+usr/lib/vlc/codec/libtwolame_plugin.so
usr/lib/vlc/codec/libvorbis_plugin.so
-usr/lib/vlc/codec/libspeex_plugin.so
-usr/lib/vlc/codec/libadpcm_plugin.so
-usr/lib/vlc/codec/libmpeg_audio_plugin.so
-usr/lib/vlc/codec/liblibmpeg2_plugin.so
-usr/lib/vlc/codec/librawvideo_plugin.so
-usr/lib/vlc/codec/libsubsdec_plugin.so
-usr/lib/vlc/codec/libdvbsub_plugin.so
-usr/lib/vlc/codec/libtwolame_plugin.so
usr/lib/vlc/codec/libpng_plugin.so
usr/lib/vlc/codec/libsvcdsub_plugin.so
usr/lib/vlc/codec/libtelx_plugin.so
usr/lib/vlc/codec/libcvdsub_plugin.so
usr/lib/vlc/codec/libfake_plugin.so
usr/lib/vlc/codec/libfaad_plugin.so
-usr/lib/vlc/codec/libtelx_plugin.so
usr/lib/vlc/control
usr/lib/vlc/demux
usr/lib/vlc/gui/libncurses_plugin.so
-usr/lib/vlc/misc/libscreensaver_plugin.so
+usr/lib/vlc/meta_engine
+usr/lib/vlc/misc/libaudioscrobbler_plugin.so
usr/lib/vlc/misc/libdummy_plugin.so
+usr/lib/vlc/misc/libexport_plugin.so
+usr/lib/vlc/misc/libfreetype_plugin.so
+usr/lib/vlc/misc/libgnutls_plugin.so
+usr/lib/vlc/misc/libinhibit_plugin.so
+usr/lib/vlc/misc/liblogger_plugin.so
+usr/lib/vlc/misc/liblua_plugin.so
+usr/lib/vlc/misc/libmemcpy3dn_plugin.so
+usr/lib/vlc/misc/libmemcpymmxext_plugin.so
+usr/lib/vlc/misc/libmemcpymmx_plugin.so
usr/lib/vlc/misc/libmemcpy_plugin.so
-usr/lib/vlc/misc/libipv4_plugin.so
-usr/lib/vlc/misc/libipv6_plugin.so
-usr/lib/vlc/misc/libexport_plugin.so
+usr/lib/vlc/misc/libosd_parser_plugin.so
+usr/lib/vlc/misc/libprobe_hal_plugin.so
+usr/lib/vlc/misc/libtelepathy_plugin.so
+usr/lib/vlc/codec/libsubsusf_plugin.so
+usr/lib/vlc/misc/libstats_plugin.so
+usr/lib/vlc/misc/libvod_rtsp_plugin.so
+usr/lib/vlc/misc/libxml_plugin.so
usr/lib/vlc/misc/libxtag_plugin.so
-usr/lib/vlc/misc/libxml_plugin.so
-usr/lib/vlc/misc/libfreetype_plugin.so
-usr/lib/vlc/misc/liblogger_plugin.so
-usr/lib/vlc/misc/libvod_rtsp_plugin.so
-usr/lib/vlc/misc/libgnutls_plugin.so
-usr/lib/vlc/misc/libgrowl_plugin.so
usr/lib/vlc/mux
usr/lib/vlc/packetizer
usr/lib/vlc/services_discovery
usr/lib/vlc/stream_out
usr/lib/vlc/video_chroma
-usr/lib/vlc/video_filter
+usr/lib/vlc/video_filter/libadjust_plugin.so
+usr/lib/vlc/video_filter/libalphamask_plugin.so
+usr/lib/vlc/video_filter/libblend_plugin.so
+usr/lib/vlc/video_filter/libblendbench_plugin.so
+usr/lib/vlc/video_filter/libbluescreen_plugin.so
+usr/lib/vlc/video_filter/libcanvas_plugin.so
+usr/lib/vlc/video_filter/libchain_plugin.so
+usr/lib/vlc/video_filter/libclone_plugin.so
+usr/lib/vlc/video_filter/libcolorthres_plugin.so
+usr/lib/vlc/video_filter/libcrop_plugin.so
+usr/lib/vlc/video_filter/libcroppadd_plugin.so
+usr/lib/vlc/video_filter/libdeinterlace_plugin.so
+usr/lib/vlc/video_filter/libdynamicoverlay_plugin.so
+usr/lib/vlc/video_filter/libgrain_plugin.so
+usr/lib/vlc/video_filter/libgradient_plugin.so
+usr/lib/vlc/video_filter/liberase_plugin.so
+usr/lib/vlc/video_filter/libextract_plugin.so
+usr/lib/vlc/video_filter/libgaussianblur_plugin.so
+usr/lib/vlc/video_filter/libinvert_plugin.so
+usr/lib/vlc/video_filter/liblogo_plugin.so
+usr/lib/vlc/video_filter/libmagnify_plugin.so
+usr/lib/vlc/video_filter/libmarq_plugin.so
+usr/lib/vlc/video_filter/libmosaic_plugin.so
+usr/lib/vlc/video_filter/libmotionblur_plugin.so
+usr/lib/vlc/video_filter/libmotiondetect_plugin.so
+usr/lib/vlc/video_filter/libnoise_plugin.so
+usr/lib/vlc/video_filter/libosdmenu_plugin.so
+usr/lib/vlc/video_filter/libpostproc_plugin.so
+usr/lib/vlc/video_filter/libpsychedelic_plugin.so
+usr/lib/vlc/video_filter/libpuzzle_plugin.so
+usr/lib/vlc/video_filter/libremoteosd_plugin.so
+usr/lib/vlc/video_filter/libripple_plugin.so
+usr/lib/vlc/video_filter/librotate_plugin.so
+usr/lib/vlc/video_filter/librss_plugin.so
+usr/lib/vlc/video_filter/librv32_plugin.so
+usr/lib/vlc/video_filter/libscale_plugin.so
+usr/lib/vlc/video_filter/libsharpen_plugin.so
+usr/lib/vlc/video_filter/libswscale_plugin.so
+usr/lib/vlc/video_filter/libtransform_plugin.so
+usr/lib/vlc/video_filter/libwall_plugin.so
+usr/lib/vlc/video_filter/libwave_plugin.so
usr/lib/vlc/video_output/libimage_plugin.so
+usr/lib/vlc/video_output/libvmem_plugin.so
usr/lib/vlc/visualization/libvisual_plugin.so
Added: experimental/vlc/debian/vlc-nox.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/vlc-nox.links?rev=1436&op=file
==============================================================================
--- experimental/vlc/debian/vlc-nox.links (added)
+++ experimental/vlc/debian/vlc-nox.links Sun Aug 31 23:06:34 2008
@@ -1,0 +1,3 @@
+/usr/share/man/man1/vlc.1.gz /usr/share/man/man1/cvlc.1.gz
+/usr/share/man/man1/vlc.1.gz /usr/share/man/man1/rvlc.1.gz
+/usr/share/man/man1/vlc.1.gz /usr/share/man/man1/nvlc.1.gz
Modified: experimental/vlc/debian/vlc-plugin-esd.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/vlc-plugin-esd.links?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/vlc-plugin-esd.links (original)
+++ experimental/vlc/debian/vlc-plugin-esd.links Sun Aug 31 23:06:34 2008
@@ -1,2 +1,2 @@
-usr/share/doc/vlc-nox usr/share/doc/vlc-plugin-esd
-usr/share/bug/vlc-nox usr/share/bug/vlc-plugin-esd
+/usr/share/doc/vlc-nox /usr/share/doc/vlc-plugin-esd
+/usr/share/bug/vlc-nox /usr/share/bug/vlc-plugin-esd
Modified: experimental/vlc/debian/vlc-plugin-ggi.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/vlc-plugin-ggi.links?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/vlc-plugin-ggi.links (original)
+++ experimental/vlc/debian/vlc-plugin-ggi.links Sun Aug 31 23:06:34 2008
@@ -1,2 +1,2 @@
-usr/share/doc/vlc-nox usr/share/doc/vlc-plugin-ggi
-usr/share/bug/vlc-nox usr/share/bug/vlc-plugin-ggi
+/usr/share/doc/vlc-nox /usr/share/doc/vlc-plugin-ggi
+/usr/share/bug/vlc-bug /usr/share/bug/vlc-plugin-ggi
Modified: experimental/vlc/debian/vlc-plugin-jack.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/vlc-plugin-jack.install?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/vlc-plugin-jack.install (original)
+++ experimental/vlc/debian/vlc-plugin-jack.install Sun Aug 31 23:06:34 2008
@@ -1,1 +1,2 @@
usr/lib/vlc/audio_output/libjack_plugin.so
+usr/lib/vlc/access/libaccess_jack_plugin.so
Modified: experimental/vlc/debian/vlc-plugin-jack.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/vlc-plugin-jack.links?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/vlc-plugin-jack.links (original)
+++ experimental/vlc/debian/vlc-plugin-jack.links Sun Aug 31 23:06:34 2008
@@ -1,2 +1,2 @@
-usr/share/doc/vlc-nox usr/share/doc/vlc-plugin-jack
-usr/share/bug/vlc-nox usr/share/bug/vlc-plugin-jack
+/usr/share/doc/vlc-nox /usr/share/doc/vlc-plugin-jack
+/usr/share/bug/vlc-nox /usr/share/bug/vlc-plugin-jack
Added: experimental/vlc/debian/vlc-plugin-pulse.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/vlc-plugin-pulse.install?rev=1436&op=file
==============================================================================
--- experimental/vlc/debian/vlc-plugin-pulse.install (added)
+++ experimental/vlc/debian/vlc-plugin-pulse.install Sun Aug 31 23:06:34 2008
@@ -1,0 +1,1 @@
+usr/lib/vlc/audio_output/libpulse_plugin.so
Added: experimental/vlc/debian/vlc-plugin-pulse.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/vlc-plugin-pulse.links?rev=1436&op=file
==============================================================================
--- experimental/vlc/debian/vlc-plugin-pulse.links (added)
+++ experimental/vlc/debian/vlc-plugin-pulse.links Sun Aug 31 23:06:34 2008
@@ -1,0 +1,2 @@
+/usr/share/doc/vlc-nox /usr/share/doc/vlc-plugin-pulse
+/usr/share/bug/vlc-nox /usr/share/bug/vlc-plugin-pulse
Modified: experimental/vlc/debian/vlc-plugin-sdl.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/vlc-plugin-sdl.links?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/vlc-plugin-sdl.links (original)
+++ experimental/vlc/debian/vlc-plugin-sdl.links Sun Aug 31 23:06:34 2008
@@ -1,2 +1,2 @@
-usr/share/doc/vlc-nox usr/share/doc/vlc-plugin-sdl
-usr/share/bug/vlc-nox usr/share/bug/vlc-plugin-sdl
+/usr/share/doc/vlc-nox /usr/share/doc/vlc-plugin-sdl
+/usr/share/bug/vlc /usr/share/bug/vlc-plugin-sdl
Modified: experimental/vlc/debian/vlc-plugin-svgalib.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/vlc-plugin-svgalib.links?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/vlc-plugin-svgalib.links (original)
+++ experimental/vlc/debian/vlc-plugin-svgalib.links Sun Aug 31 23:06:34 2008
@@ -1,2 +1,2 @@
-usr/share/doc/vlc-nox usr/share/doc/vlc-plugin-svgalib
-usr/share/bug/vlc-nox usr/share/bug/vlc-plugin-svgalib
+/usr/share/doc/vlc-nox /usr/share/doc/vlc-plugin-svgalib
+/usr/share/bug/vlc-nox /usr/share/bug/vlc-plugin-svgalib
Modified: experimental/vlc/debian/vlc.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/vlc.install?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/vlc.install (original)
+++ experimental/vlc/debian/vlc.install Sun Aug 31 23:06:34 2008
@@ -1,18 +1,20 @@
usr/bin/svlc
-usr/bin/wxvlc
+usr/bin/qvlc
usr/lib/vlc/access/libscreen_plugin.so
usr/lib/vlc/codec/libsdl_image_plugin.so
usr/lib/vlc/gui/libskins2_plugin.so
-usr/lib/vlc/gui/libwxwidgets_plugin.so
-usr/lib/vlc/misc/libnotify_plugin.so
+usr/lib/vlc/gui/libqt4_plugin.so
usr/lib/vlc/video_output/libx11_plugin.so
usr/lib/vlc/video_output/libxvideo_plugin.so
usr/lib/vlc/video_output/libglx_plugin.so
usr/lib/vlc/video_output/libaa_plugin.so
usr/lib/vlc/video_output/libcaca_plugin.so
usr/lib/vlc/video_output/libopengl_plugin.so
-usr/lib/vlc/visualization/libxosd_plugin.so
+usr/lib/vlc/video_filter/libpanoramix_plugin.so
+usr/lib/vlc/misc/libnotify_plugin.so
+usr/lib/vlc/misc/libscreensaver_plugin.so
usr/share/vlc/skins2
+usr/share/vlc/utils
usr/share/vlc/*.png
usr/share/vlc/*.xpm
usr/share/vlc/*.ico
Modified: experimental/vlc/debian/vlc.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/vlc.links?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/vlc.links (original)
+++ experimental/vlc/debian/vlc.links Sun Aug 31 23:06:34 2008
@@ -1,5 +1,5 @@
+/usr/share/bug/vlc-nox /usr/share/bug/vlc
/usr/share/doc/vlc-nox /usr/share/doc/vlc
/usr/share/vlc/vlc.xpm /usr/share/vlc/wxvlc.xpm
/usr/share/man/man1/vlc.1.gz /usr/share/man/man1/svlc.1.gz
-/usr/share/man/man1/vlc.1.gz /usr/share/man/man1/wxvlc.1.gz
-/usr/share/bug/vlc-nox /usr/share/bug/vlc
+/usr/share/man/man1/vlc.1.gz /usr/share/man/man1/qvlc.1.gz
Modified: experimental/vlc/debian/vlc.menu
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/vlc.menu?rev=1436&op=diff
==============================================================================
--- experimental/vlc/debian/vlc.menu (original)
+++ experimental/vlc/debian/vlc.menu Sun Aug 31 23:06:34 2008
@@ -1,3 +1,3 @@
-?package(vlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
+?package(vlc):command="/usr/bin/qvlc" hotkey="V" needs="X11" \
section="Applications/Viewers" title="VLC media player" \
icon="/usr/share/vlc/vlc.xpm" hints="Video"
More information about the pkg-multimedia-commits
mailing list