[vlc-commits] commit: Remove references to mozilla-config.h, remove linkage with libnspr and other xpcom libraries. (David Menestrina )
git at videolan.org
git at videolan.org
Tue Apr 27 23:56:45 CEST 2010
vlc/vlc-1.1 | branch: master | David Menestrina <dmenest-vlc at ofb.net> | Thu Apr 15 18:34:43 2010 -0700| [94f30f26ff78eba77edfe2cb97422acb909aa2e4] | committer: Jean-Baptiste Kempf
Remove references to mozilla-config.h, remove linkage with libnspr and other xpcom libraries.
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 853162c03b7cda6209180789612a79051dbcce01)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=94f30f26ff78eba77edfe2cb97422acb909aa2e4
---
configure.ac | 15 ++-------------
projects/mozilla/Makefile.am | 3 +--
projects/mozilla/control/npolibvlc.cpp | 5 -----
projects/mozilla/control/nporuntime.cpp | 5 -----
projects/mozilla/support/npwin.cpp | 4 ----
projects/mozilla/vlcplugin.cpp | 4 ----
projects/mozilla/vlcshell.cpp | 5 -----
projects/mozilla/vlcshell.h | 6 ------
8 files changed, 3 insertions(+), 44 deletions(-)
diff --git a/configure.ac b/configure.ac
index e574383..bec467a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4667,9 +4667,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
@@ -4683,17 +4682,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 9d1b7e6..230b720 100644
--- 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 5bc8534..2e6440e 100644
--- 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 cced74a..396bbb9 100644
--- 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 77f540f..13a5396 100644
--- 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 b7794a4..cfdede1 100644
--- 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 774c0a7..274c057 100644
--- 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 fca6afa..a91a06e 100644
--- 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 );
More information about the vlc-commits
mailing list