Skip to content
Snippets Groups Projects
Commit 0047bc75 authored by David Abdurachmanov's avatar David Abdurachmanov Committed by Fons Rademakers
Browse files

Add 3 new env variables for ./configure: LIBTIFF, LIBPNG, and LIBJPEG


Adds 3 new environments variables to ./configure script:
- LIBJPEG
- LIBPNG
- LIBTIFF

Similar to like we handle ZLIB.

Signed-off-by: default avatarDavid Abdurachmanov <davidlt@cern.ch>
Signed-off-by: default avatarFons Rademakers <Fons.Rademakers@cern.ch>
parent bbeaa6d9
No related branches found
No related tags found
No related merge requests found
...@@ -194,6 +194,9 @@ rm -f $logfile ...@@ -194,6 +194,9 @@ rm -f $logfile
envvars=" envvars="
THREAD \ THREAD \
ZLIB \ ZLIB \
LIBTIFF \
LIBJPEG \
LIBPNG \
LZMA \ LZMA \
OPENGL \ OPENGL \
MYSQL \ MYSQL \
...@@ -4328,11 +4331,13 @@ if test ! "x$enable_asimage" = "xno" ; then ...@@ -4328,11 +4331,13 @@ if test ! "x$enable_asimage" = "xno" ; then
# to avoid system versions based on X11. # to avoid system versions based on X11.
if test "x$enable_builtin_afterimage" = "xyes" && test ! "x$enable_cocoa" = "xyes"; then if test "x$enable_builtin_afterimage" = "xyes" && test ! "x$enable_cocoa" = "xyes"; then
check_header "jpeglib.h" "" \ check_header "jpeglib.h" "" \
${LIBJPEG:+$LIBJPEG/include} \
$ASIMAGE ${ASIMAGE:+$ASIMAGE/include} \ $ASIMAGE ${ASIMAGE:+$ASIMAGE/include} \
${finkdir:+$finkdir/include} \ ${finkdir:+$finkdir/include} \
/usr/local/include /usr/include /opt/include /usr/local/include /usr/include /opt/include
asjpegincdir=$found_dir asjpegincdir=$found_dir
check_header "png.h" "" \ check_header "png.h" "" \
${LIBPNG:+$LIBPNG/include} \
$ASIMAGE ${ASIMAGE:+$ASIMAGE/include} \ $ASIMAGE ${ASIMAGE:+$ASIMAGE/include} \
${ASPNG:+$ASPNG/include} \ ${ASPNG:+$ASPNG/include} \
${finkdir:+$finkdir/include} \ ${finkdir:+$finkdir/include} \
...@@ -4341,6 +4346,7 @@ if test ! "x$enable_asimage" = "xno" ; then ...@@ -4341,6 +4346,7 @@ if test ! "x$enable_asimage" = "xno" ; then
aspngincdir=$found_dir aspngincdir=$found_dir
if test ! "x$enable_astiff" = "xno" ; then if test ! "x$enable_astiff" = "xno" ; then
check_header "tiffio.h" "" \ check_header "tiffio.h" "" \
${LIBTIFF:+$LIBTIFF/include} \
$ASIMAGE ${ASIMAGE:+$ASIMAGE/include} \ $ASIMAGE ${ASIMAGE:+$ASIMAGE/include} \
${finkdir:+$finkdir/include} \ ${finkdir:+$finkdir/include} \
/usr/local/include /usr/include /opt/include /usr/local/include /usr/include /opt/include
...@@ -4362,6 +4368,8 @@ if test ! "x$enable_asimage" = "xno" ; then ...@@ -4362,6 +4368,8 @@ if test ! "x$enable_asimage" = "xno" ; then
fi fi
for k in $aslibs ; do for k in $aslibs ; do
check_library $k "$enable_shared" "" \ check_library $k "$enable_shared" "" \
${LIBJPEG:+$LIBJPEG/lib} ${LIBPNG:+$LIBPNG/lib} \
${LIBTIFF:+$LIBTIFF/lib} ${ZLIB:+$ZLIB/lib} \
$ASIMAGE ${ASIMAGE:+$ASIMAGE/lib} ${ASPNG:+$ASPNG/lib} \ $ASIMAGE ${ASIMAGE:+$ASIMAGE/lib} ${ASPNG:+$ASPNG/lib} \
${finkdir:+$finkdir/lib} \ ${finkdir:+$finkdir/lib} \
/usr/local/lib /usr/X11/lib /usr/lib /opt/lib /usr/local/lib /usr/X11/lib /usr/lib /opt/lib
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment