projects / packages / libraw.git / blame
| Commit | Line | Data |
|---|---|---|
| 0cfd1611 JB |
1 | --- LibRaw-0.18.1/configure.ac.orig 2017-02-12 09:07:54.000000000 +0100 |
| 2 | +++ LibRaw-0.18.1/configure.ac 2017-02-25 11:11:23.817486333 +0100 | |
| 3 | @@ -84,7 +84,7 @@ | |
| 4 | fi | |
| 5 | ||
| 6 | ||
| 7 | - | |
| 8 | +PACKAGE_REQUIRES= | |
| 9 | # check if we want LCMS support | |
| 10 | AC_ARG_ENABLE([lcms], | |
| 11 | [ --enable-lcms Enable LCMS support], | |
| 12 | @@ -98,18 +98,33 @@ | |
| 13 | PKG_CHECK_MODULES([LCMS2],[lcms2],[ | |
| 14 | CPPFLAGS="$CPPFLAGS $LCMS2_CFLAGS -DUSE_LCMS2" | |
| 15 | LIBS="$LIBS $LCMS2_LIBS" | |
| 16 | - AC_SUBST([PACKAGE_REQUIRES],[lcms2]) | |
| 17 | + PACKAGE_REQUIRES="lcms2" | |
| 18 | ],[ | |
| 19 | PKG_CHECK_MODULES([LCMS],[lcms],[ | |
| 20 | CPPFLAGS="$CPPFLAGS $LCMS_CFLAGS -DUSE_LCMS" | |
| 21 | LIBS="$LIBS $LCMS_LIBS" | |
| 22 | - AC_SUBST([PACKAGE_REQUIRES],[lcms]) | |
| 23 | + PACKAGE_REQUIRES="lcms" | |
| 24 | ],[ | |
| 25 | AC_MSG_WARN([LCMS support cannot be enabled]) | |
| 26 | ]) | |
| 27 | ]) | |
| 28 | fi | |
| 29 | ||
| 30 | +AC_ARG_ENABLE([zlib], | |
| 31 | + [ --enable-zlib Enable ZLIB for deflated DNG support]) | |
| 32 | + | |
| 33 | +if test x$enable_zlib = xyes; then | |
| 34 | + PKG_CHECK_MODULES([ZLIB],[zlib],[ | |
| 35 | + CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS -DUSE_ZLIB" | |
| 36 | + LIBS="$LIBS $ZLIB_LIBS" | |
| 37 | + PACKAGE_REQUIRES="$PACKAGE_REQUIRES zlib" | |
| 38 | + ],[ | |
| 39 | + AC_MSG_ERROR([ZLIB support cannot be enabled]) | |
| 40 | + ]) | |
| 41 | +fi | |
| 42 | + | |
| 43 | +AC_SUBST([PACKAGE_REQUIRES]) | |
| 44 | + | |
| 45 | # check if we want build examples | |
| 46 | AC_ARG_ENABLE([examples], | |
| 47 | [ --enable-examples Enable building of examples], |