diff options
Diffstat (limited to 'Build/source/libs/poppler/poppler-src/configure.ac')
-rw-r--r-- | Build/source/libs/poppler/poppler-src/configure.ac | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/Build/source/libs/poppler/poppler-src/configure.ac b/Build/source/libs/poppler/poppler-src/configure.ac index 0ba420adbee..94dfa062ed5 100644 --- a/Build/source/libs/poppler/poppler-src/configure.ac +++ b/Build/source/libs/poppler/poppler-src/configure.ac @@ -1,5 +1,5 @@ m4_define([poppler_version_major],[0]) -m4_define([poppler_version_minor],[49]) +m4_define([poppler_version_minor],[50]) m4_define([poppler_version_micro],[0]) m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro]) @@ -207,25 +207,26 @@ AC_ARG_ENABLE(libopenjpeg, openjpeg_header=yes -dnl test for libopenjpeg1 -if test x$enable_libopenjpeg = xopenjpeg1 || test x$enable_libopenjpeg = xauto; then - PKG_CHECK_MODULES(LIBOPENJPEG, libopenjpeg, - [openjpeg1="yes"], - [AC_CHECK_LIB([openjpeg], [opj_cio_open], - [openjpeg1="yes" - LIBOPENJPEG_LIBS="-lopenjpeg"],[openjpeg_header=no]) - AC_CHECK_HEADERS([openjpeg.h],, - [openjpeg_header="no"])]) +dnl test for libopenjpeg2 +if test x$enable_libopenjpeg = xopenjpeg2 || test x$enable_libopenjpeg = xauto; then + PKG_CHECK_MODULES(LIBOPENJPEG, libopenjp2, + [openjpeg2=yes],[openjpeg2=no]) fi -dnl test for libopenjpeg2 -if test x$openjpeg1 = xno; then - if test x$enable_libopenjpeg = xopenjpeg2 || test x$enable_libopenjpeg = xauto; then - PKG_CHECK_MODULES(LIBOPENJPEG, libopenjp2, - [openjpeg2=yes],[openjpeg2=no]) +dnl test for libopenjpeg1 +if test x$openjpeg2 = xno; then + if test x$enable_libopenjpeg = xopenjpeg1 || test x$enable_libopenjpeg = xauto; then + PKG_CHECK_MODULES(LIBOPENJPEG, libopenjpeg, + [openjpeg1="yes"], + [AC_CHECK_LIB([openjpeg], [opj_cio_open], + [openjpeg1="yes" + LIBOPENJPEG_LIBS="-lopenjpeg"],[openjpeg_header=no]) + AC_CHECK_HEADERS([openjpeg.h],, + [openjpeg_header="no"])]) fi fi + if test x$enable_libopenjpeg = xopenjpeg1 && test x$openjpeg1 = xno; then if test x$openjpeg_header = xno; then AC_MSG_ERROR("*** libopenjpeg headers not found ***") @@ -1085,5 +1086,5 @@ if test x$enable_zlib_uncompress != xno; then fi if test x$enable_libopenjpeg != xyes; then - echo " Warning: Using libopenjpeg is recommended. The internal JPX decoder is unmaintained." + echo " Warning: Using libopenjpeg2 is recommended. The internal JPX decoder is unmaintained." fi |