Make jasper support optional

To enable it, one must now pass --with-libjasper to configure.
This commit is contained in:
Matthias Clasen 2009-07-16 20:54:42 -04:00
parent 4d282879be
commit c41e36ad8a
2 changed files with 7 additions and 4 deletions

View File

@ -34,6 +34,9 @@ Release notes for 2.18
old custom_widget. Custom_widget does not get destroyed when the old custom_widget. Custom_widget does not get destroyed when the
tooltip goes away. tooltip goes away.
* JPEG2000 support is no longer enabled by default. It must be
explicitly turned on, by passing --with-libjasper to configure.
Release notes for 2.16 Release notes for 2.16
====================== ======================

View File

@ -825,8 +825,8 @@ AC_ARG_WITH(libtiff,
[AC_HELP_STRING([--without-libtiff], [AC_HELP_STRING([--without-libtiff],
[disable TIFF loader for gdk-pixbuf])]) [disable TIFF loader for gdk-pixbuf])])
AC_ARG_WITH(libjasper, AC_ARG_WITH(libjasper,
[AC_HELP_STRING([--without-libjasper], [AC_HELP_STRING([--with-libjasper],
[disable JPEG2000 loader for gdk-pixbuf])]) [enable JPEG2000 loader for gdk-pixbuf])])
AC_ARG_ENABLE(gdiplus, AC_ARG_ENABLE(gdiplus,
[AC_HELP_STRING([--enable-gdiplus], [AC_HELP_STRING([--enable-gdiplus],
@ -941,11 +941,11 @@ dnl Test for libpng
fi fi
dnl Test for libjasper dnl Test for libjasper
if test x$with_libjasper != xno && test -z "$LIBJASPER"; then if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
AC_CHECK_LIB(jasper, jas_init, LIBJASPER=-ljasper, [], -ljpeg) AC_CHECK_LIB(jasper, jas_init, LIBJASPER=-ljasper, [], -ljpeg)
fi fi
if test x$with_libjasper != xno && test -z "$LIBJASPER"; then if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
*** Checks for JPEG2000 loader failed. You can build without it by passing *** Checks for JPEG2000 loader failed. You can build without it by passing
*** --without-libjasper to configure]) *** --without-libjasper to configure])