Commit 7483d688 authored by Sam Hocevar's avatar Sam Hocevar

* Always use PIC to build the Mozilla plugin.

parent c8f13a2b
...@@ -5468,19 +5468,6 @@ AS_IF([test "${enable_shared_libvlc}" != "no" || test "${enable_libtool}" != "no ...@@ -5468,19 +5468,6 @@ AS_IF([test "${enable_shared_libvlc}" != "no" || test "${enable_libtool}" != "no
AC_DEFINE(HAVE_SHARED_LIBVLC, 1, [Define to 1 if libvlc is built as a shared library.]) AC_DEFINE(HAVE_SHARED_LIBVLC, 1, [Define to 1 if libvlc is built as a shared library.])
FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"], FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"],
FILE_LIBVLC_DLL="" ) FILE_LIBVLC_DLL="" )
dnl
dnl we need pic on amd64 fo the mozilla plugin
case "${target_cpu}" in
x86_64)
pic=pic
;;
*)
pic=""
;;
esac
AC_SUBST(pic)
dnl Import conditional variables generated by bootstrap dnl Import conditional variables generated by bootstrap
VLC_CONDITIONALS VLC_CONDITIONALS
......
...@@ -159,11 +159,11 @@ libvlcplugin_la_LDFLAGS = `$(VLC_CONFIG) --libs mozilla` -module -avoid-version ...@@ -159,11 +159,11 @@ libvlcplugin_la_LDFLAGS = `$(VLC_CONFIG) --libs mozilla` -module -avoid-version
libvlcplugin_la_LIBADD = ../src/libvlc.la libvlcplugin_la_LIBADD = ../src/libvlc.la
libnpvlc_a_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support) libnpvlc_a_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support)
libnpvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla $(pic)` \ libnpvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla pic` \
$(CPPFLAGS_mozilla_EXTRA) $(CPPFLAGS_mozilla_EXTRA)
libnpvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla $(pic)` \ libnpvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla pic` \
$(CPPFLAGS_mozilla_EXTRA) $(CPPFLAGS_mozilla_EXTRA)
LDFLAGS_libnpvlc = $(LDFLAGS_npvlc) `$(VLC_CONFIG) --libs mozilla vlc builtin $(pic)` LDFLAGS_libnpvlc = $(LDFLAGS_npvlc) `$(VLC_CONFIG) --libs mozilla vlc builtin pic`
libnpvlc_a_DEPENDENCIES = $(DATA_npvlc_rc) libnpvlc_a_DEPENDENCIES = $(DATA_npvlc_rc)
$(npvlc): $(libnpvlc_a_OBJECTS) $(libnpvlc_a_DEPENDENCIES) stamp-pic $(npvlc): $(libnpvlc_a_OBJECTS) $(libnpvlc_a_DEPENDENCIES) stamp-pic
...@@ -176,7 +176,7 @@ $(npvlc): $(libnpvlc_a_OBJECTS) $(libnpvlc_a_DEPENDENCIES) stamp-pic ...@@ -176,7 +176,7 @@ $(npvlc): $(libnpvlc_a_OBJECTS) $(libnpvlc_a_DEPENDENCIES) stamp-pic
# Stamp rules # Stamp rules
############################################################################### ###############################################################################
stamp-pic: stamp-pic:
@for dep in "" `$(VLC_CONFIG) --target builtin $(pic)`; do \ @for dep in "" `$(VLC_CONFIG) --target builtin pic`; do \
if test "$${dep}" -nt "$(LIBRARIES_mozilla)"; then \ if test "$${dep}" -nt "$(LIBRARIES_mozilla)"; then \
rm -f $@; \ rm -f $@; \
break; \ break; \
......
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