Use alsa/asoundlib.h instead of sys/asoundlib.h if possible.

configure

@@ -9188,7 +9188,8 @@ fi
 ALSALIBS=""
 
 
-for ac_header in sys/asoundlib.h
+
+for ac_header in alsa/asoundlib.h sys/asoundlib.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -9296,12 +9297,12 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
-
+ break
 fi
 
 done
 
-if test "$ac_cv_header_sys_asoundlib_h" = "yes"
+if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"
 then
     echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
 echo $ECHO_N "checking for snd_pcm_open in -lasound... $ECHO_C" >&6

configure.ac

@@ -588,8 +588,8 @@ fi
 
 dnl **** Check for ALSA ****
 AC_SUBST(ALSALIBS,"")
-AC_CHECK_HEADERS(sys/asoundlib.h)
-if test "$ac_cv_header_sys_asoundlib_h" = "yes"
+AC_CHECK_HEADERS(alsa/asoundlib.h sys/asoundlib.h, break)
+if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"
 then
     AC_CHECK_LIB(asound,snd_pcm_open,
     	AC_DEFINE(HAVE_ALSA,1,[Define if you have ALSA including devel headers])

dlls/winmm/winealsa/alsa.h

@@ -19,7 +19,9 @@
 # error You must include config.h to use this header
 #endif
 
-#ifdef HAVE_SYS_ASOUNDLIB_H
+#ifdef HAVE_ALSA_ASOUNDLIB_H
+#include <alsa/asoundlib.h>
+#elif defined(HAVE_SYS_ASOUNDLIB_H)
 #include <sys/asoundlib.h>
 #endif
 #ifdef HAVE_SYS_ERRNO_H

include/config.h.in

@@ -23,6 +23,9 @@
 /* Define if you have ALSA including devel headers */
 #undef HAVE_ALSA
 
+/* Define to 1 if you have the <alsa/asoundlib.h> header file. */
+#undef HAVE_ALSA_ASOUNDLIB_H
+
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #undef HAVE_ARPA_INET_H