Commit 5a1a3209 authored by Mukund Sivaraman's avatar Mukund Sivaraman

Move libpng specific warning CFLAGS to PNG_CFLAGS

parent 28983a51
......@@ -1178,6 +1178,7 @@ fi
if test "x$have_libpng" = xyes; then
MIME_TYPES="$MIME_TYPES;image/png;image/x-icon"
PNG_CFLAGS="$PNG_CFLAGS -DPNG_PEDANTIC_WARNINGS"
fi
AC_SUBST(FILE_PNG)
......@@ -1199,7 +1200,7 @@ if test "x$with_libmng" != xno && test -z "$MNG_LIBS" &&
[have_libmng="no (MNG library not found)"], -lz -lm)
if test "$mng_ok" = yes; then
have_libmng=yes
FILE_MNG='file-mng$(EXEEXT)'; MNG_LIBS="-lmng $JPEG_LIBS $PNG_LIBS"
FILE_MNG='file-mng$(EXEEXT)'; MNG_LIBS="-lmng $JPEG_LIBS $PNG_LIBS"; MNG_CFLAGS="$PNG_CFLAGS"
else
have_libmng="no (MNG header file not found)"
fi
......@@ -1207,6 +1208,7 @@ fi
AC_SUBST(FILE_MNG)
AC_SUBST(MNG_LIBS)
AC_SUBST(MNG_CFLAGS)
############################################################
......@@ -1977,12 +1979,6 @@ if test "x$have_pango_1_32" != "xyes"; then
fi
###############################################
# Enable additional warnings of other libraries
###############################################
CPPFLAGS="${CPPFLAGS} -DPNG_PEDANTIC_WARNINGS"
############################
# Require multihead safe API
############################
......
......@@ -1236,6 +1236,8 @@ file_jp2_load_LDADD = \
$(INTLLIBS) \
$(file_jp2_load_RC)
file_mng_CFLAGS = $(MNG_CFLAGS)
file_mng_SOURCES = \
file-mng.c
......
......@@ -60,7 +60,7 @@
'file-header' => { ui => 1 },
'file-html-table' => { ui => 1 },
'file-jp2-load' => { optional => 1, libs => 'JP2_LIBS' },
'file-mng' => { ui => 1, optional => 1, libs => 'MNG_LIBS' },
'file-mng' => { ui => 1, optional => 1, libs => 'MNG_LIBS', cflags => 'MNG_CFLAGS' },
'file-pat' => { ui => 1 },
'file-pcx' => { ui => 1 },
'file-pix' => { ui => 1 },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment