From 8d20ad28c327fbfa60b7353d0c6808fa30c5759b Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 3 Apr 2019 15:50:48 +0200 Subject: [PATCH] configure: Remove some obsolete checks. Signed-off-by: Alexandre Julliard --- configure | 90 ++------------------------------------------- configure.ac | 39 ++------------------ include/config.h.in | 48 ------------------------ 3 files changed, 7 insertions(+), 170 deletions(-) diff --git a/configure b/configure index 9a264fa6fe0..200f61211a0 100755 --- a/configure +++ b/configure @@ -3809,7 +3809,7 @@ fi # Check whether --with-alsa was given. if test "${with_alsa+set}" = set; then : - withval=$with_alsa; if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi + withval=$with_alsa; fi @@ -7291,7 +7291,6 @@ for ac_header in \ QuickTime/ImageCompression.h \ Security/Security.h \ alias.h \ - alsa/asoundlib.h \ arpa/inet.h \ arpa/nameser.h \ asm/types.h \ @@ -7352,7 +7351,6 @@ for ac_header in \ stdbool.h \ stdint.h \ stropts.h \ - sys/asoundlib.h \ sys/attr.h \ sys/auxv.h \ sys/cdio.h \ @@ -13360,13 +13358,10 @@ $as_echo "#define HAVE_PPDEV 1" >>confdefs.h fi ac_wine_check_funcs_save_LIBS="$LIBS" -LIBS="$LIBS $PTHREAD_LIBS" +LIBS="$LIBS " for ac_func in \ - pthread_attr_get_np \ - pthread_getattr_np \ pthread_getthreadid_np \ - pthread_get_stackaddr_np \ - pthread_get_stacksize_np + $PTHREAD_LIBS do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -13709,7 +13704,7 @@ test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" = xyes || enable_winegstreamer=${en ALSA_LIBS="" -if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes" +if test "x$with_alsa" != "xno" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_hw_params_get_access_mask in -lasound" >&5 $as_echo_n "checking for snd_pcm_hw_params_get_access_mask in -lasound... " >&6; } @@ -13750,11 +13745,7 @@ $as_echo "$ac_cv_lib_asound_snd_pcm_hw_params_get_access_mask" >&6; } if test "x$ac_cv_lib_asound_snd_pcm_hw_params_get_access_mask" = xyes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef HAVE_ALSA_ASOUNDLIB_H #include -#elif defined(HAVE_SYS_ASOUNDLIB_H) -#include -#endif int main () { @@ -16700,7 +16691,6 @@ for ac_func in \ __res_get_state \ __res_getservers \ _spawnvp \ - asctime_r \ dlopen \ epoll_create \ ffs \ @@ -16717,11 +16707,8 @@ for ac_func in \ getauxval \ getifaddrs \ getopt_long_only \ - getpwuid \ - getuid \ kqueue \ lstat \ - mmap \ pipe2 \ poll \ port_create \ @@ -16735,9 +16722,7 @@ for ac_func in \ select \ setproctitle \ setprogname \ - setrlimit \ settimeofday \ - sigaltstack \ sigprocmask \ statfs \ statvfs \ @@ -17051,8 +17036,6 @@ for ac_func in \ inet_network \ inet_ntop \ inet_pton \ - sendmsg \ - socketpair \ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -18375,71 +18358,6 @@ _ACEOF fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for timezone variable" >&5 -$as_echo_n "checking for timezone variable... " >&6; } -if ${ac_cv_have_timezone+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -timezone = 1 - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_have_timezone="yes" -else - ac_cv_have_timezone="no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_timezone" >&5 -$as_echo "$ac_cv_have_timezone" >&6; } -if test "$ac_cv_have_timezone" = "yes" -then - -$as_echo "#define HAVE_TIMEZONE 1" >>confdefs.h - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for daylight variable" >&5 -$as_echo_n "checking for daylight variable... " >&6; } -if ${ac_cv_have_daylight+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -daylight = 1 - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_have_daylight="yes" -else - ac_cv_have_daylight="no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_daylight" >&5 -$as_echo "$ac_cv_have_daylight" >&6; } -if test "$ac_cv_have_daylight" = "yes" -then - -$as_echo "#define HAVE_DAYLIGHT 1" >>confdefs.h - -fi - ac_save_LIBS="$LIBS" LIBS="$LIBS -lm" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isfinite" >&5 diff --git a/configure.ac b/configure.ac index eaee17e09be..b1839a4c474 100644 --- a/configure.ac +++ b/configure.ac @@ -33,8 +33,7 @@ AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[do not build the regression tests])) AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules])) -AC_ARG_WITH(alsa, AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support]), - [if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi]) +AC_ARG_WITH(alsa, AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support])) AC_ARG_WITH(capi, AS_HELP_STRING([--without-capi],[do not use CAPI (ISDN support)])) AC_ARG_WITH(cms, AS_HELP_STRING([--without-cms],[do not use CMS (color management support)])) AC_ARG_WITH(coreaudio, AS_HELP_STRING([--without-coreaudio],[do not use the CoreAudio sound support]), @@ -427,7 +426,6 @@ AC_CHECK_HEADERS(\ QuickTime/ImageCompression.h \ Security/Security.h \ alias.h \ - alsa/asoundlib.h \ arpa/inet.h \ arpa/nameser.h \ asm/types.h \ @@ -488,7 +486,6 @@ AC_CHECK_HEADERS(\ stdbool.h \ stdint.h \ stropts.h \ - sys/asoundlib.h \ sys/attr.h \ sys/auxv.h \ sys/cdio.h \ @@ -1490,11 +1487,7 @@ fi dnl **** Check for pthread functions **** WINE_CHECK_LIB_FUNCS(\ - pthread_attr_get_np \ - pthread_getattr_np \ pthread_getthreadid_np \ - pthread_get_stackaddr_np \ - pthread_get_stacksize_np, [$PTHREAD_LIBS]) dnl **** Check for zlib **** @@ -1561,14 +1554,10 @@ test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" = xyes || enable_winegstreamer=${en dnl **** Check for ALSA 1.x **** AC_SUBST(ALSA_LIBS,"") -if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes" +if test "x$with_alsa" != "xno" then AC_CHECK_LIB(asound,snd_pcm_hw_params_get_access_mask, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_ALSA_ASOUNDLIB_H -#include -#elif defined(HAVE_SYS_ASOUNDLIB_H) -#include -#endif]], [[snd_pcm_hw_params_get_access_mask(NULL, NULL)]])], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[snd_pcm_hw_params_get_access_mask(NULL, NULL)]])], [ALSA_LIBS="-lasound"])]) fi test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} @@ -2121,7 +2110,6 @@ AC_CHECK_FUNCS(\ __res_get_state \ __res_getservers \ _spawnvp \ - asctime_r \ dlopen \ epoll_create \ ffs \ @@ -2138,11 +2126,8 @@ AC_CHECK_FUNCS(\ getauxval \ getifaddrs \ getopt_long_only \ - getpwuid \ - getuid \ kqueue \ lstat \ - mmap \ pipe2 \ poll \ port_create \ @@ -2156,9 +2141,7 @@ AC_CHECK_FUNCS(\ select \ setproctitle \ setprogname \ - setrlimit \ settimeofday \ - sigaltstack \ sigprocmask \ statfs \ statvfs \ @@ -2207,8 +2190,6 @@ AC_CHECK_FUNCS(\ inet_network \ inet_ntop \ inet_pton \ - sendmsg \ - socketpair \ ) dnl Check for clock_gettime which may be in -lrt @@ -2627,20 +2608,6 @@ AC_CHECK_MEMBERS([struct ifreq.ifr_hwaddr],,, # include #endif]) -dnl Check for the external timezone variables timezone and daylight -AC_CACHE_CHECK([for timezone variable], ac_cv_have_timezone, - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[timezone = 1]])],[ac_cv_have_timezone="yes"],[ac_cv_have_timezone="no"])) -if test "$ac_cv_have_timezone" = "yes" -then - AC_DEFINE(HAVE_TIMEZONE, 1, [Define if you have the timezone variable]) -fi -AC_CACHE_CHECK([for daylight variable], ac_cv_have_daylight, - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[daylight = 1]])],[ac_cv_have_daylight="yes"],[ac_cv_have_daylight="no"])) -if test "$ac_cv_have_daylight" = "yes" -then - AC_DEFINE(HAVE_DAYLIGHT, 1, [Define if you have the daylight variable]) -fi - dnl Check for isfinite ac_save_LIBS="$LIBS" LIBS="$LIBS -lm" diff --git a/include/config.h.in b/include/config.h.in index b3df2f3c4c2..17676b99163 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -19,9 +19,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ALIAS_H -/* Define to 1 if you have the header file. */ -#undef HAVE_ALSA_ASOUNDLIB_H - /* Define to 1 if you have the header file. */ #undef HAVE_AL_AL_H @@ -35,9 +32,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ARPA_NAMESER_H -/* Define to 1 if you have the `asctime_r' function. */ -#undef HAVE_ASCTIME_R - /* Define to 1 if you have the `asinh' function. */ #undef HAVE_ASINH @@ -104,9 +98,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_CURSES_H -/* Define if you have the daylight variable */ -#undef HAVE_DAYLIGHT - /* Define to 1 if you have the header file. */ #undef HAVE_DIRENT_H @@ -246,18 +237,12 @@ /* Define to 1 if you have the `getprotobynumber' function. */ #undef HAVE_GETPROTOBYNUMBER -/* Define to 1 if you have the `getpwuid' function. */ -#undef HAVE_GETPWUID - /* Define to 1 if you have the `getservbyport' function. */ #undef HAVE_GETSERVBYPORT /* Define to 1 if you have the header file. */ #undef HAVE_GETTEXT_PO_H -/* Define to 1 if you have the `getuid' function. */ -#undef HAVE_GETUID - /* Define to 1 if you have the `gnutls_cipher_init' function. */ #undef HAVE_GNUTLS_CIPHER_INIT @@ -591,9 +576,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_METAL_METAL_H -/* Define to 1 if you have the `mmap' function. */ -#undef HAVE_MMAP - /* Define to 1 if you have the header file. */ #undef HAVE_MNTENT_H @@ -735,21 +717,9 @@ /* Define to 1 if you have the `proc_pidinfo' function. */ #undef HAVE_PROC_PIDINFO -/* Define to 1 if you have the `pthread_attr_get_np' function. */ -#undef HAVE_PTHREAD_ATTR_GET_NP - -/* Define to 1 if you have the `pthread_getattr_np' function. */ -#undef HAVE_PTHREAD_GETATTR_NP - /* Define to 1 if you have the `pthread_getthreadid_np' function. */ #undef HAVE_PTHREAD_GETTHREADID_NP -/* Define to 1 if you have the `pthread_get_stackaddr_np' function. */ -#undef HAVE_PTHREAD_GET_STACKADDR_NP - -/* Define to 1 if you have the `pthread_get_stacksize_np' function. */ -#undef HAVE_PTHREAD_GET_STACKSIZE_NP - /* Define to 1 if you have the header file. */ #undef HAVE_PTHREAD_H @@ -831,18 +801,12 @@ /* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT -/* Define to 1 if you have the `sendmsg' function. */ -#undef HAVE_SENDMSG - /* Define to 1 if you have the `setproctitle' function. */ #undef HAVE_SETPROCTITLE /* Define to 1 if you have the `setprogname' function. */ #undef HAVE_SETPROGNAME -/* Define to 1 if you have the `setrlimit' function. */ -#undef HAVE_SETRLIMIT - /* Define to 1 if you have the `settimeofday' function. */ #undef HAVE_SETTIMEOFDAY @@ -852,9 +816,6 @@ /* Define if sigaddset is supported */ #undef HAVE_SIGADDSET -/* Define to 1 if you have the `sigaltstack' function. */ -#undef HAVE_SIGALTSTACK - /* Define to 1 if `si_fd' is a member of `siginfo_t'. */ #undef HAVE_SIGINFO_T_SI_FD @@ -864,9 +825,6 @@ /* Define to 1 if the system has the type `sigset_t'. */ #undef HAVE_SIGSET_T -/* Define to 1 if you have the `socketpair' function. */ -#undef HAVE_SOCKETPAIR - /* Define to 1 if you have the `SSLCopyPeerCertificates' function. */ #undef HAVE_SSLCOPYPEERCERTIFICATES @@ -1035,9 +993,6 @@ /* Define to 1 if you have the `sysinfo' function. */ #undef HAVE_SYSINFO -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_ASOUNDLIB_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_ATTR_H @@ -1209,9 +1164,6 @@ /* Define to 1 if you have the `timegm' function. */ #undef HAVE_TIMEGM -/* Define if you have the timezone variable */ -#undef HAVE_TIMEZONE - /* Define to 1 if you have the `trunc' function. */ #undef HAVE_TRUNC