From d0add9f8d9456d36f32f6b69013b42c959223a58 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Wed, 1 Dec 2021 15:03:41 -0600 Subject: [PATCH] configure: Try to detect MinGW liblcms2 using pkg-config if --with-system-dllpath is specified. Signed-off-by: Zebediah Figura Signed-off-by: Alexandre Julliard --- configure | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 9 +++++ 2 files changed, 119 insertions(+) diff --git a/configure b/configure index 1d1e9a7be6f..9a6a1aa868a 100755 --- a/configure +++ b/configure @@ -12574,6 +12574,116 @@ CPPFLAGS=$ac_save_CPPFLAGS as_fn_append wine_notices "|libjpeg ${notice_platform}MinGW development files not found; using bundled version." fi + if ${LCMS2_PE_CFLAGS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + LCMS2_PE_CFLAGS=`$MINGW_PKG_CONFIG --cflags lcms2 2>/dev/null` +fi +fi +if ${LCMS2_PE_LIBS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + LCMS2_PE_LIBS=`$MINGW_PKG_CONFIG --libs lcms2 2>/dev/null` +fi +fi +LCMS2_PE_LIBS=${LCMS2_PE_LIBS:-"-llcms2"} +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $LCMS2_PE_CFLAGS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW lcms2.h" >&5 +printf %s "checking for MinGW lcms2.h... " >&6; } +if test ${ac_cv_mingw_header_lcms2_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 +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_lcms2_h=yes +else $as_nop + ac_cv_mingw_header_lcms2_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_lcms2_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_lcms2_h" >&6; } +if test "x$ac_cv_mingw_header_lcms2_h" = xyes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cmsOpenProfileFromFile in MinGW -llcms2" >&5 +printf %s "checking for cmsOpenProfileFromFile in MinGW -llcms2... " >&6; } +if test ${ac_cv_mingw_lib_lcms2+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="-llcms2 $LCMS2_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 cmsOpenProfileFromFile (); +int +main (void) +{ +return cmsOpenProfileFromFile (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_lcms2=yes +else $as_nop + ac_cv_mingw_lib_lcms2=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_lcms2" >&5 +printf "%s\n" "$ac_cv_mingw_lib_lcms2" >&6; } +if test "x$ac_cv_mingw_lib_lcms2" = xyes +then : + : +else $as_nop + LCMS2_PE_CFLAGS=""; LCMS2_PE_LIBS="" +fi +else $as_nop + LCMS2_PE_CFLAGS=""; LCMS2_PE_LIBS="" +fi +CPPFLAGS=$ac_save_CPPFLAGS + + if test "x$LCMS2_PE_LIBS" = "x" + then + as_fn_append wine_notices "|liblcms2 ${notice_platform}MinGW development files not found; using bundled version." + fi + if ${ZLIB_PE_CFLAGS:+false} : then : if test ${MINGW_PKG_CONFIG+y} diff --git a/configure.ac b/configure.ac index bd8e4495274..2a9a397ec01 100644 --- a/configure.ac +++ b/configure.ac @@ -1055,6 +1055,15 @@ then WINE_NOTICE([libjpeg ${notice_platform}MinGW development files not found; using bundled version.]) fi + WINE_MINGW_PACKAGE_FLAGS(LCMS2,[lcms2],[-llcms2], + [WINE_CHECK_MINGW_HEADER(lcms2.h, + [WINE_CHECK_MINGW_LIB(lcms2,cmsOpenProfileFromFile,[:],[LCMS2_PE_CFLAGS=""; LCMS2_PE_LIBS=""],[$LCMS2_PE_LIBS])], + [LCMS2_PE_CFLAGS=""; LCMS2_PE_LIBS=""])]) + if test "x$LCMS2_PE_LIBS" = "x" + then + WINE_NOTICE([liblcms2 ${notice_platform}MinGW development files not found; using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],