From: Alexandre Julliard <julliard@winehq.org> --- aclocal.m4 | 26 +++--- configure | 247 +++++++++++++++++++++++++-------------------------- configure.ac | 20 ++--- 3 files changed, 145 insertions(+), 148 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 6625ac4de18..e9c6459bfaa 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -138,10 +138,13 @@ AS_VAR_IF([ac_libs],[], [AS_VAR_SET_IF([MINGW_PKG_CONFIG], [ac_libs=`$MINGW_PKG_CONFIG --libs [$2] 2>/dev/null`])]) m4_ifval([$3],[ac_libs=[$]{ac_libs:-"$3"}]) -AS_IF([test -n "$ac_cflags$ac_libs"],[ac_save_CPPFLAGS=$CPPFLAGS +AS_IF([test -n "$ac_cflags$ac_libs"],[ac_save_pkg_CPPFLAGS=$CPPFLAGS +ac_save_pkg_LIBS=$LIBS CPPFLAGS="$CPPFLAGS $ac_cflags" +LIBS="$ac_libs $LIBS" $4 -CPPFLAGS=$ac_save_CPPFLAGS]) +CPPFLAGS=$ac_save_pkg_CPPFLAGS +LIBS=$ac_save_pkg_LIBS]) AS_VAR_POPDEF([ac_libs])dnl AS_VAR_POPDEF([ac_cflags])])dnl @@ -239,24 +242,21 @@ ac_exeext=$ac_wine_check_headers_saved_exeext]) AS_VAR_IF([ac_var],[yes],[$2],[$3])dnl AS_VAR_POPDEF([ac_var])]) -dnl **** Check whether the given MinGW library is available **** +dnl **** Check whether the given MinGW library function is available **** dnl -dnl Usage: WINE_CHECK_MINGW_LIB(library,function,[action-if-found],[action-if-not-found],[other-libraries]) +dnl Usage: WINE_CHECK_MINGW_FUNC(library,function,[action-if-found],[action-if-not-found]) dnl -AC_DEFUN([WINE_CHECK_MINGW_LIB], -[AS_VAR_PUSHDEF([ac_var],[ac_cv_mingw_lib_$1])dnl -AC_CACHE_CHECK([for $2 in MinGW -l$1], ac_var, +AC_DEFUN([WINE_CHECK_MINGW_FUNC], +[AS_VAR_PUSHDEF([ac_var],[ac_cv_mingw_func_$1])dnl +AC_CACHE_CHECK([for $1 in PE library], ac_var, [ac_wine_check_headers_saved_cc=$CC ac_wine_check_headers_saved_exeext=$ac_exeext -ac_wine_check_headers_saved_libs=$LIBS AS_VAR_COPY([CC],[${wine_arch}_CC]) ac_exeext=".exe" -LIBS="-l$1 $5 $LIBS" -AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],[AS_VAR_SET([ac_var],[yes])],[AS_VAR_SET([ac_var],[no])]) +AC_LINK_IFELSE([AC_LANG_CALL([], [$1])],[AS_VAR_SET([ac_var],[yes])],[AS_VAR_SET([ac_var],[no])]) CC=$ac_wine_check_headers_saved_cc -ac_exeext=$ac_wine_check_headers_saved_exeext -LIBS=$ac_wine_check_headers_saved_libs]) -AS_VAR_IF([ac_var],[yes],[$3],[$4])dnl +ac_exeext=$ac_wine_check_headers_saved_exeext]) +AS_VAR_IF([ac_var],[yes],[$2],[$3])dnl AS_VAR_POPDEF([ac_var])]) dnl **** Check whether we need to define a symbol on the compiler command line **** diff --git a/configure b/configure index 5c240898c1e..82ba3070e35 100755 --- a/configure +++ b/configure @@ -13303,8 +13303,10 @@ fi FAUDIO_PE_LIBS=${FAUDIO_PE_LIBS:-"-lFAudio"} if test -n "$FAUDIO_PE_CFLAGS$FAUDIO_PE_LIBS" then : - ac_save_CPPFLAGS=$CPPFLAGS + ac_save_pkg_CPPFLAGS=$CPPFLAGS +ac_save_pkg_LIBS=$LIBS CPPFLAGS="$CPPFLAGS $FAUDIO_PE_CFLAGS" +LIBS="$FAUDIO_PE_LIBS $LIBS" { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for MinGW FAudio.h" >&5 printf %s "checking for MinGW FAudio.h... " >&6; } if test ${ac_cv_mingw_header_FAudio_h+y} @@ -13343,18 +13345,16 @@ fi printf '%s\n' "$ac_cv_mingw_header_FAudio_h" >&6; } if test "x$ac_cv_mingw_header_FAudio_h" = xyes then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for FAudio_CommitOperationSet in MinGW -lFAudio" >&5 -printf %s "checking for FAudio_CommitOperationSet in MinGW -lFAudio... " >&6; } -if test ${ac_cv_mingw_lib_FAudio+y} + { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for FAudio_CommitOperationSet in PE library" >&5 +printf %s "checking for FAudio_CommitOperationSet in PE library... " >&6; } +if test ${ac_cv_mingw_func_FAudio_CommitOperationSet+y} then : printf %s "(cached) " >&6 else case e in #( e) ac_wine_check_headers_saved_cc=$CC ac_wine_check_headers_saved_exeext=$ac_exeext -ac_wine_check_headers_saved_libs=$LIBS eval CC=\$${wine_arch}_CC ac_exeext=".exe" -LIBS="-lFAudio $FAUDIO_PE_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13378,21 +13378,20 @@ return FAudio_CommitOperationSet (); _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_mingw_lib_FAudio=yes + ac_cv_mingw_func_FAudio_CommitOperationSet=yes else case e in #( - e) ac_cv_mingw_lib_FAudio=no ;; + e) ac_cv_mingw_func_FAudio_CommitOperationSet=no ;; esac 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 ;; +ac_exeext=$ac_wine_check_headers_saved_exeext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_FAudio" >&5 -printf '%s\n' "$ac_cv_mingw_lib_FAudio" >&6; } -if test "x$ac_cv_mingw_lib_FAudio" = xyes +{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_func_FAudio_CommitOperationSet" >&5 +printf '%s\n' "$ac_cv_mingw_func_FAudio_CommitOperationSet" >&6; } +if test "x$ac_cv_mingw_func_FAudio_CommitOperationSet" = xyes then : : else case e in #( @@ -13403,7 +13402,8 @@ else case e in #( e) FAUDIO_PE_CFLAGS=""; FAUDIO_PE_LIBS="" ;; esac fi -CPPFLAGS=$ac_save_CPPFLAGS +CPPFLAGS=$ac_save_pkg_CPPFLAGS +LIBS=$ac_save_pkg_LIBS fi if test "x$FAUDIO_PE_LIBS" = "x" @@ -13428,8 +13428,10 @@ fi FLUIDSYNTH_PE_LIBS=${FLUIDSYNTH_PE_LIBS:-"-lfluidsynth"} if test -n "$FLUIDSYNTH_PE_CFLAGS$FLUIDSYNTH_PE_LIBS" then : - ac_save_CPPFLAGS=$CPPFLAGS + ac_save_pkg_CPPFLAGS=$CPPFLAGS +ac_save_pkg_LIBS=$LIBS CPPFLAGS="$CPPFLAGS $FLUIDSYNTH_PE_CFLAGS" +LIBS="$FLUIDSYNTH_PE_LIBS $LIBS" { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for MinGW fluidsynth.h" >&5 printf %s "checking for MinGW fluidsynth.h... " >&6; } if test ${ac_cv_mingw_header_fluidsynth_h+y} @@ -13468,18 +13470,16 @@ fi printf '%s\n' "$ac_cv_mingw_header_fluidsynth_h" >&6; } if test "x$ac_cv_mingw_header_fluidsynth_h" = xyes then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for new_fluid_synth in MinGW -lfluidsynth" >&5 -printf %s "checking for new_fluid_synth in MinGW -lfluidsynth... " >&6; } -if test ${ac_cv_mingw_lib_fluidsynth+y} + { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for new_fluid_synth in PE library" >&5 +printf %s "checking for new_fluid_synth in PE library... " >&6; } +if test ${ac_cv_mingw_func_new_fluid_synth+y} then : printf %s "(cached) " >&6 else case e in #( e) ac_wine_check_headers_saved_cc=$CC ac_wine_check_headers_saved_exeext=$ac_exeext -ac_wine_check_headers_saved_libs=$LIBS eval CC=\$${wine_arch}_CC ac_exeext=".exe" -LIBS="-lfluidsynth $FLUIDSYNTH_PE_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13503,21 +13503,20 @@ return new_fluid_synth (); _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_mingw_lib_fluidsynth=yes + ac_cv_mingw_func_new_fluid_synth=yes else case e in #( - e) ac_cv_mingw_lib_fluidsynth=no ;; + e) ac_cv_mingw_func_new_fluid_synth=no ;; esac 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 ;; +ac_exeext=$ac_wine_check_headers_saved_exeext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_fluidsynth" >&5 -printf '%s\n' "$ac_cv_mingw_lib_fluidsynth" >&6; } -if test "x$ac_cv_mingw_lib_fluidsynth" = xyes +{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_func_new_fluid_synth" >&5 +printf '%s\n' "$ac_cv_mingw_func_new_fluid_synth" >&6; } +if test "x$ac_cv_mingw_func_new_fluid_synth" = xyes then : : else case e in #( @@ -13528,7 +13527,8 @@ else case e in #( e) FLUIDSYNTH_PE_CFLAGS=""; FLUIDSYNTH_PE_LIBS="" ;; esac fi -CPPFLAGS=$ac_save_CPPFLAGS +CPPFLAGS=$ac_save_pkg_CPPFLAGS +LIBS=$ac_save_pkg_LIBS fi if test "x$FLUIDSYNTH_PE_LIBS" = "x" @@ -13553,8 +13553,10 @@ fi if test -n "$JPEG_PE_CFLAGS$JPEG_PE_LIBS" then : - ac_save_CPPFLAGS=$CPPFLAGS + ac_save_pkg_CPPFLAGS=$CPPFLAGS +ac_save_pkg_LIBS=$LIBS CPPFLAGS="$CPPFLAGS $JPEG_PE_CFLAGS" +LIBS="$JPEG_PE_LIBS $LIBS" { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for MinGW jpeglib.h" >&5 printf %s "checking for MinGW jpeglib.h... " >&6; } if test ${ac_cv_mingw_header_jpeglib_h+y} @@ -13594,18 +13596,16 @@ fi printf '%s\n' "$ac_cv_mingw_header_jpeglib_h" >&6; } if test "x$ac_cv_mingw_header_jpeglib_h" = xyes then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for jpeg_start_decompress in MinGW -ljpeg" >&5 -printf %s "checking for jpeg_start_decompress in MinGW -ljpeg... " >&6; } -if test ${ac_cv_mingw_lib_jpeg+y} + { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for jpeg_start_decompress in PE library" >&5 +printf %s "checking for jpeg_start_decompress in PE library... " >&6; } +if test ${ac_cv_mingw_func_jpeg_start_decompress+y} then : printf %s "(cached) " >&6 else case e in #( e) ac_wine_check_headers_saved_cc=$CC ac_wine_check_headers_saved_exeext=$ac_exeext -ac_wine_check_headers_saved_libs=$LIBS eval CC=\$${wine_arch}_CC ac_exeext=".exe" -LIBS="-ljpeg $JPEG_PE_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13629,21 +13629,20 @@ return jpeg_start_decompress (); _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_mingw_lib_jpeg=yes + ac_cv_mingw_func_jpeg_start_decompress=yes else case e in #( - e) ac_cv_mingw_lib_jpeg=no ;; + e) ac_cv_mingw_func_jpeg_start_decompress=no ;; esac 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 ;; +ac_exeext=$ac_wine_check_headers_saved_exeext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_jpeg" >&5 -printf '%s\n' "$ac_cv_mingw_lib_jpeg" >&6; } -if test "x$ac_cv_mingw_lib_jpeg" = xyes +{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_func_jpeg_start_decompress" >&5 +printf '%s\n' "$ac_cv_mingw_func_jpeg_start_decompress" >&6; } +if test "x$ac_cv_mingw_func_jpeg_start_decompress" = xyes then : : else case e in #( @@ -13654,7 +13653,8 @@ else case e in #( e) JPEG_PE_CFLAGS=""; JPEG_PE_LIBS="" ;; esac fi -CPPFLAGS=$ac_save_CPPFLAGS +CPPFLAGS=$ac_save_pkg_CPPFLAGS +LIBS=$ac_save_pkg_LIBS fi if test "x$JPEG_PE_LIBS" = "x" @@ -13679,8 +13679,10 @@ fi LCMS2_PE_LIBS=${LCMS2_PE_LIBS:-"-llcms2"} if test -n "$LCMS2_PE_CFLAGS$LCMS2_PE_LIBS" then : - ac_save_CPPFLAGS=$CPPFLAGS + ac_save_pkg_CPPFLAGS=$CPPFLAGS +ac_save_pkg_LIBS=$LIBS CPPFLAGS="$CPPFLAGS $LCMS2_PE_CFLAGS" +LIBS="$LCMS2_PE_LIBS $LIBS" { 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} @@ -13719,18 +13721,16 @@ fi 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} + { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for cmsOpenProfileFromFile in PE library" >&5 +printf %s "checking for cmsOpenProfileFromFile in PE library... " >&6; } +if test ${ac_cv_mingw_func_cmsOpenProfileFromFile+y} then : printf %s "(cached) " >&6 else case e in #( e) ac_wine_check_headers_saved_cc=$CC ac_wine_check_headers_saved_exeext=$ac_exeext -ac_wine_check_headers_saved_libs=$LIBS eval CC=\$${wine_arch}_CC ac_exeext=".exe" -LIBS="-llcms2 $LCMS2_PE_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13754,21 +13754,20 @@ return cmsOpenProfileFromFile (); _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_mingw_lib_lcms2=yes + ac_cv_mingw_func_cmsOpenProfileFromFile=yes else case e in #( - e) ac_cv_mingw_lib_lcms2=no ;; + e) ac_cv_mingw_func_cmsOpenProfileFromFile=no ;; esac 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 ;; +ac_exeext=$ac_wine_check_headers_saved_exeext ;; esac 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 +{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_func_cmsOpenProfileFromFile" >&5 +printf '%s\n' "$ac_cv_mingw_func_cmsOpenProfileFromFile" >&6; } +if test "x$ac_cv_mingw_func_cmsOpenProfileFromFile" = xyes then : : else case e in #( @@ -13779,7 +13778,8 @@ else case e in #( e) LCMS2_PE_CFLAGS=""; LCMS2_PE_LIBS="" ;; esac fi -CPPFLAGS=$ac_save_CPPFLAGS +CPPFLAGS=$ac_save_pkg_CPPFLAGS +LIBS=$ac_save_pkg_LIBS fi if test "x$LCMS2_PE_LIBS" = "x" @@ -13804,8 +13804,10 @@ fi MPG123_PE_LIBS=${MPG123_PE_LIBS:-"-lmpg123"} if test -n "$MPG123_PE_CFLAGS$MPG123_PE_LIBS" then : - ac_save_CPPFLAGS=$CPPFLAGS + ac_save_pkg_CPPFLAGS=$CPPFLAGS +ac_save_pkg_LIBS=$LIBS CPPFLAGS="$CPPFLAGS $MPG123_PE_CFLAGS" +LIBS="$MPG123_PE_LIBS $LIBS" { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for MinGW mpg123.h" >&5 printf %s "checking for MinGW mpg123.h... " >&6; } if test ${ac_cv_mingw_header_mpg123_h+y} @@ -13844,18 +13846,16 @@ fi printf '%s\n' "$ac_cv_mingw_header_mpg123_h" >&6; } if test "x$ac_cv_mingw_header_mpg123_h" = xyes then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for mpg123_feed in MinGW -lmpg123" >&5 -printf %s "checking for mpg123_feed in MinGW -lmpg123... " >&6; } -if test ${ac_cv_mingw_lib_mpg123+y} + { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for mpg123_feed in PE library" >&5 +printf %s "checking for mpg123_feed in PE library... " >&6; } +if test ${ac_cv_mingw_func_mpg123_feed+y} then : printf %s "(cached) " >&6 else case e in #( e) ac_wine_check_headers_saved_cc=$CC ac_wine_check_headers_saved_exeext=$ac_exeext -ac_wine_check_headers_saved_libs=$LIBS eval CC=\$${wine_arch}_CC ac_exeext=".exe" -LIBS="-lmpg123 $MPG123_PE_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13879,21 +13879,20 @@ return mpg123_feed (); _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_mingw_lib_mpg123=yes + ac_cv_mingw_func_mpg123_feed=yes else case e in #( - e) ac_cv_mingw_lib_mpg123=no ;; + e) ac_cv_mingw_func_mpg123_feed=no ;; esac 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 ;; +ac_exeext=$ac_wine_check_headers_saved_exeext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_mpg123" >&5 -printf '%s\n' "$ac_cv_mingw_lib_mpg123" >&6; } -if test "x$ac_cv_mingw_lib_mpg123" = xyes +{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_func_mpg123_feed" >&5 +printf '%s\n' "$ac_cv_mingw_func_mpg123_feed" >&6; } +if test "x$ac_cv_mingw_func_mpg123_feed" = xyes then : : else case e in #( @@ -13904,7 +13903,8 @@ else case e in #( e) MPG123_PE_CFLAGS=""; MPG123_PE_LIBS="" ;; esac fi -CPPFLAGS=$ac_save_CPPFLAGS +CPPFLAGS=$ac_save_pkg_CPPFLAGS +LIBS=$ac_save_pkg_LIBS fi if test "x$MPG123_PE_LIBS" = "x" @@ -13929,8 +13929,10 @@ fi if test -n "$PNG_PE_CFLAGS$PNG_PE_LIBS" then : - ac_save_CPPFLAGS=$CPPFLAGS + ac_save_pkg_CPPFLAGS=$CPPFLAGS +ac_save_pkg_LIBS=$LIBS CPPFLAGS="$CPPFLAGS $PNG_PE_CFLAGS" +LIBS="$PNG_PE_LIBS $LIBS" { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for MinGW png.h" >&5 printf %s "checking for MinGW png.h... " >&6; } if test ${ac_cv_mingw_header_png_h+y} @@ -13969,18 +13971,16 @@ fi printf '%s\n' "$ac_cv_mingw_header_png_h" >&6; } if test "x$ac_cv_mingw_header_png_h" = xyes then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for png_create_read_struct in MinGW -lpng" >&5 -printf %s "checking for png_create_read_struct in MinGW -lpng... " >&6; } -if test ${ac_cv_mingw_lib_png+y} + { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for png_create_read_struct in PE library" >&5 +printf %s "checking for png_create_read_struct in PE library... " >&6; } +if test ${ac_cv_mingw_func_png_create_read_struct+y} then : printf %s "(cached) " >&6 else case e in #( e) ac_wine_check_headers_saved_cc=$CC ac_wine_check_headers_saved_exeext=$ac_exeext -ac_wine_check_headers_saved_libs=$LIBS eval CC=\$${wine_arch}_CC ac_exeext=".exe" -LIBS="-lpng $PNG_PE_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -14004,21 +14004,20 @@ return png_create_read_struct (); _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_mingw_lib_png=yes + ac_cv_mingw_func_png_create_read_struct=yes else case e in #( - e) ac_cv_mingw_lib_png=no ;; + e) ac_cv_mingw_func_png_create_read_struct=no ;; esac 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 ;; +ac_exeext=$ac_wine_check_headers_saved_exeext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_png" >&5 -printf '%s\n' "$ac_cv_mingw_lib_png" >&6; } -if test "x$ac_cv_mingw_lib_png" = xyes +{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_func_png_create_read_struct" >&5 +printf '%s\n' "$ac_cv_mingw_func_png_create_read_struct" >&6; } +if test "x$ac_cv_mingw_func_png_create_read_struct" = xyes then : : else case e in #( @@ -14029,7 +14028,8 @@ else case e in #( e) PNG_PE_CFLAGS=""; PNG_PE_LIBS="" ;; esac fi -CPPFLAGS=$ac_save_CPPFLAGS +CPPFLAGS=$ac_save_pkg_CPPFLAGS +LIBS=$ac_save_pkg_LIBS fi if test "x$PNG_PE_LIBS" = "x" @@ -14054,8 +14054,10 @@ fi if test -n "$TIFF_PE_CFLAGS$TIFF_PE_LIBS" then : - ac_save_CPPFLAGS=$CPPFLAGS + ac_save_pkg_CPPFLAGS=$CPPFLAGS +ac_save_pkg_LIBS=$LIBS CPPFLAGS="$CPPFLAGS $TIFF_PE_CFLAGS" +LIBS="$TIFF_PE_LIBS $LIBS" { 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} @@ -14094,18 +14096,16 @@ fi 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} + { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for TIFFClientOpen in PE library" >&5 +printf %s "checking for TIFFClientOpen in PE library... " >&6; } +if test ${ac_cv_mingw_func_TIFFClientOpen+y} then : printf %s "(cached) " >&6 else case e in #( e) ac_wine_check_headers_saved_cc=$CC ac_wine_check_headers_saved_exeext=$ac_exeext -ac_wine_check_headers_saved_libs=$LIBS eval CC=\$${wine_arch}_CC ac_exeext=".exe" -LIBS="-ltiff $TIFF_PE_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -14129,21 +14129,20 @@ return TIFFClientOpen (); _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_mingw_lib_tiff=yes + ac_cv_mingw_func_TIFFClientOpen=yes else case e in #( - e) ac_cv_mingw_lib_tiff=no ;; + e) ac_cv_mingw_func_TIFFClientOpen=no ;; esac 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 ;; +ac_exeext=$ac_wine_check_headers_saved_exeext ;; esac 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 +{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_func_TIFFClientOpen" >&5 +printf '%s\n' "$ac_cv_mingw_func_TIFFClientOpen" >&6; } +if test "x$ac_cv_mingw_func_TIFFClientOpen" = xyes then : : else case e in #( @@ -14154,7 +14153,8 @@ else case e in #( e) TIFF_PE_CFLAGS=""; TIFF_PE_LIBS="" ;; esac fi -CPPFLAGS=$ac_save_CPPFLAGS +CPPFLAGS=$ac_save_pkg_CPPFLAGS +LIBS=$ac_save_pkg_LIBS fi if test "x$TIFF_PE_LIBS" = "x" @@ -14179,8 +14179,10 @@ fi VKD3D_PE_LIBS=${VKD3D_PE_LIBS:-"-lvkd3d-utils -lvkd3d -lvkd3d-shader"} if test -n "$VKD3D_PE_CFLAGS$VKD3D_PE_LIBS" then : - ac_save_CPPFLAGS=$CPPFLAGS + ac_save_pkg_CPPFLAGS=$CPPFLAGS +ac_save_pkg_LIBS=$LIBS CPPFLAGS="$CPPFLAGS $VKD3D_PE_CFLAGS" +LIBS="$VKD3D_PE_LIBS $LIBS" { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for MinGW vkd3d_utils.h" >&5 printf %s "checking for MinGW vkd3d_utils.h... " >&6; } if test ${ac_cv_mingw_header_vkd3d_utils_h+y} @@ -14263,18 +14265,16 @@ then : fi if test "$ac_cv_mingw_header_vkd3d_utils_h" = "yes" -a "$ac_cv_mingw_header_vkd3d_shader_h" = "yes" then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for vkd3d_utils_set_log_callback in MinGW -lvkd3d-utils" >&5 -printf %s "checking for vkd3d_utils_set_log_callback in MinGW -lvkd3d-utils... " >&6; } -if test ${ac_cv_mingw_lib_vkd3d_utils+y} + { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for vkd3d_utils_set_log_callback in PE library" >&5 +printf %s "checking for vkd3d_utils_set_log_callback in PE library... " >&6; } +if test ${ac_cv_mingw_func_vkd3d_utils_set_log_callback+y} then : printf %s "(cached) " >&6 else case e in #( e) ac_wine_check_headers_saved_cc=$CC ac_wine_check_headers_saved_exeext=$ac_exeext -ac_wine_check_headers_saved_libs=$LIBS eval CC=\$${wine_arch}_CC ac_exeext=".exe" -LIBS="-lvkd3d-utils $VKD3D_PE_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -14298,39 +14298,36 @@ return vkd3d_utils_set_log_callback (); _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_mingw_lib_vkd3d_utils=yes + ac_cv_mingw_func_vkd3d_utils_set_log_callback=yes else case e in #( - e) ac_cv_mingw_lib_vkd3d_utils=no ;; + e) ac_cv_mingw_func_vkd3d_utils_set_log_callback=no ;; esac 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 ;; +ac_exeext=$ac_wine_check_headers_saved_exeext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_vkd3d_utils" >&5 -printf '%s\n' "$ac_cv_mingw_lib_vkd3d_utils" >&6; } -if test "x$ac_cv_mingw_lib_vkd3d_utils" = xyes +{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_func_vkd3d_utils_set_log_callback" >&5 +printf '%s\n' "$ac_cv_mingw_func_vkd3d_utils_set_log_callback" >&6; } +if test "x$ac_cv_mingw_func_vkd3d_utils_set_log_callback" = xyes then : : else case e in #( e) : ;; esac fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for vkd3d_shader_build_varying_map in MinGW -lvkd3d-shader" >&5 -printf %s "checking for vkd3d_shader_build_varying_map in MinGW -lvkd3d-shader... " >&6; } -if test ${ac_cv_mingw_lib_vkd3d_shader+y} + { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for vkd3d_shader_build_varying_map in PE library" >&5 +printf %s "checking for vkd3d_shader_build_varying_map in PE library... " >&6; } +if test ${ac_cv_mingw_func_vkd3d_shader_build_varying_map+y} then : printf %s "(cached) " >&6 else case e in #( e) ac_wine_check_headers_saved_cc=$CC ac_wine_check_headers_saved_exeext=$ac_exeext -ac_wine_check_headers_saved_libs=$LIBS eval CC=\$${wine_arch}_CC ac_exeext=".exe" -LIBS="-lvkd3d-shader $VKD3D_PE_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -14354,28 +14351,27 @@ return vkd3d_shader_build_varying_map (); _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_mingw_lib_vkd3d_shader=yes + ac_cv_mingw_func_vkd3d_shader_build_varying_map=yes else case e in #( - e) ac_cv_mingw_lib_vkd3d_shader=no ;; + e) ac_cv_mingw_func_vkd3d_shader_build_varying_map=no ;; esac 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 ;; +ac_exeext=$ac_wine_check_headers_saved_exeext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_vkd3d_shader" >&5 -printf '%s\n' "$ac_cv_mingw_lib_vkd3d_shader" >&6; } -if test "x$ac_cv_mingw_lib_vkd3d_shader" = xyes +{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_func_vkd3d_shader_build_varying_map" >&5 +printf '%s\n' "$ac_cv_mingw_func_vkd3d_shader_build_varying_map" >&6; } +if test "x$ac_cv_mingw_func_vkd3d_shader_build_varying_map" = xyes then : : else case e in #( e) : ;; esac fi - if test "$ac_cv_mingw_lib_vkd3d_utils" = "no" -o "$ac_cv_mingw_lib_vkd3d_shader" = "no" + if test "$ac_cv_mingw_func_vkd3d_utils_set_log_callback" = "no" -o "$ac_cv_mingw_func_vkd3d_shader_build_varying_map" = "no" then VKD3D_PE_CFLAGS="" VKD3D_PE_LIBS="" @@ -14384,7 +14380,8 @@ fi VKD3D_PE_CFLAGS="" VKD3D_PE_LIBS="" fi -CPPFLAGS=$ac_save_CPPFLAGS +CPPFLAGS=$ac_save_pkg_CPPFLAGS +LIBS=$ac_save_pkg_LIBS fi if test "x$VKD3D_PE_LIBS" = "x" diff --git a/configure.ac b/configure.ac index 41d053295fc..d2e2a133c1a 100644 --- a/configure.ac +++ b/configure.ac @@ -1138,7 +1138,7 @@ if test "x$with_system_dllpath" != "x" -a -n "$PE_ARCHS" then WINE_MINGW_PACKAGE_FLAGS(FAUDIO,[FAudio],[-lFAudio], [WINE_CHECK_MINGW_HEADER(FAudio.h, - [WINE_CHECK_MINGW_LIB(FAudio,FAudio_CommitOperationSet,[:],[FAUDIO_PE_CFLAGS=""; FAUDIO_PE_LIBS=""],[$FAUDIO_PE_LIBS])], + [WINE_CHECK_MINGW_FUNC(FAudio_CommitOperationSet,[:],[FAUDIO_PE_CFLAGS=""; FAUDIO_PE_LIBS=""])], [FAUDIO_PE_CFLAGS=""; FAUDIO_PE_LIBS=""])]) if test "x$FAUDIO_PE_LIBS" = "x" then @@ -1147,7 +1147,7 @@ then WINE_MINGW_PACKAGE_FLAGS(FLUIDSYNTH,[fluidsynth],[-lfluidsynth], [WINE_CHECK_MINGW_HEADER(fluidsynth.h, - [WINE_CHECK_MINGW_LIB(fluidsynth,new_fluid_synth,[:],[FLUIDSYNTH_PE_CFLAGS=""; FLUIDSYNTH_PE_LIBS=""],[$FLUIDSYNTH_PE_LIBS])], + [WINE_CHECK_MINGW_FUNC(new_fluid_synth,[:],[FLUIDSYNTH_PE_CFLAGS=""; FLUIDSYNTH_PE_LIBS=""])], [FLUIDSYNTH_PE_CFLAGS=""; FLUIDSYNTH_PE_LIBS=""])]) if test "x$FLUIDSYNTH_PE_LIBS" = "x" then @@ -1156,7 +1156,7 @@ then WINE_MINGW_PACKAGE_FLAGS(JPEG,[libjpeg],, [WINE_CHECK_MINGW_HEADER(jpeglib.h, - [WINE_CHECK_MINGW_LIB(jpeg,jpeg_start_decompress,[:],[JPEG_PE_CFLAGS=""; JPEG_PE_LIBS=""],[$JPEG_PE_LIBS])], + [WINE_CHECK_MINGW_FUNC(jpeg_start_decompress,[:],[JPEG_PE_CFLAGS=""; JPEG_PE_LIBS=""])], [JPEG_PE_CFLAGS=""; JPEG_PE_LIBS=""], [#include <stddef.h> #include <stdio.h>])]) @@ -1167,7 +1167,7 @@ then 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])], + [WINE_CHECK_MINGW_FUNC(cmsOpenProfileFromFile,[:],[LCMS2_PE_CFLAGS=""; LCMS2_PE_LIBS=""])], [LCMS2_PE_CFLAGS=""; LCMS2_PE_LIBS=""])]) if test "x$LCMS2_PE_LIBS" = "x" then @@ -1176,7 +1176,7 @@ then WINE_MINGW_PACKAGE_FLAGS(MPG123,[libmpg123],[-lmpg123], [WINE_CHECK_MINGW_HEADER(mpg123.h, - [WINE_CHECK_MINGW_LIB(mpg123,mpg123_feed,[:],[MPG123_PE_CFLAGS=""; MPG123_PE_LIBS=""],[$MPG123_PE_LIBS])], + [WINE_CHECK_MINGW_FUNC(mpg123_feed,[:],[MPG123_PE_CFLAGS=""; MPG123_PE_LIBS=""])], [MPG123_PE_CFLAGS=""; MPG123_PE_LIBS=""])]) if test "x$MPG123_PE_LIBS" = "x" then @@ -1185,7 +1185,7 @@ then WINE_MINGW_PACKAGE_FLAGS(PNG,[libpng],, [WINE_CHECK_MINGW_HEADER(png.h, - [WINE_CHECK_MINGW_LIB(png,png_create_read_struct,[:],[PNG_PE_CFLAGS=""; PNG_PE_LIBS=""],[$PNG_PE_LIBS])], + [WINE_CHECK_MINGW_FUNC(png_create_read_struct,[:],[PNG_PE_CFLAGS=""; PNG_PE_LIBS=""])], [PNG_PE_CFLAGS=""; PNG_PE_LIBS=""])]) if test "x$PNG_PE_LIBS" = "x" then @@ -1194,7 +1194,7 @@ then 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])], + [WINE_CHECK_MINGW_FUNC(TIFFClientOpen,[:],[TIFF_PE_CFLAGS=""; TIFF_PE_LIBS=""])], [TIFF_PE_CFLAGS=""; TIFF_PE_LIBS=""])]) if test "x$TIFF_PE_LIBS" = "x" then @@ -1206,9 +1206,9 @@ then WINE_CHECK_MINGW_HEADER(vkd3d_shader.h) if test "$ac_cv_mingw_header_vkd3d_utils_h" = "yes" -a "$ac_cv_mingw_header_vkd3d_shader_h" = "yes" then - WINE_CHECK_MINGW_LIB(vkd3d-utils,vkd3d_utils_set_log_callback,[:],[:],[$VKD3D_PE_LIBS]) - WINE_CHECK_MINGW_LIB(vkd3d-shader,vkd3d_shader_build_varying_map,[:],[:],[$VKD3D_PE_LIBS]) - if test "$ac_cv_mingw_lib_vkd3d_utils" = "no" -o "$ac_cv_mingw_lib_vkd3d_shader" = "no" + WINE_CHECK_MINGW_FUNC(vkd3d_utils_set_log_callback,[:],[:]) + WINE_CHECK_MINGW_FUNC(vkd3d_shader_build_varying_map,[:],[:]) + if test "$ac_cv_mingw_func_vkd3d_utils_set_log_callback" = "no" -o "$ac_cv_mingw_func_vkd3d_shader_build_varying_map" = "no" then VKD3D_PE_CFLAGS="" VKD3D_PE_LIBS="" -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11201