Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use libjpeg and libz in tests for libtiff or they fail (patch 644149)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-11-28 21:52:14 +00:00
parent 82f9014293
commit 1ae0c8d334
2 changed files with 438 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

848
configure vendored
View File

File diff suppressed because it is too large Load Diff

11
configure.in
View File

@@ -1835,15 +1835,24 @@ dnl ------------------------------------------------------------------------
TIFF_INCLUDE= TIFF_INCLUDE=
TIFF_LINK= TIFF_LINK=
TIFF_PREREQ_LINKS=-lm
if test "$wxUSE_LIBTIFF" != "no" ; then if test "$wxUSE_LIBTIFF" != "no" ; then
AC_DEFINE(wxUSE_LIBTIFF) AC_DEFINE(wxUSE_LIBTIFF)
if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
dnl libtiff may depend on libjpeg and libz so use them in the test
dnl below or it would fail
if test "$wxUSE_LIBJPEG" = "sys"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK"
fi
if test "$wxUSE_ZLIB" = "sys"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
fi
AC_CHECK_HEADER(tiffio.h, AC_CHECK_HEADER(tiffio.h,
AC_CHECK_LIB(tiff, TIFFError, AC_CHECK_LIB(tiff, TIFFError,
TIFF_LINK=" -ltiff", TIFF_LINK=" -ltiff",
, ,
-lm) $TIFF_PREREQ_LINKS)
) )
if test "x$TIFF_LINK" = "x" ; then if test "x$TIFF_LINK" = "x" ; then