-#
-AC_MSG_RESULT(png is usable:$with_libpng)
-AM_CONDITIONAL([with_libpng], [test x$with_libpng = xyes])
-AC_SUBST(pngincludes)
-AC_SUBST(pnglibs)
-# -------------------------------
-# Test for TIFF
-# -------------------------------
-AC_MSG_CHECKING(whether to build with TIFF support)
-tifflibs=""
-tiffincludes=""
-with_libtiff="yes"
-tiff_header_found="no"
-#
-AC_ARG_ENABLE(tiff,
-[ --enable-tiff[=[yes|no]] Build with TIFF support [ [default=yes] ]],
-test "$enable_tiff" = "no" && with_libtiff="no")
-#
-if test "x$with_libtiff" = xyes ; then
-#TIFF compiled with JPEG and JBIG support?
- libjpeg=""
- AC_CHECK_LIB(jpeg,jpeg_read_header,libjpeg=-ljpeg,,)
- libjbig=""
- AC_CHECK_LIB(jbig,jbg_enc_init,libjbig=-ljbig,,)
- libjbig85=""
- AC_CHECK_LIB(jbig85,jbg85_enc_init,libjbig85=-ljbig85,,)
-#standard path
- with_libtiff="no"
- savedLIBS="$LIBS"
- LIBS="-ltiff $libjpeg $libjbig $libjbig85 $LIB_Z $LIB_MATH"
- AC_CHECK_LIB(tiff, TIFFOpen, tifflibs=-ltiff)
- LIBS="$savedLIBS"
- if test -n "$tifflibs" ; then
- AC_CHECK_HEADER(tiff.h,tiff_header_found="yes",,)
- if test "$tiff_header_found" = "yes" ; then
- with_libtiff="yes"
- LIBS="$LIBS -ltiff $libjpeg $libjbig $libjbig85"
- AC_DEFINE(HAVE_LIBTIFF, [1], [define to 1 if you have libtiff])
- fi
- fi
-#
- if test "x$with_libtiff" = xno ; then
-#non-standard path
- AC_ARG_WITH(tiff_includes,
- [ --with-tiff-includes=DIR TIFF includes in nonstandard DIR])
- if test -n "$with_tiff_includes" ; then
- tiffheader="$with_tiff_includes/tiff.h"
- AC_CHECK_HEADER($tiffheader,tiff_header_found="yes",,)
- if test "$tiff_header_found" = "yes" ; then
- tiffincludes="-I$with_tiff_includes"
- fi
- fi
- AC_ARG_WITH(tiff_libraries,
- [ --with-tiff-libraries=DIR TIFF library in nonstandard DIR])
- if test -n "$with_tiff_libraries" ; then
- tifflibs="-L$with_tiff_libraries"
- fi
- tifflibs="$tifflibs -ltiff"
- savedLIBS="$LIBS"
- LIBS="$tifflibs $libjpeg $libjbig $libjbig85 $LIB_Z $LIB_MATH"
- with_libtiff="no"
-#
- AC_CHECK_LIB(tiff, TIFFOpen, , tifflibs="",)
-#
- if test -n "$tifflibs" ; then
- if test "$tiff_header_found" = "yes" ; then
- with_libtiff="yes"
- AC_DEFINE(HAVE_LIBTIFF, [1], [define to 1 if you have libtiff])
- fi
- fi
- LIBS="$savedLIBS $tifflibs $libjpeg $libjbig $libjbig85"
- fi
+
+AM_CONDITIONAL([WANT_MJ2], [test "x${want_mj2}" = "xyes"])
+
+# JPWL
+
+AC_ARG_ENABLE([jpwl],
+ [AC_HELP_STRING([--enable-jpwl], [build JPWL library @<:@default=disabled@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ want_jpwl="yes"
+ else
+ want_jpwl="no"
+ fi
+ ],
+ [want_jpwl="no"])
+
+AC_MSG_CHECKING([whether to build the JPWL library])
+AC_MSG_RESULT([${want_jpwl}])
+
+AM_CONDITIONAL([WANT_JPWL], [test "x${want_jpwl}" = "xyes"])
+
+# JPIP
+
+AC_ARG_ENABLE([jpip],
+ [AC_HELP_STRING([--enable-jpip], [build jpip library @<:@default=disabled@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ want_jpip="yes"
+ else
+ want_jpip="no"
+ fi
+ ],
+ [want_jpip="no"])
+
+AC_MSG_CHECKING([whether to build the JPIP library])
+AC_MSG_RESULT([${want_jpip}])
+
+
+### Checks for programs
+
+AC_PROG_CC
+
+# pkg-config
+
+PKG_PROG_PKG_CONFIG
+
+# Check whether pkg-config supports Requires.private
+if $PKG_CONFIG --atleast-pkgconfig-version 0.22 ; then
+ pkgconfig_requires_private="Requires.private"
+else
+ pkgconfig_requires_private="Requires"