Bug 709721 part 3 - Only try to export gkmedias symbols that are defined wrt configuration. r=khuey

--HG--
rename : layout/media/symbols.def => layout/media/symbols.def.in

configure.in

@@ -5705,6 +5705,7 @@ if test -n "$MOZ_WEBM"; then
                 [return 0;],
                 [AC_MSG_RESULT([yes])
                  MOZ_NATIVE_LIBVPX=1
+                 AC_DEFINE(MOZ_NATIVE_LIBVPX)
                  MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include"
                  MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"],
                 [AC_MSG_RESULT([no])

layout/media/Makefile.in

@@ -93,7 +93,10 @@ SHARED_LIBRARY_LIBS 	+= \
 EXTRA_DSO_LDOPTS = $(MOZALLOC_LIB) $(NSPR_LIBS)
 
 ifeq (WINNT,$(OS_TARGET))
-DEFFILE = $(srcdir)/symbols.def
+DEFFILE = symbols.def
+
+symbols.def: symbols.def.in
+	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(ACDEFINES) $< > $@
 endif
 
 include $(topsrcdir)/config/rules.mk

layout/media/symbols.def.in

@@ -1,5 +1,6 @@
 LIBRARY gkmedias.dll
 EXPORTS
+#ifdef MOZ_WEBM
 nestegg_destroy
 nestegg_duration
 nestegg_free_packet
@@ -18,6 +19,16 @@ nestegg_track_seek
 nestegg_track_type
 nestegg_track_video_params
 nestegg_tstamp_scale
+#ifndef MOZ_NATIVE_LIBVPX
+vpx_codec_dec_init_ver
+vpx_codec_decode
+vpx_codec_destroy
+vpx_codec_get_frame
+vpx_codec_peek_stream_info
+vpx_codec_vp8_dx
+#endif
+#endif
+#ifdef MOZ_VORBIS
 ogg_page_bos
 ogg_page_granulepos
 ogg_page_serialno
@@ -33,29 +44,6 @@ ogg_sync_init
 ogg_sync_pageseek
 ogg_sync_reset
 ogg_sync_wrote
-sa_stream_create_pcm
-sa_stream_destroy
-sa_stream_drain
-sa_stream_get_min_write
-sa_stream_get_position
-sa_stream_get_write_size
-sa_stream_open
-sa_stream_pause
-sa_stream_resume
-sa_stream_write
-th_comment_clear
-th_comment_init
-th_decode_alloc
-th_decode_free
-th_decode_headerin
-th_decode_packetin
-th_decode_ycbcr_out
-th_granule_frame
-th_info_clear
-th_info_init
-th_packet_isheader
-th_packet_iskeyframe
-th_setup_free
 vorbis_block_clear
 vorbis_block_init
 vorbis_comment_clear
@@ -71,12 +59,34 @@ vorbis_synthesis_init
 vorbis_synthesis_pcmout
 vorbis_synthesis_read
 vorbis_synthesis_restart
-vpx_codec_dec_init_ver
-vpx_codec_decode
-vpx_codec_destroy
-vpx_codec_get_frame
-vpx_codec_peek_stream_info
-vpx_codec_vp8_dx
+#endif
+#ifdef MOZ_SYDNEYAUDIO
+sa_stream_create_pcm
+sa_stream_destroy
+sa_stream_drain
+sa_stream_get_min_write
+sa_stream_get_position
+sa_stream_get_write_size
+sa_stream_open
+sa_stream_pause
+sa_stream_resume
+sa_stream_write
+#endif
+#ifdef MOZ_OGG
+th_comment_clear
+th_comment_init
+th_decode_alloc
+th_decode_free
+th_decode_headerin
+th_decode_packetin
+th_decode_ycbcr_out
+th_granule_frame
+th_info_clear
+th_info_init
+th_packet_isheader
+th_packet_iskeyframe
+th_setup_free
+#endif
 ShInitialize
 ShFinalize
 ShGetObjectCode