configure.ac | 61 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 30 insertions(+), 31 deletions(-)
New commits: commit d99e7a88845a5f4b35e2c538c597316b2ad541ca Author: Albert Astals Cid <[email protected]> Date: Fri Nov 20 22:09:44 2009 +0100 Check for openjpeg in the C++ part as it uses bool in the header Bug 25103 diff --git a/configure.ac b/configure.ac index 0ff2c59..7a8ca19 100644 --- a/configure.ac +++ b/configure.ac @@ -106,6 +106,36 @@ then fi +dnl Test for libopenjpeg +AC_ARG_ENABLE(libopenjpeg, + AC_HELP_STRING([--disable-libopenjpeg], + [Don't build against libopenjpeg.]), + enable_libopenjpeg=$enableval, + enable_libopenjpeg="try") +if test x$enable_libopenjpeg = xyes; then + AC_CHECK_LIB([openjpeg], [opj_cio_open],, + AC_MSG_ERROR("*** libopenjpeg library not found ***")) + AC_CHECK_HEADERS([openjpeg.h],, + AC_MSG_ERROR("*** libopenjpeg headers not found ***")) +elif test x$enable_libopenjpeg = xtry; then + AC_CHECK_LIB([openjpeg], [opj_cio_open], + [enable_libopenjpeg="yes"], + [enable_libopenjpeg="no"]) + AC_CHECK_HEADERS([openjpeg.h],, + [enable_libopenjpeg="no"]) +fi + +if test x$enable_libopenjpeg = xyes; then + LIBOPENJPEG_LIBS="-lopenjpeg" + AC_SUBST(LIBOPENJPEG_LIBS) + AC_DEFINE(ENABLE_LIBOPENJPEG) +fi + +AM_CONDITIONAL(BUILD_LIBOPENJPEG, test x$enable_libopenjpeg = xyes) +AH_TEMPLATE([ENABLE_LIBOPENJPEG], + [Use libopenjpeg instead of builtin jpeg2000 decoder.]) + + dnl ##### Checks for library functions. AC_CHECK_FUNCS(popen mkstemp mkstemps) @@ -150,37 +180,6 @@ AH_TEMPLATE([ENABLE_ZLIB], [Use zlib instead of builtin zlib decoder.]) -dnl Test for libopenjpeg -AC_ARG_ENABLE(libopenjpeg, - AC_HELP_STRING([--disable-libopenjpeg], - [Don't build against libopenjpeg.]), - enable_libopenjpeg=$enableval, - enable_libopenjpeg="try") -if test x$enable_libopenjpeg = xyes; then - AC_CHECK_LIB([openjpeg], [opj_cio_open],, - AC_MSG_ERROR("*** libopenjpeg library not found ***")) - AC_CHECK_HEADERS([openjpeg.h],, - AC_MSG_ERROR("*** libopenjpeg headers not found ***")) -elif test x$enable_libopenjpeg = xtry; then - AC_CHECK_LIB([openjpeg], [opj_cio_open], - [enable_libopenjpeg="yes"], - [enable_libopenjpeg="no"]) - AC_CHECK_HEADERS([openjpeg.h],, - [enable_libopenjpeg="no"]) -fi - -if test x$enable_libopenjpeg = xyes; then - LIBOPENJPEG_LIBS="-lopenjpeg" - AC_SUBST(LIBOPENJPEG_LIBS) - AC_DEFINE(ENABLE_LIBOPENJPEG) -fi - -AM_CONDITIONAL(BUILD_LIBOPENJPEG, test x$enable_libopenjpeg = xyes) -AH_TEMPLATE([ENABLE_LIBOPENJPEG], - [Use libopenjpeg instead of builtin jpeg2000 decoder.]) - - - dnl Test for libjpeg AC_ARG_ENABLE(libjpeg, AC_HELP_STRING([--disable-libjpeg], _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
