diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-31 15:10:26 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:19:55 +0200 |
| commit | 171053d0b2df19cfc4f43dde7a2e1814380ca7d6 (patch) | |
| tree | ffd8fecba4ecb03fb4af7cefcce7fdfd9713b461 /old-configure.in | |
| parent | efd88ee9995dca701786cd13204d57899335f569 (diff) | |
| download | UXP-171053d0b2df19cfc4f43dde7a2e1814380ca7d6.tar UXP-171053d0b2df19cfc4f43dde7a2e1814380ca7d6.tar.gz UXP-171053d0b2df19cfc4f43dde7a2e1814380ca7d6.tar.lz UXP-171053d0b2df19cfc4f43dde7a2e1814380ca7d6.tar.xz UXP-171053d0b2df19cfc4f43dde7a2e1814380ca7d6.zip | |
Issue #1342 - Remove support for system linbpng
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 45 |
1 files changed, 0 insertions, 45 deletions
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 ======================================================== |