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

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/configure.ac b/configure.ac
index e3ccd74d6540a77cccd6999d9f79557de8c1766b..fc1beb5623bb7014ed62daf60f7763af82bad437 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4578,9 +4578,8 @@ then
     fi
 
     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
-    AC_CHECK_HEADERS(mozilla-config.h,,MOZILLA_REQUIRED_HEADERS=0)
     AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
     AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0,
         [#if HAVE_NPAPI_H
@@ -4594,17 +4593,7 @@ then
     MOZILLA_REQUIRED_HEADERS=
     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])
-    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
+    VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk}/include])
     MOZILLA_SDK_PATH="${real_mozilla_sdk}"
 
     if test -n "${CYGPATH}"; then

diff --git a/projects/mozilla/Makefile.am b/projects/mozilla/Makefile.am
index 9d1b7e6331ca8b0b3b2659052374335f427e7ca5..230b720b04a46d78a98afe252b7c155dc7ccab3a 100644 (file)
--- a/projects/mozilla/Makefile.am
+++ b/projects/mozilla/Makefile.am
@@ -67,8 +67,7 @@ CPPFLAGS_mozilla_EXTRA = -I. -I$(top_builddir) -I$(srcdir)/../include -c \
        -F/System/Library/Frameworks/CoreFoundation.framework $(moz_CFLAGS) \
        -I/Developer/Headers/FlatCarbon -fno-common -fpascal-strings \
        -Wmost -Wno-four-char-constants -Wno-unknown-pragmas -DXP_MACOSX=1 \
-       -DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0 \
-       -include mozilla-config.h
+       -DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0 
 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
 

diff --git a/projects/mozilla/control/npolibvlc.cpp b/projects/mozilla/control/npolibvlc.cpp
index 5bc853436cbbc15ab32de260e673ae1fb528f597..2e6440ec06840e8bbf39432e3d664f6db4a40382 100644 (file)
--- a/projects/mozilla/control/npolibvlc.cpp
+++ b/projects/mozilla/control/npolibvlc.cpp
@@ -28,11 +28,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-/* Mozilla stuff */
-#ifdef HAVE_MOZILLA_CONFIG_H
-#   include <mozilla-config.h>
-#endif
-
 #include "vlcplugin.h"
 #include "npolibvlc.h"
 

diff --git a/projects/mozilla/control/nporuntime.cpp b/projects/mozilla/control/nporuntime.cpp
index cced74aa75f015cc3adb47644dadac5b9a73e9d2..396bbb9fb6f0a77ef90073f014d01c8a8d499e14 100644 (file)
--- a/projects/mozilla/control/nporuntime.cpp
+++ b/projects/mozilla/control/nporuntime.cpp
@@ -27,11 +27,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-/* Mozilla stuff */
-#ifdef HAVE_MOZILLA_CONFIG_H
-#   include <mozilla-config.h>
-#endif
-
 #include "nporuntime.h"
 #include "vlcplugin.h"
 

diff --git a/projects/mozilla/support/npwin.cpp b/projects/mozilla/support/npwin.cpp
index 77f540ff44edd27ff4015f52538986fd285a3d8a..13a539679adef3199f1bde3f64c52aa63f400240 100644 (file)
--- a/projects/mozilla/support/npwin.cpp
+++ b/projects/mozilla/support/npwin.cpp
@@ -30,10 +30,6 @@
 
 //#define OJI 1
 
-#ifdef HAVE_MOZILLA_CONFIG_H
-#   include <mozilla-config.h>
-#endif
-
 #ifndef _NPAPI_H_
 #   include "npapi.h"
 #endif

diff --git a/projects/mozilla/vlcplugin.cpp b/projects/mozilla/vlcplugin.cpp
index b7794a478f90290296ccfa21878195f800af6ec8..cfdede108451e53c2a015ca85fc7a02a2699f733 100644 (file)
--- a/projects/mozilla/vlcplugin.cpp
+++ b/projects/mozilla/vlcplugin.cpp
@@ -28,10 +28,6 @@
  *****************************************************************************/
 #include "config.h"
 
-#ifdef HAVE_MOZILLA_CONFIG_H
-#   include <mozilla-config.h>
-#endif
-
 #include "vlcplugin.h"
 #include "control/npolibvlc.h"
 

diff --git a/projects/mozilla/vlcshell.cpp b/projects/mozilla/vlcshell.cpp
index e59dac95f98102bd7dca9f85f9aea31581ac1800..575c2b1b91710d5707b6443cface096c34a0e8ff 100644 (file)
--- a/projects/mozilla/vlcshell.cpp
+++ b/projects/mozilla/vlcshell.cpp
@@ -31,11 +31,6 @@
 #include <string.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? */
 #if 0
 #include <jri.h>

diff --git a/projects/mozilla/vlcshell.h b/projects/mozilla/vlcshell.h
index fca6afaa689e2947a918497bf25cace2d65abce9..a91a06e4f78083ac43c1c45642682ffc0a90e102 100644 (file)
--- a/projects/mozilla/vlcshell.h
+++ b/projects/mozilla/vlcshell.h
@@ -24,12 +24,6 @@
 #ifndef __VLCSHELL_H__
 #define __VLCSHELL_H__
 
-/* Mozilla stuff */
-#ifdef HAVE_MOZILLA_CONFIG_H
-#   include <mozilla-config.h>
-#endif
-
-
 char * NPP_GetMIMEDescription( void );
 
 NPError NPP_Initialize( void );