summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/Makefile.in1
-rw-r--r--config/external/moz.build3
-rw-r--r--config/system-headers3
3 files changed, 1 insertions, 6 deletions
diff --git a/config/Makefile.in b/config/Makefile.in
index 5fe0162f2..93ad5a80c 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -44,7 +44,6 @@ export:: $(export-preqs)
-DMOZ_SYSTEM_HUNSPELL=$(MOZ_SYSTEM_HUNSPELL) \
-DMOZ_SYSTEM_BZ2=$(MOZ_SYSTEM_BZ2) \
-DMOZ_SYSTEM_ZLIB=$(MOZ_SYSTEM_ZLIB) \
- -DMOZ_SYSTEM_PNG=$(MOZ_SYSTEM_PNG) \
-DMOZ_SYSTEM_JPEG=$(MOZ_SYSTEM_JPEG) \
-DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \
$(srcdir)/system-headers $(srcdir)/stl-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
diff --git a/config/external/moz.build b/config/external/moz.build
index fbf6da089..012533554 100644
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -36,8 +36,7 @@ if not CONFIG['MOZ_SYSTEM_LIBVPX']:
if CONFIG['MOZ_AV1']:
external_dirs += ['media/libaom']
-if not CONFIG['MOZ_SYSTEM_PNG']:
- external_dirs += ['media/libpng']
+external_dirs += ['media/libpng']
external_dirs += ['media/libwebp']
diff --git a/config/system-headers b/config/system-headers
index a2d3b813d..9dd33bc76 100644
--- a/config/system-headers
+++ b/config/system-headers
@@ -1253,9 +1253,6 @@ soundtouch/SoundTouchFactory.h
#if MOZ_LIBAV_FFT==1
libavcodec/avfft.h
#endif
-#if MOZ_SYSTEM_PNG==1
-png.h
-#endif
#if MOZ_SYSTEM_ZLIB==1
zlib.h
#endif