Author: gonzalo
Date: 2006-05-25 09:50:28 -0400 (Thu, 25 May 2006)
New Revision: 61108
Modified:
trunk/libgdiplus/ChangeLog
trunk/libgdiplus/configure.in
Log:
2006-05-25 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* configure.in: made libpng12 mandatory. The resources used in SWF are
png files.
Modified: trunk/libgdiplus/ChangeLog
===================================================================
--- trunk/libgdiplus/ChangeLog 2006-05-25 13:33:49 UTC (rev 61107)
+++ trunk/libgdiplus/ChangeLog 2006-05-25 13:50:28 UTC (rev 61108)
@@ -1,3 +1,8 @@
+2006-05-25 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+ * configure.in: made libpng12 mandatory. The resources used in SWF are
+ png files.
+
2006-05-05 Sebastien Pouliot <[EMAIL PROTECTED]>
* TODO: Added a few details about some not-quite-supported API.
Modified: trunk/libgdiplus/configure.in
===================================================================
--- trunk/libgdiplus/configure.in 2006-05-25 13:33:49 UTC (rev 61107)
+++ trunk/libgdiplus/configure.in 2006-05-25 13:50:28 UTC (rev 61108)
@@ -160,8 +160,6 @@
[AC_HELP_STRING([--without-libtiff], [disable TIFF file IO])])
AC_ARG_WITH(libgif,
[AC_HELP_STRING([--without-libgif], [disable GIF file IO])])
-AC_ARG_WITH(libpng,
- [AC_HELP_STRING([--without-libpng], [disable PNG file IO])])
dnl Test for libtiff
if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
@@ -238,7 +236,6 @@
fi
dnl Test for libpng
- if test x$with_libpng != xno && test -z "$LIBPNG"; then
AC_MSG_CHECKING(for libpng12)
if $PKG_CONFIG --exists libpng12 ; then
AC_MSG_RESULT(yes)
@@ -251,7 +248,7 @@
[AC_CHECK_HEADER(png.h,
png_ok=yes,
png_ok=no)],
- AC_MSG_WARN(*** PNG loader will not be built (PNG library not found)
***), -lz -lm)
+ AC_MSG_ERROR(*** libpng12 not found. See
http://www.libpng.org/pub/png/libpng.html.), -lz -lm)
if test "$png_ok" = yes; then
AC_MSG_CHECKING([for png_structp in png.h])
AC_TRY_COMPILE([#include <png.h>],
@@ -262,19 +259,16 @@
if test "$png_ok" = yes; then
PNG='png'; LIBPNG='-lpng -lz'
else
- AC_MSG_WARN(*** PNG loader will not be built (PNG library is too
old) ***)
+ AC_MSG_ERROR(*** libpng12 found, but it is too old. See
http://www.libpng.org/pub/png/libpng.html.)
fi
else
- AC_MSG_WARN(*** PNG loader will not be built (PNG header file not
found) ***)
+ AC_MSG_ERROR(*** libpng12 not found. See
http://www.libpng.org/pub/png/libpng.html.)
fi
fi
-fi
-if test x$PNG != x; then
- GDIPLUS_LIBS="$GDIPLUS_LIBS $LIBPNG"
- AC_DEFINE(HAVE_LIBPNG, 1, Define if png support is available)
-fi
+GDIPLUS_LIBS="$GDIPLUS_LIBS $LIBPNG"
+AC_DEFINE(HAVE_LIBPNG, 1, Define if png support is available. Always defined.)
dnl
dnl Produce a diagnostic, to reduce support time
@@ -306,8 +300,7 @@
test ! x$JPEG = x && echo yes || echo "no (Get it from
http://freshmeat.net/projects/libjpeg)"
echo $ECHO_N " - GIF: "
test ! x$GIF = x && echo yes || echo "no (See
http://sourceforge.net/projects/libgif)"
-echo $ECHO_N " - PNG: "
-test ! x$PNG = x && echo yes || echo "no (See
http://www.libpng.org/pub/png/libpng.html)"
+echo $ECHO_N " - PNG: yes"
echo ""
echo " NOTE: if any of the above say 'no' you may install the"
echo " corresponding development packages for them, rerun"
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
