* Always use PIC to build the Mozilla plugin.

diff --git a/configure.ac b/configure.ac
index 792272464e1aa676e0b5836830a80f41bd5d341a..529ca811566620309e59a61ec62e508ade8b1e03 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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.])
   FILE_LIBVLC_DLL="!define LIBVLC_DLL 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
 VLC_CONDITIONALS

diff --git a/mozilla/Makefile.am b/mozilla/Makefile.am
index 1eb2e4f2f84d051e274b2f96d247d389be3c55dd..077eeaec33d476e5f436ae189d66cefa10ccda7e 100644 (file)
--- a/mozilla/Makefile.am
+++ b/mozilla/Makefile.am
@@ -159,11 +159,11 @@ libvlcplugin_la_LDFLAGS = `$(VLC_CONFIG) --libs mozilla` -module -avoid-version
 libvlcplugin_la_LIBADD = ../src/libvlc.la
 
 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)
-libnpvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla $(pic)` \
+libnpvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla pic` \
                       $(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)
 
 $(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-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 \
            rm -f $@; \
            break; \