diff options
| -rw-r--r-- | build/directive4.py | 1 | ||||
| -rw-r--r-- | build/moz.configure/old.configure | 1 | ||||
| -rw-r--r-- | config/Makefile.in | 1 | ||||
| -rw-r--r-- | config/external/moz.build | 3 | ||||
| -rw-r--r-- | config/system-headers | 3 | ||||
| -rw-r--r-- | old-configure.in | 45 | ||||
| -rw-r--r-- | toolkit/library/moz.build | 3 |
7 files changed, 1 insertions, 56 deletions
diff --git a/build/directive4.py b/build/directive4.py index 38465628b..009009bf0 100644 --- a/build/directive4.py +++ b/build/directive4.py @@ -36,7 +36,6 @@ if ('MOZ_OFFICIAL_BRANDING' in listConfig) or (strBrandingDirectory.endswith("br 'MOZ_SYSTEM_JPEG', 'MOZ_SYSTEM_ZLIB', 'MOZ_SYSTEM_BZ2', - 'MOZ_SYSTEM_PNG', 'MOZ_SYSTEM_LIBVPX', 'MOZ_SYSTEM_SQLITE', 'MOZ_SYSTEM_JEMALLOC' diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure index 03b1d4cdc..8059adaf1 100644 --- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -292,7 +292,6 @@ def old_configure_options(*options): '--with-system-libvpx', '--with-system-nspr', '--with-system-nss', - '--with-system-png', '--with-system-zlib', '--with-thumb', '--with-thumb-interwork', 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 diff --git a/old-configure.in b/old-configure.in index 530a70471..cc1b20fea 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2092,51 +2092,6 @@ if test "${BZ2_DIR}" -a -d "${BZ2_DIR}" -a "$MOZ_SYSTEM_BZ2" = 1; then MOZ_BZ2_LIBS="-L${BZ2_DIR}/lib ${MOZ_BZ2_LIBS}" fi -dnl ======================================================== -dnl system PNG Support -dnl ======================================================== -MOZ_ARG_WITH_STRING(system-png, -[ --with-system-png[=PFX] - Use system libpng [installed at prefix PFX]], - PNG_DIR=$withval) - -_SAVE_CFLAGS=$CFLAGS -_SAVE_LDFLAGS=$LDFLAGS -_SAVE_LIBS=$LIBS -if test -n "${PNG_DIR}" -a "${PNG_DIR}" != "yes"; then - CFLAGS="-I${PNG_DIR}/include $CFLAGS" - LDFLAGS="-L${PNG_DIR}/lib $LDFLAGS" -fi -if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then - MOZ_SYSTEM_PNG= -else - AC_CHECK_LIB(png, png_get_valid, [MOZ_SYSTEM_PNG=1 MOZ_PNG_LIBS="-lpng"], - AC_MSG_ERROR([--with-system-png requested but no working libpng found])) - AC_CHECK_LIB(png, png_get_acTL, , - AC_MSG_ERROR([--with-system-png won't work because the system's libpng doesn't have APNG support])) -fi -if test "$MOZ_SYSTEM_PNG" = 1; then - AC_TRY_COMPILE([ #include <stdio.h> - #include <sys/types.h> - #include <png.h> ], - [ #if PNG_LIBPNG_VER < $MOZPNG - #error "Insufficient libpng version ($MOZPNG required)." - #endif - #ifndef PNG_UINT_31_MAX - #error "Insufficient libpng version." - #endif ], - MOZ_SYSTEM_PNG=1, - AC_MSG_ERROR([--with-system-png requested but no working libpng found])) -fi -CFLAGS=$_SAVE_CFLAGS -LDFLAGS=$_SAVE_LDFLAGS -LIBS=$_SAVE_LIBS - -if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$MOZ_SYSTEM_PNG" = 1; then - MOZ_PNG_CFLAGS="-I${PNG_DIR}/include" - MOZ_PNG_LIBS="-L${PNG_DIR}/lib ${MOZ_PNG_LIBS}" -fi - fi # SKIP_LIBRARY_CHECKS dnl ======================================================== diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build index 85a7351ba..506db8fef 100644 --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build @@ -195,9 +195,6 @@ if CONFIG['SERVO_TARGET_DIR']: if CONFIG['MOZ_SYSTEM_JPEG']: OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] -if CONFIG['MOZ_SYSTEM_PNG']: - OS_LIBS += CONFIG['MOZ_PNG_LIBS'] - if CONFIG['MOZ_SYSTEM_HUNSPELL']: OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] |