Commit 853162c0 authored by David Menestrina's avatar David Menestrina Committed by Jean-Baptiste Kempf

Remove references to mozilla-config.h, remove linkage with libnspr and other xpcom libraries.

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 05d0e71d
...@@ -4578,9 +4578,8 @@ then ...@@ -4578,9 +4578,8 @@ then
fi fi
real_mozilla_sdk="`cd ${with_mozilla_sdk_path} 2>/dev/null && pwd`" real_mozilla_sdk="`cd ${with_mozilla_sdk_path} 2>/dev/null && pwd`"
CPPFLAGS="${CPPFLAGS_save} -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include" CPPFLAGS="${CPPFLAGS_save} -I${real_mozilla_sdk}/include"
MOZILLA_REQUIRED_HEADERS=1 MOZILLA_REQUIRED_HEADERS=1
AC_CHECK_HEADERS(mozilla-config.h,,MOZILLA_REQUIRED_HEADERS=0)
AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0) AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0, AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0,
[#if HAVE_NPAPI_H [#if HAVE_NPAPI_H
...@@ -4594,17 +4593,7 @@ then ...@@ -4594,17 +4593,7 @@ then
MOZILLA_REQUIRED_HEADERS= MOZILLA_REQUIRED_HEADERS=
mozilla=: mozilla=:
PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla" PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include]) VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk}/include])
if ${need_xpcom_libs}; then
VLC_ADD_LIBS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 -lxpcomglue])
if test "${SYS}" = "mingw32"; then
dnl latest gecko sdk does not have embedstring
if test -d "${real_mozilla_sdk}/embedstring/bin"
then
VLC_ADD_LIBS([mozilla],[-lembedstring])
fi
fi
fi
MOZILLA_SDK_PATH="${real_mozilla_sdk}" MOZILLA_SDK_PATH="${real_mozilla_sdk}"
if test -n "${CYGPATH}"; then if test -n "${CYGPATH}"; then
......
...@@ -67,8 +67,7 @@ CPPFLAGS_mozilla_EXTRA = -I. -I$(top_builddir) -I$(srcdir)/../include -c \ ...@@ -67,8 +67,7 @@ CPPFLAGS_mozilla_EXTRA = -I. -I$(top_builddir) -I$(srcdir)/../include -c \
-F/System/Library/Frameworks/CoreFoundation.framework $(moz_CFLAGS) \ -F/System/Library/Frameworks/CoreFoundation.framework $(moz_CFLAGS) \
-I/Developer/Headers/FlatCarbon -fno-common -fpascal-strings \ -I/Developer/Headers/FlatCarbon -fno-common -fpascal-strings \
-Wmost -Wno-four-char-constants -Wno-unknown-pragmas -DXP_MACOSX=1 \ -Wmost -Wno-four-char-constants -Wno-unknown-pragmas -DXP_MACOSX=1 \
-DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0 \ -DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0
-include mozilla-config.h
LDFLAGS_mozilla_EXTRA = -no-undefined -bundle -Wl,-read_only_relocs -Wl,suppress \ LDFLAGS_mozilla_EXTRA = -no-undefined -bundle -Wl,-read_only_relocs -Wl,suppress \
-Wl,-headerpad_max_install_names -shrext $(LIBEXT) -Wl,-framework,Carbon -Wl,-framework,System -Wl,-headerpad_max_install_names -shrext $(LIBEXT) -Wl,-framework,Carbon -Wl,-framework,System
......
...@@ -28,11 +28,6 @@ ...@@ -28,11 +28,6 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
/* Mozilla stuff */
#ifdef HAVE_MOZILLA_CONFIG_H
# include <mozilla-config.h>
#endif
#include "vlcplugin.h" #include "vlcplugin.h"
#include "npolibvlc.h" #include "npolibvlc.h"
......
...@@ -27,11 +27,6 @@ ...@@ -27,11 +27,6 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
/* Mozilla stuff */
#ifdef HAVE_MOZILLA_CONFIG_H
# include <mozilla-config.h>
#endif
#include "nporuntime.h" #include "nporuntime.h"
#include "vlcplugin.h" #include "vlcplugin.h"
......
...@@ -30,10 +30,6 @@ ...@@ -30,10 +30,6 @@
//#define OJI 1 //#define OJI 1
#ifdef HAVE_MOZILLA_CONFIG_H
# include <mozilla-config.h>
#endif
#ifndef _NPAPI_H_ #ifndef _NPAPI_H_
# include "npapi.h" # include "npapi.h"
#endif #endif
......
...@@ -28,10 +28,6 @@ ...@@ -28,10 +28,6 @@
*****************************************************************************/ *****************************************************************************/
#include "config.h" #include "config.h"
#ifdef HAVE_MOZILLA_CONFIG_H
# include <mozilla-config.h>
#endif
#include "vlcplugin.h" #include "vlcplugin.h"
#include "control/npolibvlc.h" #include "control/npolibvlc.h"
......
...@@ -31,11 +31,6 @@ ...@@ -31,11 +31,6 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
/* Mozilla stuff */
#ifdef HAVE_MOZILLA_CONFIG_H
# include <mozilla-config.h>
#endif
/* This is from mozilla java, do we really need it? */ /* This is from mozilla java, do we really need it? */
#if 0 #if 0
#include <jri.h> #include <jri.h>
......
...@@ -24,12 +24,6 @@ ...@@ -24,12 +24,6 @@
#ifndef __VLCSHELL_H__ #ifndef __VLCSHELL_H__
#define __VLCSHELL_H__ #define __VLCSHELL_H__
/* Mozilla stuff */
#ifdef HAVE_MOZILLA_CONFIG_H
# include <mozilla-config.h>
#endif
char * NPP_GetMIMEDescription( void ); char * NPP_GetMIMEDescription( void );
NPError NPP_Initialize( void ); NPError NPP_Initialize( void );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment