- configure.ac: removed dependency on XPCOM support libs as they bloat the...

- configure.ac: removed dependency on XPCOM support libs as they bloat the mozilla plugin, which does not use them.
- mozilla/Makefile.am: removed dependency on PPC only flags and libs, the plugin builds for MacIntel (doesn't mean it works, though)

configure.ac

@@ -5075,6 +5075,8 @@ AC_ARG_WITH(mozilla-sdk-path,
 
 if test "${enable_mozilla}" = "yes" 
 then
+  dnl currently vlc plugin only needs headers, no xpcom support apis are actually used
+  need_xpcom_libs=false
   if test "${with_mozilla_sdk_path}" = ""
   then
     AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no)
@@ -5097,7 +5099,11 @@ then
       mozilla=:
       dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490
       VLC_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]])
+      if ${need_xpcom_libs}; then
          VLC_ADD_LDFLAGS([mozilla],[`${MOZILLA_CONFIG} --libs plugin xpcom`])
+      else
+         VLC_ADD_LDFLAGS([mozilla],[`${MOZILLA_CONFIG} --libs plugin`])
+      fi
       CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mozilla}"
       AC_CHECK_HEADERS(mozilla-config.h)
       CPPFLAGS="${CPPFLAGS_save}"
@@ -5122,15 +5128,16 @@ then
     AC_CHECK_HEADERS(mozilla-config.h, [
       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_LDFLAGS([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
-        LDFLAGS="${LDFLAGS_save}"
 	   dnl latest gecko sdk does not have embedstring
 	   if test -d "${real_mozilla_sdk}/embedstring/bin"
 	   then
 	     VLC_ADD_LDFLAGS([mozilla],[-lembedstring -Wl,--kill-at])
 	   fi
 	 fi
+      fi
   
       MOZILLA_SDK_PATH="${real_mozilla_sdk}"
       XPIDL_INCL="-I${real_mozilla_sdk}${mozilla_sdk_xpcom}/idl"

mozilla/Makefile.am

@@ -67,11 +67,11 @@ CLEANFILES += VLC\ Plugin.plugin
 SOURCES_support = support/npmac.cpp
 CPPFLAGS_mozilla_EXTRA = -I. -I$(top_builddir) -I$(srcdir)/../include -c \
 	-F/System/Library/Frameworks/CoreFoundation.framework $(moz_CFLAGS) \
-	-I/Developer/Headers/FlatCarbon -arch ppc -fno-common -fpascal-strings \
-	-O0 -Wmost -Wno-four-char-constants -Wno-unknown-pragmas -DXP_MACOSX=1 \
-	-DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0 -g \
+	-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
-LDFLAGS_npvlc = -arch ppc -bundle -read_only_relocs suppress \
+LDFLAGS_npvlc = -bundle -read_only_relocs suppress \
 	$(LIBRARIES_libvlc) -dylib -headerpad_max_install_names 
 
 npvlc.rsrc: $(srcdir)/vlc.r
@@ -118,13 +118,14 @@ VLC\ Plugin.plugin: npvlc.rsrc npvlc.dylib
 	    $(FIXEXECPATH); \
 	  done ; \
 	fi
-	if test -d "$(MOZILLA_SDK_PATH)/lib"; then \
-	  for i in "$(MOZILLA_SDK_PATH)"/lib/*.dylib ; do \
-	    dylib="./$@/Contents/MacOS/`basename $${i}`" ; \
-	    $(INSTALL) -m 644 "$${i}" "$$dylib" ; \
-	    $(FIXEXECPATH); \
-	  done ; \
-	fi
+# uncomment if dependencies on XPCOM libs is sought
+#	if test -d "$(MOZILLA_SDK_PATH)/lib"; then \
+#	  for i in "$(MOZILLA_SDK_PATH)"/lib/*.dylib ; do \
+#	    dylib="./$@/Contents/MacOS/`basename $${i}`" ; \
+#	    $(INSTALL) -m 644 "$${i}" "$$dylib" ; \
+#	    $(FIXEXECPATH); \
+#	  done ; \
+#	fi
 
 else