ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: The libtiff pkg-config name is libtiff-4. 

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Francois Gouget 2015-11-05 18:58:44 +01:00 committed by Alexandre Julliard
parent e15e2569a8
commit 6274d97229
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -2290,8 +2290,8 @@ Some influential environment variables:
JPEG_LIBS Linker flags for libjpeg, overriding pkg-config JPEG_LIBS Linker flags for libjpeg, overriding pkg-config
PNG_CFLAGS C compiler flags for libpng, overriding pkg-config PNG_CFLAGS C compiler flags for libpng, overriding pkg-config
PNG_LIBS Linker flags for libpng, overriding pkg-config PNG_LIBS Linker flags for libpng, overriding pkg-config
TIFF_CFLAGS C compiler flags for libtiff, overriding pkg-config TIFF_CFLAGS C compiler flags for libtiff-4, overriding pkg-config
TIFF_LIBS Linker flags for libtiff, overriding pkg-config TIFF_LIBS Linker flags for libtiff-4, overriding pkg-config
MPG123_CFLAGS MPG123_CFLAGS
C compiler flags for libmpg123, overriding pkg-config C compiler flags for libmpg123, overriding pkg-config
MPG123_LIBS Linker flags for libmpg123, overriding pkg-config MPG123_LIBS Linker flags for libmpg123, overriding pkg-config
@ -13512,19 +13512,19 @@ if test "x$with_tiff" != "xno"
then then
if ${TIFF_CFLAGS:+false} :; then : if ${TIFF_CFLAGS:+false} :; then :
if ${PKG_CONFIG+:} false; then : if ${PKG_CONFIG+:} false; then :
TIFF_CFLAGS=`$PKG_CONFIG --cflags libtiff 2>/dev/null` TIFF_CFLAGS=`$PKG_CONFIG --cflags libtiff-4 2>/dev/null`
fi fi
fi fi
if ${TIFF_LIBS:+false} :; then : if ${TIFF_LIBS:+false} :; then :
if ${PKG_CONFIG+:} false; then : if ${PKG_CONFIG+:} false; then :
TIFF_LIBS=`$PKG_CONFIG --libs libtiff 2>/dev/null` TIFF_LIBS=`$PKG_CONFIG --libs libtiff-4 2>/dev/null`
fi fi
fi fi
$as_echo "$as_me:${as_lineno-$LINENO}: libtiff cflags: $TIFF_CFLAGS" >&5 $as_echo "$as_me:${as_lineno-$LINENO}: libtiff-4 cflags: $TIFF_CFLAGS" >&5
$as_echo "$as_me:${as_lineno-$LINENO}: libtiff libs: $TIFF_LIBS" >&5 $as_echo "$as_me:${as_lineno-$LINENO}: libtiff-4 libs: $TIFF_LIBS" >&5
ac_save_CPPFLAGS=$CPPFLAGS ac_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $TIFF_CFLAGS" CPPFLAGS="$CPPFLAGS $TIFF_CFLAGS"
for ac_header in tiffio.h for ac_header in tiffio.h

2
configure.ac
View File

@ -1711,7 +1711,7 @@ WINE_WARNING_WITH(png,[test "x$ac_cv_lib_soname_png" = "x"],
dnl **** Check for libtiff **** dnl **** Check for libtiff ****
if test "x$with_tiff" != "xno" if test "x$with_tiff" != "xno"
then then
WINE_PACKAGE_FLAGS(TIFF,[libtiff],,,, WINE_PACKAGE_FLAGS(TIFF,[libtiff-4],,,,
[AC_CHECK_HEADERS([tiffio.h]) [AC_CHECK_HEADERS([tiffio.h])
if test "$ac_cv_header_tiffio_h" = "yes" if test "$ac_cv_header_tiffio_h" = "yes"
then then