From 9d56ca72feb721034b79ca3a2fae4eceead88234 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 3 Mar 2022 10:51:02 +0100 Subject: [PATCH] configure: Remove some no longer needed checks. Signed-off-by: Alexandre Julliard --- configure | 310 -------------------------------------------- configure.ac | 40 ------ include/config.h.in | 18 --- 3 files changed, 368 deletions(-) diff --git a/configure b/configure index 813deeb85e2..20bcb96a2a6 100755 --- a/configure +++ b/configure @@ -656,10 +656,6 @@ LDAP_LIBS LDAP_CFLAGS RT_LIBS MSVCRTFLAGS -VKD3D_SHADER_LIBS -VKD3D_SHADER_CFLAGS -VKD3D_LIBS -VKD3D_CFLAGS NETAPI_LIBS NETAPI_CFLAGS PROCSTAT_LIBS @@ -916,7 +912,6 @@ with_udev with_unwind with_usb with_v4l2 -with_vkd3d with_vulkan with_xcomposite with_xcursor @@ -1738,10 +1733,6 @@ GSSAPI_CFLAGS GSSAPI_LIBS NETAPI_CFLAGS NETAPI_LIBS -VKD3D_CFLAGS -VKD3D_LIBS -VKD3D_SHADER_CFLAGS -VKD3D_SHADER_LIBS LDAP_CFLAGS LDAP_LIBS' @@ -2418,7 +2409,6 @@ Optional Packages: handling) --without-usb do not use the libusb library --without-v4l2 do not use v4l2 (video capture) - --without-vkd3d do not use vkd3d (Direct3D 12 support) --without-vulkan do not use Vulkan --without-xcomposite do not use the Xcomposite extension --without-xcursor do not use the Xcursor extension @@ -2559,13 +2549,6 @@ Some influential environment variables: NETAPI_CFLAGS C compiler flags for netapi, overriding pkg-config NETAPI_LIBS Linker flags for netapi, overriding pkg-config - VKD3D_CFLAGS - C compiler flags for libvkd3d, overriding pkg-config - VKD3D_LIBS Linker flags for libvkd3d, overriding pkg-config - VKD3D_SHADER_CFLAGS - C compiler flags for libvkd3d-shader, overriding pkg-config - VKD3D_SHADER_LIBS - Linker flags for libvkd3d-shader, overriding pkg-config LDAP_CFLAGS C compiler flags for openldap, overriding pkg-config LDAP_LIBS Linker flags for openldap, overriding pkg-config @@ -4375,13 +4358,6 @@ then : fi -# Check whether --with-vkd3d was given. -if test ${with_vkd3d+y} -then : - withval=$with_vkd3d; -fi - - # Check whether --with-vulkan was given. if test ${with_vulkan+y} then : @@ -7956,12 +7932,6 @@ if test "x$ac_cv_header_gettext_po_h" = xyes then : printf "%s\n" "#define HAVE_GETTEXT_PO_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "ieeefp.h" "ac_cv_header_ieeefp_h" "$ac_includes_default" -if test "x$ac_cv_header_ieeefp_h" = xyes -then : - printf "%s\n" "#define HAVE_IEEEFP_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "libproc.h" "ac_cv_header_libproc_h" "$ac_includes_default" if test "x$ac_cv_header_libproc_h" = xyes @@ -18161,175 +18131,6 @@ esac fi -if test "x$with_vkd3d" != "xno" -then - if ${VKD3D_CFLAGS:+false} : -then : - if test ${PKG_CONFIG+y} -then : - VKD3D_CFLAGS=`$PKG_CONFIG --cflags libvkd3d 2>/dev/null` -fi -fi - -if ${VKD3D_LIBS:+false} : -then : - if test ${PKG_CONFIG+y} -then : - VKD3D_LIBS=`$PKG_CONFIG --libs libvkd3d 2>/dev/null` -fi -fi - - -printf "%s\n" "$as_me:${as_lineno-$LINENO}: libvkd3d cflags: $VKD3D_CFLAGS" >&5 -printf "%s\n" "$as_me:${as_lineno-$LINENO}: libvkd3d libs: $VKD3D_LIBS" >&5 -ac_save_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS $VKD3D_CFLAGS" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -lvkd3d" >&5 -printf %s "checking for -lvkd3d... " >&6; } -if test ${ac_cv_lib_soname_vkd3d+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_check_soname_save_LIBS=$LIBS -LIBS="-lvkd3d $VKD3D_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 vkd3d_serialize_versioned_root_signature (); -int -main (void) -{ -return vkd3d_serialize_versioned_root_signature (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - case "$LIBEXT" in - dll) ac_cv_lib_soname_vkd3d=`$ac_cv_path_LDD conftest.exe | grep "vkd3d" | sed -e "s/dll.*/dll/"';2,$d'` ;; - dylib) ac_cv_lib_soname_vkd3d=`$OTOOL -L conftest$ac_exeext | grep "libvkd3d\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libvkd3d\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_vkd3d=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libvkd3d\\.$LIBEXT" | sed -e "s/^.*\\[\\(libvkd3d\\.$LIBEXT[^ ]*\\)\\].*$/\1/"';2,$d'` - if ${ac_cv_lib_soname_vkd3d:+false} : -then : - ac_cv_lib_soname_vkd3d=`$LDD conftest$ac_exeext | grep "libvkd3d\\.$LIBEXT" | sed -e "s/^.*\(libvkd3d\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'` -fi ;; - esac -else $as_nop - ac_cv_lib_soname_vkd3d= -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_soname_save_LIBS -fi -if ${ac_cv_lib_soname_vkd3d:+false} : -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -printf "%s\n" "not found" >&6; } - -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_vkd3d" >&5 -printf "%s\n" "$ac_cv_lib_soname_vkd3d" >&6; } - -printf "%s\n" "#define SONAME_LIBVKD3D \"$ac_cv_lib_soname_vkd3d\"" >>confdefs.h - - -fi -CPPFLAGS=$ac_save_CPPFLAGS - - if ${VKD3D_SHADER_CFLAGS:+false} : -then : - if test ${PKG_CONFIG+y} -then : - VKD3D_SHADER_CFLAGS=`$PKG_CONFIG --cflags libvkd3d-shader 2>/dev/null` -fi -fi - -if ${VKD3D_SHADER_LIBS:+false} : -then : - if test ${PKG_CONFIG+y} -then : - VKD3D_SHADER_LIBS=`$PKG_CONFIG --libs libvkd3d-shader 2>/dev/null` -fi -fi - - -printf "%s\n" "$as_me:${as_lineno-$LINENO}: libvkd3d-shader cflags: $VKD3D_SHADER_CFLAGS" >&5 -printf "%s\n" "$as_me:${as_lineno-$LINENO}: libvkd3d-shader libs: $VKD3D_SHADER_LIBS" >&5 -ac_save_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS $VKD3D_SHADER_CFLAGS" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -lvkd3d-shader" >&5 -printf %s "checking for -lvkd3d-shader... " >&6; } -if test ${ac_cv_lib_soname_vkd3d_shader+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_check_soname_save_LIBS=$LIBS -LIBS="-lvkd3d-shader $VKD3D_SHADER_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 vkd3d_shader_compile (); -int -main (void) -{ -return vkd3d_shader_compile (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - case "$LIBEXT" in - dll) ac_cv_lib_soname_vkd3d_shader=`$ac_cv_path_LDD conftest.exe | grep "vkd3d-shader" | sed -e "s/dll.*/dll/"';2,$d'` ;; - dylib) ac_cv_lib_soname_vkd3d_shader=`$OTOOL -L conftest$ac_exeext | grep "libvkd3d-shader\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libvkd3d-shader\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_vkd3d_shader=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libvkd3d-shader\\.$LIBEXT" | sed -e "s/^.*\\[\\(libvkd3d-shader\\.$LIBEXT[^ ]*\\)\\].*$/\1/"';2,$d'` - if ${ac_cv_lib_soname_vkd3d_shader:+false} : -then : - ac_cv_lib_soname_vkd3d_shader=`$LDD conftest$ac_exeext | grep "libvkd3d-shader\\.$LIBEXT" | sed -e "s/^.*\(libvkd3d-shader\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'` -fi ;; - esac -else $as_nop - ac_cv_lib_soname_vkd3d_shader= -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_soname_save_LIBS -fi -if ${ac_cv_lib_soname_vkd3d_shader:+false} : -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -printf "%s\n" "not found" >&6; } - -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_vkd3d_shader" >&5 -printf "%s\n" "$ac_cv_lib_soname_vkd3d_shader" >&6; } - -printf "%s\n" "#define SONAME_LIBVKD3D_SHADER \"$ac_cv_lib_soname_vkd3d_shader\"" >>confdefs.h - - -fi -CPPFLAGS=$ac_save_CPPFLAGS - -fi -if test "x$ac_cv_lib_soname_vkd3d" = "x" -then : - case "x$with_vkd3d" in - x) as_fn_append wine_notices "|vkd3d ${notice_platform}development files not found (or too old), Direct3D 12 won't be supported." ;; - xno) ;; - *) as_fn_error $? "vkd3d ${notice_platform}development files not found (or too old), Direct3D 12 won't be supported. -This is an error since --with-vkd3d was requested." "$LINENO" 5 ;; -esac - -fi -test "x$ac_cv_lib_soname_vkd3d" != "x" || enable_d3d12=${enable_d3d12:-no} - if test "x${GCC}" = "xyes" then @@ -20672,113 +20473,6 @@ printf "%s\n" "#define HAVE_STRUCT_SYSINFO_MEM_UNIT 1" >>confdefs.h fi -ac_save_LIBS="$LIBS" -LIBS="$LIBS -lm" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isfinite" >&5 -printf %s "checking for isfinite... " >&6; } -if test ${ac_cv_have_isfinite+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main (void) -{ -float f = 0.0; return isfinite(f) - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_have_isfinite="yes" -else $as_nop - ac_cv_have_isfinite="no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_isfinite" >&5 -printf "%s\n" "$ac_cv_have_isfinite" >&6; } -if test "$ac_cv_have_isfinite" = "yes" -then - -printf "%s\n" "#define HAVE_ISFINITE 1" >>confdefs.h - -fi - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isinf" >&5 -printf %s "checking for isinf... " >&6; } -if test ${ac_cv_have_isinf+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main (void) -{ -float f = 0.0; return isinf(f) - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_have_isinf="yes" -else $as_nop - ac_cv_have_isinf="no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_isinf" >&5 -printf "%s\n" "$ac_cv_have_isinf" >&6; } -if test "$ac_cv_have_isinf" = "yes" -then - -printf "%s\n" "#define HAVE_ISINF 1" >>confdefs.h - -fi - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isnan" >&5 -printf %s "checking for isnan... " >&6; } -if test ${ac_cv_have_isnan+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main (void) -{ -float f = 0.0; return isnan(f) - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_have_isnan="yes" -else $as_nop - ac_cv_have_isnan="no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_isnan" >&5 -printf "%s\n" "$ac_cv_have_isnan" >&6; } -if test "$ac_cv_have_isnan" = "yes" -then - -printf "%s\n" "#define HAVE_ISNAN 1" >>confdefs.h - -fi - LIBS="$ac_save_LIBS" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcount" >&5 @@ -23237,10 +22931,6 @@ GSSAPI_LIBS = $GSSAPI_LIBS PROCSTAT_LIBS = $PROCSTAT_LIBS NETAPI_CFLAGS = $NETAPI_CFLAGS NETAPI_LIBS = $NETAPI_LIBS -VKD3D_CFLAGS = $VKD3D_CFLAGS -VKD3D_LIBS = $VKD3D_LIBS -VKD3D_SHADER_CFLAGS = $VKD3D_SHADER_CFLAGS -VKD3D_SHADER_LIBS = $VKD3D_SHADER_LIBS MSVCRTFLAGS = $MSVCRTFLAGS RT_LIBS = $RT_LIBS LDAP_CFLAGS = $LDAP_CFLAGS diff --git a/configure.ac b/configure.ac index 5baf410b8b1..a1f7a7d5e2c 100644 --- a/configure.ac +++ b/configure.ac @@ -63,7 +63,6 @@ AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug an AC_ARG_WITH(unwind, AS_HELP_STRING([--without-unwind],[do not use the libunwind library (exception handling)])) AC_ARG_WITH(usb, AS_HELP_STRING([--without-usb],[do not use the libusb library])) AC_ARG_WITH(v4l2, AS_HELP_STRING([--without-v4l2],[do not use v4l2 (video capture)])) -AC_ARG_WITH(vkd3d, AS_HELP_STRING([--without-vkd3d],[do not use vkd3d (Direct3D 12 support)])) AC_ARG_WITH(vulkan, AS_HELP_STRING([--without-vulkan],[do not use Vulkan])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi]) @@ -431,7 +430,6 @@ AC_CHECK_HEADERS(\ elf.h \ float.h \ gettext-po.h \ - ieeefp.h \ libproc.h \ link.h \ linux/cdrom.h \ @@ -1772,18 +1770,6 @@ fi WINE_NOTICE_WITH(vulkan,[test "x$ac_cv_lib_soname_vulkan" = "x" -a "x$ac_cv_lib_soname_MoltenVK" = "x"], [libvulkan and libMoltenVK ${notice_platform}development files not found, Vulkan won't be supported.]) -dnl **** Check for vkd3d **** -if test "x$with_vkd3d" != "xno" -then - WINE_PACKAGE_FLAGS(VKD3D,[libvkd3d],,,, - [WINE_CHECK_SONAME(vkd3d,vkd3d_serialize_versioned_root_signature,,,[$VKD3D_LIBS])]) - WINE_PACKAGE_FLAGS(VKD3D_SHADER,[libvkd3d-shader],,,, - [WINE_CHECK_SONAME(vkd3d-shader,vkd3d_shader_compile,,,[$VKD3D_SHADER_LIBS])]) -fi -WINE_NOTICE_WITH(vkd3d,[test "x$ac_cv_lib_soname_vkd3d" = "x"], - [vkd3d ${notice_platform}development files not found (or too old), Direct3D 12 won't be supported.]) -test "x$ac_cv_lib_soname_vkd3d" != "x" || enable_d3d12=${enable_d3d12:-no} - dnl **** Check for gcc specific options **** if test "x${GCC}" = "xyes" @@ -2245,32 +2231,6 @@ AC_CHECK_MEMBERS([struct sysinfo.totalram, struct sysinfo.mem_unit],,, # include #endif]) -dnl Check for isfinite -ac_save_LIBS="$LIBS" -LIBS="$LIBS -lm" -AC_CACHE_CHECK([for isfinite], ac_cv_have_isfinite, - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[float f = 0.0; return isfinite(f)]])],[ac_cv_have_isfinite="yes"],[ac_cv_have_isfinite="no"])) -if test "$ac_cv_have_isfinite" = "yes" -then - AC_DEFINE(HAVE_ISFINITE, 1, [Define to 1 if you have the `isfinite' function.]) -fi - -dnl Check for isinf -AC_CACHE_CHECK([for isinf], ac_cv_have_isinf, - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[float f = 0.0; return isinf(f)]])],[ac_cv_have_isinf="yes"],[ac_cv_have_isinf="no"])) -if test "$ac_cv_have_isinf" = "yes" -then - AC_DEFINE(HAVE_ISINF, 1, [Define to 1 if you have the `isinf' function.]) -fi - -dnl Check for isnan -AC_CACHE_CHECK([for isnan], ac_cv_have_isnan, - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[float f = 0.0; return isnan(f)]])],[ac_cv_have_isnan="yes"],[ac_cv_have_isnan="no"])) -if test "$ac_cv_have_isnan" = "yes" -then - AC_DEFINE(HAVE_ISNAN, 1, [Define to 1 if you have the `isnan' function.]) -fi - LIBS="$ac_save_LIBS" dnl Check for __builtin_popcount diff --git a/include/config.h.in b/include/config.h.in index a8218444be6..45a0bd07abb 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -119,9 +119,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_GSSAPI_GSSAPI_H -/* Define to 1 if you have the header file. */ -#undef HAVE_IEEEFP_H - /* Define to 1 if you have the header file. */ #undef HAVE_IFADDRS_H @@ -137,15 +134,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_IOKIT_IOKITLIB_H -/* Define to 1 if you have the `isfinite' function. */ -#undef HAVE_ISFINITE - -/* Define to 1 if you have the `isinf' function. */ -#undef HAVE_ISINF - -/* Define to 1 if you have the `isnan' function. */ -#undef HAVE_ISNAN - /* Define to 1 if you have the `kqueue' function. */ #undef HAVE_KQUEUE @@ -844,12 +832,6 @@ /* Define to the soname of the libv4l2 library. */ #undef SONAME_LIBV4L2 -/* Define to the soname of the libvkd3d library. */ -#undef SONAME_LIBVKD3D - -/* Define to the soname of the libvkd3d-shader library. */ -#undef SONAME_LIBVKD3D_SHADER - /* Define to the soname of the libvulkan library. */ #undef SONAME_LIBVULKAN