configure: Improve the detection of OSS v4.

This commit is contained in:
Alexandre Julliard 2011-05-02 20:06:49 +02:00
parent 4d2622e65b
commit f60a0f5e56
11 changed files with 61 additions and 110 deletions

42
configure vendored
View File

@ -625,6 +625,7 @@ LIBMPG123
PNGINCL PNGINCL
FONTCONFIGINCL FONTCONFIGINCL
CUPSINCL CUPSINCL
OSS4INCL
ALSALIBS ALSALIBS
GSTREAMER_INCL GSTREAMER_INCL
GSTREAMER_LIBS GSTREAMER_LIBS
@ -2674,7 +2675,7 @@ fi
# Check whether --with-oss was given. # Check whether --with-oss was given.
if test "${with_oss+set}" = set; then : if test "${with_oss+set}" = set; then :
withval=$with_oss; if test "x$withval" = "xno"; then ac_cv_header_soundcard_h=no; ac_cv_header_sys_soundcard_h=no; ac_cv_header_machine_soundcard_h=no; fi withval=$with_oss;
fi fi
@ -5846,7 +5847,6 @@ for ac_header in \
mach/machine.h \ mach/machine.h \
machine/cpu.h \ machine/cpu.h \
machine/limits.h \ machine/limits.h \
machine/soundcard.h \
machine/sysarch.h \ machine/sysarch.h \
mntent.h \ mntent.h \
mpg123.h \ mpg123.h \
@ -5869,7 +5869,6 @@ for ac_header in \
scsi/scsi.h \ scsi/scsi.h \
scsi/scsi_ioctl.h \ scsi/scsi_ioctl.h \
scsi/sg.h \ scsi/sg.h \
soundcard.h \
stdbool.h \ stdbool.h \
stdint.h \ stdint.h \
strings.h \ strings.h \
@ -5904,7 +5903,6 @@ for ac_header in \
sys/socket.h \ sys/socket.h \
sys/socketvar.h \ sys/socketvar.h \
sys/sockio.h \ sys/sockio.h \
sys/soundcard.h \
sys/statvfs.h \ sys/statvfs.h \
sys/strtio.h \ sys/strtio.h \
sys/syscall.h \ sys/syscall.h \
@ -11027,28 +11025,34 @@ fi
fi fi
if test "$ac_cv_header_sys_soundcard_h" = "yes" -o \ if test "x$with_oss" != xno
"$ac_cv_header_machine_soundcard_h" = "yes" -o \
"$ac_cv_header_soundcard_h" = "yes"
then then
ac_fn_c_check_type "$LINENO" "oss_sysinfo" "ac_cv_type_oss_sysinfo" "#if defined(HAVE_SYS_SOUNDCARD_H) ac_save_CPPFLAGS="$CPPFLAGS"
#include <sys/soundcard.h> if test -f /etc/oss.conf
#elif defined(HAVE_MACHINE_SOUNDCARD_H) then
#include <machine/soundcard.h> . /etc/oss.conf
#elif defined(HAVE_SOUNDCARD_H) fi
#include <soundcard.h> ac_oss_incl="-I${OSSLIBDIR:-/usr/lib/oss}/include"
#endif CPPFLAGS="$CPPFLAGS $ac_oss_incl"
ac_fn_c_check_header_mongrel "$LINENO" "sys/soundcard.h" "ac_cv_header_sys_soundcard_h" "$ac_includes_default"
if test "x$ac_cv_header_sys_soundcard_h" = xyes; then :
ac_fn_c_check_member "$LINENO" "oss_sysinfo" "numaudioengines" "ac_cv_member_oss_sysinfo_numaudioengines" "#include <sys/soundcard.h>
" "
if test "x$ac_cv_type_oss_sysinfo" = xyes; then : if test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes; then :
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define HAVE_OSS_SYSINFO 1 #define HAVE_OSS_SYSINFO_NUMAUDIOENGINES 1
_ACEOF _ACEOF
OSS4INCL="$ac_oss_incl"
fi fi
if test "x$ac_cv_type_oss_sysinfo" != xyes fi
CPPFLAGS="$ac_save_CPPFLAGS"
if test "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes
then then
as_fn_append wine_notices "|OSS sound system found but too old (OSSv4 needed), OSS won't be supported." as_fn_append wine_notices "|OSS sound system found but too old (OSSv4 needed), OSS won't be supported."
fi fi
@ -12134,11 +12138,11 @@ test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
test -n "$NASLIBS" || enable_winenas_drv=${enable_winenas_drv:-no} test -n "$NASLIBS" || enable_winenas_drv=${enable_winenas_drv:-no}
test -n "$ESDLIBS" || enable_wineesd_drv=${enable_wineesd_drv:-no} test -n "$ESDLIBS" || enable_wineesd_drv=${enable_wineesd_drv:-no}
test -n "$ac_cv_lib_soname_jack" || enable_winejack_drv=${enable_winejack_drv:-no} test -n "$ac_cv_lib_soname_jack" || enable_winejack_drv=${enable_winejack_drv:-no}
test "x$ac_cv_type_oss_sysinfo" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no} test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no}
test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no}
if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \ if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
"x$ac_cv_type_oss_sysinfo" != xyes -a \ "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \
"x$with_alsa$with_coreaudio$with_nas$with_esd$with_jack$with_oss" != xnononononono "x$with_alsa$with_coreaudio$with_nas$with_esd$with_jack$with_oss" != xnononononono
then then
as_fn_append wine_warnings "|No sound system was found. Windows applications will be silent." as_fn_append wine_warnings "|No sound system was found. Windows applications will be silent."

View File

@ -73,8 +73,7 @@ AC_ARG_WITH(opencl, AS_HELP_STRING([--without-opencl],[do not use OpenCL]),
AC_ARG_WITH(opengl, AS_HELP_STRING([--without-opengl],[do not use OpenGL])) AC_ARG_WITH(opengl, AS_HELP_STRING([--without-opengl],[do not use OpenGL]))
AC_ARG_WITH(openssl, AS_HELP_STRING([--without-openssl],[do not use OpenSSL]), AC_ARG_WITH(openssl, AS_HELP_STRING([--without-openssl],[do not use OpenSSL]),
[if test "x$withval" = "xno"; then ac_cv_header_openssl_err_h=no; ac_cv_header_openssl_ssl_h=no; fi]) [if test "x$withval" = "xno"; then ac_cv_header_openssl_err_h=no; ac_cv_header_openssl_ssl_h=no; fi])
AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound support]), AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound support]))
[if test "x$withval" = "xno"; then ac_cv_header_soundcard_h=no; ac_cv_header_sys_soundcard_h=no; ac_cv_header_machine_soundcard_h=no; fi])
AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG]), AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG]),
[if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi]) [if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi])
AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]),
@ -433,7 +432,6 @@ AC_CHECK_HEADERS(\
mach/machine.h \ mach/machine.h \
machine/cpu.h \ machine/cpu.h \
machine/limits.h \ machine/limits.h \
machine/soundcard.h \
machine/sysarch.h \ machine/sysarch.h \
mntent.h \ mntent.h \
mpg123.h \ mpg123.h \
@ -456,7 +454,6 @@ AC_CHECK_HEADERS(\
scsi/scsi.h \ scsi/scsi.h \
scsi/scsi_ioctl.h \ scsi/scsi_ioctl.h \
scsi/sg.h \ scsi/sg.h \
soundcard.h \
stdbool.h \ stdbool.h \
stdint.h \ stdint.h \
strings.h \ strings.h \
@ -491,7 +488,6 @@ AC_CHECK_HEADERS(\
sys/socket.h \ sys/socket.h \
sys/socketvar.h \ sys/socketvar.h \
sys/sockio.h \ sys/sockio.h \
sys/soundcard.h \
sys/statvfs.h \ sys/statvfs.h \
sys/strtio.h \ sys/strtio.h \
sys/syscall.h \ sys/syscall.h \
@ -1525,18 +1521,21 @@ then
fi fi
dnl **** Check for OSSv4 **** dnl **** Check for OSSv4 ****
if test "$ac_cv_header_sys_soundcard_h" = "yes" -o \ if test "x$with_oss" != xno
"$ac_cv_header_machine_soundcard_h" = "yes" -o \
"$ac_cv_header_soundcard_h" = "yes"
then then
AC_CHECK_TYPES([oss_sysinfo],,,[#if defined(HAVE_SYS_SOUNDCARD_H) ac_save_CPPFLAGS="$CPPFLAGS"
#include <sys/soundcard.h> if test -f /etc/oss.conf
#elif defined(HAVE_MACHINE_SOUNDCARD_H) then
#include <machine/soundcard.h> . /etc/oss.conf
#elif defined(HAVE_SOUNDCARD_H) fi
#include <soundcard.h> ac_oss_incl="-I${OSSLIBDIR:-/usr/lib/oss}/include"
#endif]) CPPFLAGS="$CPPFLAGS $ac_oss_incl"
if test "x$ac_cv_type_oss_sysinfo" != xyes AC_CHECK_HEADER([sys/soundcard.h],
[AC_CHECK_MEMBERS([oss_sysinfo.numaudioengines],
[AC_SUBST(OSS4INCL,"$ac_oss_incl")],,
[#include <sys/soundcard.h>])])
CPPFLAGS="$ac_save_CPPFLAGS"
if test "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes
then then
WINE_NOTICE([OSS sound system found but too old (OSSv4 needed), OSS won't be supported.]) WINE_NOTICE([OSS sound system found but too old (OSSv4 needed), OSS won't be supported.])
fi fi
@ -1691,12 +1690,12 @@ test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
test -n "$NASLIBS" || enable_winenas_drv=${enable_winenas_drv:-no} test -n "$NASLIBS" || enable_winenas_drv=${enable_winenas_drv:-no}
test -n "$ESDLIBS" || enable_wineesd_drv=${enable_wineesd_drv:-no} test -n "$ESDLIBS" || enable_wineesd_drv=${enable_wineesd_drv:-no}
test -n "$ac_cv_lib_soname_jack" || enable_winejack_drv=${enable_winejack_drv:-no} test -n "$ac_cv_lib_soname_jack" || enable_winejack_drv=${enable_winejack_drv:-no}
test "x$ac_cv_type_oss_sysinfo" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no} test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no}
test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no}
dnl **** Check for any sound system **** dnl **** Check for any sound system ****
if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \ if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
"x$ac_cv_type_oss_sysinfo" != xyes -a \ "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \
"x$with_alsa$with_coreaudio$with_nas$with_esd$with_jack$with_oss" != xnononononono "x$with_alsa$with_coreaudio$with_nas$with_esd$with_jack$with_oss" != xnononononono
then then
WINE_WARNING([No sound system was found. Windows applications will be silent.]) WINE_WARNING([No sound system was found. Windows applications will be silent.])

View File

@ -1,5 +1,6 @@
MODULE = wineoss.drv MODULE = wineoss.drv
IMPORTS = dxguid uuid winmm ole32 user32 IMPORTS = dxguid uuid winmm ole32 user32
EXTRAINCL = @OSS4INCL@
C_SRCS = \ C_SRCS = \
audio.c \ audio.c \

View File

@ -55,16 +55,10 @@
#ifdef HAVE_SYS_POLL_H #ifdef HAVE_SYS_POLL_H
# include <sys/poll.h> # include <sys/poll.h>
#endif #endif
#if defined(HAVE_SYS_SOUNDCARD_H)
# include <sys/soundcard.h>
#elif defined(HAVE_MACHINE_SOUNDCARD_H)
# include <machine/soundcard.h>
#elif defined(HAVE_SOUNDCARD_H)
# include <soundcard.h>
#endif
#ifdef HAVE_SYS_ERRNO_H #ifdef HAVE_SYS_ERRNO_H
#include <sys/errno.h> #include <sys/errno.h>
#endif #endif
#include <sys/soundcard.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"

View File

@ -42,16 +42,10 @@
#ifdef HAVE_SYS_POLL_H #ifdef HAVE_SYS_POLL_H
# include <sys/poll.h> # include <sys/poll.h>
#endif #endif
#if defined(HAVE_SYS_SOUNDCARD_H)
# include <sys/soundcard.h>
#elif defined(HAVE_MACHINE_SOUNDCARD_H)
# include <machine/soundcard.h>
#elif defined(HAVE_SOUNDCARD_H)
# include <soundcard.h>
#endif
#ifdef HAVE_SYS_ERRNO_H #ifdef HAVE_SYS_ERRNO_H
#include <sys/errno.h> #include <sys/errno.h>
#endif #endif
#include <sys/soundcard.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"

View File

@ -45,16 +45,10 @@
#ifdef HAVE_SYS_POLL_H #ifdef HAVE_SYS_POLL_H
# include <sys/poll.h> # include <sys/poll.h>
#endif #endif
#if defined(HAVE_SYS_SOUNDCARD_H)
# include <sys/soundcard.h>
#elif defined(HAVE_MACHINE_SOUNDCARD_H)
# include <machine/soundcard.h>
#elif defined(HAVE_SOUNDCARD_H)
# include <soundcard.h>
#endif
#ifdef HAVE_SYS_ERRNO_H #ifdef HAVE_SYS_ERRNO_H
#include <sys/errno.h> #include <sys/errno.h>
#endif #endif
#include <sys/soundcard.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"

View File

@ -60,16 +60,10 @@
#ifdef HAVE_SYS_POLL_H #ifdef HAVE_SYS_POLL_H
#include <sys/poll.h> #include <sys/poll.h>
#endif #endif
#if defined(HAVE_SYS_SOUNDCARD_H)
# include <sys/soundcard.h>
#elif defined(HAVE_MACHINE_SOUNDCARD_H)
# include <machine/soundcard.h>
#elif defined(HAVE_SOUNDCARD_H)
# include <soundcard.h>
#endif
#ifdef HAVE_SYS_ERRNO_H #ifdef HAVE_SYS_ERRNO_H
#include <sys/errno.h> #include <sys/errno.h>
#endif #endif
#include <sys/soundcard.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"

View File

@ -41,16 +41,10 @@
#ifdef HAVE_SYS_IOCTL_H #ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h> # include <sys/ioctl.h>
#endif #endif
#if defined(HAVE_SYS_SOUNDCARD_H)
# include <sys/soundcard.h>
#elif defined(HAVE_MACHINE_SOUNDCARD_H)
# include <machine/soundcard.h>
#elif defined(HAVE_SOUNDCARD_H)
# include <soundcard.h>
#endif
#ifdef HAVE_SYS_ERRNO_H #ifdef HAVE_SYS_ERRNO_H
#include <sys/errno.h> #include <sys/errno.h>
#endif #endif
#include <sys/soundcard.h>
#define NONAMELESSUNION #define NONAMELESSUNION
#define NONAMELESSSTRUCT #define NONAMELESSSTRUCT

View File

@ -31,16 +31,10 @@
#ifdef HAVE_SYS_IOCTL_H #ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h> # include <sys/ioctl.h>
#endif #endif
#if defined(HAVE_SYS_SOUNDCARD_H)
# include <sys/soundcard.h>
#elif defined(HAVE_MACHINE_SOUNDCARD_H)
# include <machine/soundcard.h>
#elif defined(HAVE_SOUNDCARD_H)
# include <soundcard.h>
#endif
#ifdef HAVE_SYS_ERRNO_H #ifdef HAVE_SYS_ERRNO_H
#include <sys/errno.h> #include <sys/errno.h>
#endif #endif
#include <sys/soundcard.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"

View File

@ -21,6 +21,18 @@
#include "config.h" #include "config.h"
#include <stdarg.h> #include <stdarg.h>
#include <errno.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#include <unistd.h>
#include <math.h>
#include <sys/soundcard.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
@ -41,26 +53,6 @@
#include "audiopolicy.h" #include "audiopolicy.h"
#include "audioclient.h" #include "audioclient.h"
#include <errno.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#include <unistd.h>
#include <math.h>
#if defined(HAVE_SYS_SOUNDCARD_H)
# include <sys/soundcard.h>
#elif defined(HAVE_MACHINE_SOUNDCARD_H)
# include <machine/soundcard.h>
#elif defined(HAVE_SOUNDCARD_H)
# include <soundcard.h>
#endif
WINE_DEFAULT_DEBUG_CHANNEL(oss); WINE_DEFAULT_DEBUG_CHANNEL(oss);
#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)

View File

@ -461,9 +461,6 @@
/* Define to 1 if you have the <machine/limits.h> header file. */ /* Define to 1 if you have the <machine/limits.h> header file. */
#undef HAVE_MACHINE_LIMITS_H #undef HAVE_MACHINE_LIMITS_H
/* Define to 1 if you have the <machine/soundcard.h> header file. */
#undef HAVE_MACHINE_SOUNDCARD_H
/* Define to 1 if you have the <machine/sysarch.h> header file. */ /* Define to 1 if you have the <machine/sysarch.h> header file. */
#undef HAVE_MACHINE_SYSARCH_H #undef HAVE_MACHINE_SYSARCH_H
@ -599,8 +596,8 @@
/* Define to 1 if you have the <openssl/ssl.h> header file. */ /* Define to 1 if you have the <openssl/ssl.h> header file. */
#undef HAVE_OPENSSL_SSL_H #undef HAVE_OPENSSL_SSL_H
/* Define to 1 if the system has the type `oss_sysinfo'. */ /* Define to 1 if `numaudioengines' is a member of `oss_sysinfo'. */
#undef HAVE_OSS_SYSINFO #undef HAVE_OSS_SYSINFO_NUMAUDIOENGINES
/* Define to 1 if you have the `pclose' function. */ /* Define to 1 if you have the `pclose' function. */
#undef HAVE_PCLOSE #undef HAVE_PCLOSE
@ -755,9 +752,6 @@
/* Define to 1 if you have the `socketpair' function. */ /* Define to 1 if you have the `socketpair' function. */
#undef HAVE_SOCKETPAIR #undef HAVE_SOCKETPAIR
/* Define to 1 if you have the <soundcard.h> header file. */
#undef HAVE_SOUNDCARD_H
/* Define to 1 if you have the `spawnvp' function. */ /* Define to 1 if you have the `spawnvp' function. */
#undef HAVE_SPAWNVP #undef HAVE_SPAWNVP
@ -977,9 +971,6 @@
/* Define to 1 if you have the <sys/sockio.h> header file. */ /* Define to 1 if you have the <sys/sockio.h> header file. */
#undef HAVE_SYS_SOCKIO_H #undef HAVE_SYS_SOCKIO_H
/* Define to 1 if you have the <sys/soundcard.h> header file. */
#undef HAVE_SYS_SOUNDCARD_H
/* Define to 1 if you have the <sys/statfs.h> header file. */ /* Define to 1 if you have the <sys/statfs.h> header file. */
#undef HAVE_SYS_STATFS_H #undef HAVE_SYS_STATFS_H