configure: Try to detect MinGW libtiff using pkg-config if --with-system-dllpath is specified.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura
Alexandre Julliard
parent
aafddb16c3
commit
089dd8560b
|
|
@ -12904,6 +12904,116 @@ CPPFLAGS=$ac_save_CPPFLAGS
|
||||||
as_fn_append wine_notices "|libpng ${notice_platform}MinGW development files not found; using bundled version."
|
as_fn_append wine_notices "|libpng ${notice_platform}MinGW development files not found; using bundled version."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if ${TIFF_PE_CFLAGS:+false} :
|
||||||
|
then :
|
||||||
|
if test ${MINGW_PKG_CONFIG+y}
|
||||||
|
then :
|
||||||
|
TIFF_PE_CFLAGS=`$MINGW_PKG_CONFIG --cflags libtiff-4 2>/dev/null`
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if ${TIFF_PE_LIBS:+false} :
|
||||||
|
then :
|
||||||
|
if test ${MINGW_PKG_CONFIG+y}
|
||||||
|
then :
|
||||||
|
TIFF_PE_LIBS=`$MINGW_PKG_CONFIG --libs libtiff-4 2>/dev/null`
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
ac_save_CPPFLAGS=$CPPFLAGS
|
||||||
|
CPPFLAGS="$CPPFLAGS $TIFF_PE_CFLAGS"
|
||||||
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW tiffio.h" >&5
|
||||||
|
printf %s "checking for MinGW tiffio.h... " >&6; }
|
||||||
|
if test ${ac_cv_mingw_header_tiffio_h+y}
|
||||||
|
then :
|
||||||
|
printf %s "(cached) " >&6
|
||||||
|
else $as_nop
|
||||||
|
ac_wine_check_headers_saved_cc=$CC
|
||||||
|
ac_wine_check_headers_saved_exeext=$ac_exeext
|
||||||
|
CC="$CROSSCC"
|
||||||
|
ac_exeext=".exe"
|
||||||
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
#include <tiffio.h>
|
||||||
|
int
|
||||||
|
main (void)
|
||||||
|
{
|
||||||
|
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
if ac_fn_c_try_compile "$LINENO"
|
||||||
|
then :
|
||||||
|
ac_cv_mingw_header_tiffio_h=yes
|
||||||
|
else $as_nop
|
||||||
|
ac_cv_mingw_header_tiffio_h=no
|
||||||
|
fi
|
||||||
|
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||||
|
CC=$ac_wine_check_headers_saved_cc
|
||||||
|
ac_exeext=$ac_wine_check_headers_saved_exeext
|
||||||
|
fi
|
||||||
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_tiffio_h" >&5
|
||||||
|
printf "%s\n" "$ac_cv_mingw_header_tiffio_h" >&6; }
|
||||||
|
if test "x$ac_cv_mingw_header_tiffio_h" = xyes
|
||||||
|
then :
|
||||||
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIFFClientOpen in MinGW -ltiff" >&5
|
||||||
|
printf %s "checking for TIFFClientOpen in MinGW -ltiff... " >&6; }
|
||||||
|
if test ${ac_cv_mingw_lib_tiff+y}
|
||||||
|
then :
|
||||||
|
printf %s "(cached) " >&6
|
||||||
|
else $as_nop
|
||||||
|
ac_wine_check_headers_saved_cc=$CC
|
||||||
|
ac_wine_check_headers_saved_exeext=$ac_exeext
|
||||||
|
ac_wine_check_headers_saved_libs=$LIBS
|
||||||
|
CC="$CROSSCC"
|
||||||
|
ac_exeext=".exe"
|
||||||
|
LIBS="-ltiff $TIFF_PE_LIBS $LIBS"
|
||||||
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
/* Override any GCC internal prototype to avoid an error.
|
||||||
|
Use char because int might match the return type of a GCC
|
||||||
|
builtin and then its argument prototype would still apply. */
|
||||||
|
char TIFFClientOpen ();
|
||||||
|
int
|
||||||
|
main (void)
|
||||||
|
{
|
||||||
|
return TIFFClientOpen ();
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
if ac_fn_c_try_link "$LINENO"
|
||||||
|
then :
|
||||||
|
ac_cv_mingw_lib_tiff=yes
|
||||||
|
else $as_nop
|
||||||
|
ac_cv_mingw_lib_tiff=no
|
||||||
|
fi
|
||||||
|
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
||||||
|
conftest$ac_exeext conftest.$ac_ext
|
||||||
|
CC=$ac_wine_check_headers_saved_cc
|
||||||
|
ac_exeext=$ac_wine_check_headers_saved_exeext
|
||||||
|
LIBS=$ac_wine_check_headers_saved_libs
|
||||||
|
fi
|
||||||
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_tiff" >&5
|
||||||
|
printf "%s\n" "$ac_cv_mingw_lib_tiff" >&6; }
|
||||||
|
if test "x$ac_cv_mingw_lib_tiff" = xyes
|
||||||
|
then :
|
||||||
|
:
|
||||||
|
else $as_nop
|
||||||
|
TIFF_PE_CFLAGS=""; TIFF_PE_LIBS=""
|
||||||
|
fi
|
||||||
|
else $as_nop
|
||||||
|
TIFF_PE_CFLAGS=""; TIFF_PE_LIBS=""
|
||||||
|
fi
|
||||||
|
CPPFLAGS=$ac_save_CPPFLAGS
|
||||||
|
|
||||||
|
if test "x$TIFF_PE_LIBS" = "x"
|
||||||
|
then
|
||||||
|
as_fn_append wine_notices "|libtiff ${notice_platform}MinGW development files not found; using bundled version."
|
||||||
|
fi
|
||||||
|
|
||||||
if ${ZLIB_PE_CFLAGS:+false} :
|
if ${ZLIB_PE_CFLAGS:+false} :
|
||||||
then :
|
then :
|
||||||
if test ${MINGW_PKG_CONFIG+y}
|
if test ${MINGW_PKG_CONFIG+y}
|
||||||
|
|
|
||||||
|
|
@ -1082,6 +1082,15 @@ then
|
||||||
WINE_NOTICE([libpng ${notice_platform}MinGW development files not found; using bundled version.])
|
WINE_NOTICE([libpng ${notice_platform}MinGW development files not found; using bundled version.])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
WINE_MINGW_PACKAGE_FLAGS(TIFF,[libtiff-4],,
|
||||||
|
[WINE_CHECK_MINGW_HEADER(tiffio.h,
|
||||||
|
[WINE_CHECK_MINGW_LIB(tiff,TIFFClientOpen,[:],[TIFF_PE_CFLAGS=""; TIFF_PE_LIBS=""],[$TIFF_PE_LIBS])],
|
||||||
|
[TIFF_PE_CFLAGS=""; TIFF_PE_LIBS=""])])
|
||||||
|
if test "x$TIFF_PE_LIBS" = "x"
|
||||||
|
then
|
||||||
|
WINE_NOTICE([libtiff ${notice_platform}MinGW development files not found; using bundled version.])
|
||||||
|
fi
|
||||||
|
|
||||||
WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz],
|
WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz],
|
||||||
[WINE_CHECK_MINGW_HEADER(zlib.h,
|
[WINE_CHECK_MINGW_HEADER(zlib.h,
|
||||||
[WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],
|
[WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue