solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fix using system libtiff installed in non-standard location

Browse source 
Add the required CFLAGS (such as the path to libtiff headers if they are
not in one of the system directories) to CXXFLAGS, not CFLAGS, as we're
using libtiff from C++ code.

This fixes a problem introduced in b9fe8ca10c (Try to use pkg-config for
detecting libtiff in configure, 2018-12-12).

Closes #23702.

Closes #23703.
This commit is contained in:
Vadim Zeitlin 2023-07-11 13:26:30 +02:00
parent 0a1b92fd31
commit 340320d63c
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure vendored
View file

@ -25977,7 +25977,7 @@ else
$as_echo "yes" >&6; }
TIFF_LINK=$LIBTIFF_LIBS
CFLAGS="$LIBTIFF_CFLAGS $CFLAGS"
CXXFLAGS="$LIBTIFF_CFLAGS $CXXFLAGS"
fi

4
configure.in
View file

@ -2480,12 +2480,10 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
AC_DEFINE(wxUSE_LIBTIFF)
if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
dnl First try using pkg-config as it's the most reliable way to detect
dnl libtiff.
PKG_CHECK_MODULES(LIBTIFF, [libtiff-4],
[
TIFF_LINK=$LIBTIFF_LIBS
CFLAGS="$LIBTIFF_CFLAGS $CFLAGS"
CXXFLAGS="$LIBTIFF_CFLAGS $CXXFLAGS"
],
[
AC_MSG_RESULT([not found via pkg-config])