Austin English : configure: Check for snd_pcm_hw_params_get_access_mask() when checking for ALSA.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: aeb78cba25259a01b4db239caae54d8cde4a3d3a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=aeb78cba25259a01b4db239caae54d8cde4a3d3a

Author: Austin English <austinenglish at gmail.com>
Date:   Wed Jan 12 01:43:46 2011 -0800

configure: Check for snd_pcm_hw_params_get_access_mask() when checking for ALSA.

---

 configure    |   22 +++++++++++-----------
 configure.ac |    4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/configure b/configure
index b33890c..b3bc5e9 100755
--- a/configure
+++ b/configure
@@ -10879,9 +10879,9 @@ ALSALIBS=""
 
 if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"
 then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_hw_params_get_access in -lasound" >&5
-$as_echo_n "checking for snd_pcm_hw_params_get_access in -lasound... " >&6; }
-if test "${ac_cv_lib_asound_snd_pcm_hw_params_get_access+set}" = set; 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; }
+if test "${ac_cv_lib_asound_snd_pcm_hw_params_get_access_mask+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -10895,27 +10895,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char snd_pcm_hw_params_get_access ();
+char snd_pcm_hw_params_get_access_mask ();
 int
 main ()
 {
-return snd_pcm_hw_params_get_access ();
+return snd_pcm_hw_params_get_access_mask ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_asound_snd_pcm_hw_params_get_access=yes
+  ac_cv_lib_asound_snd_pcm_hw_params_get_access_mask=yes
 else
-  ac_cv_lib_asound_snd_pcm_hw_params_get_access=no
+  ac_cv_lib_asound_snd_pcm_hw_params_get_access_mask=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_hw_params_get_access" >&5
-$as_echo "$ac_cv_lib_asound_snd_pcm_hw_params_get_access" >&6; }
-if test "x$ac_cv_lib_asound_snd_pcm_hw_params_get_access" = x""yes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_hw_params_get_access_mask" >&5
+$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" = x""yes; then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef HAVE_ALSA_ASOUNDLIB_H
@@ -10926,7 +10926,7 @@ if test "x$ac_cv_lib_asound_snd_pcm_hw_params_get_access" = x""yes; then :
 int
 main ()
 {
-int ret = snd_pcm_hw_params_get_access(NULL, NULL)
+int ret = snd_pcm_hw_params_get_access_mask(NULL, NULL)
   ;
   return 0;
 }
diff --git a/configure.ac b/configure.ac
index 7f96d24..cc1a45e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1479,12 +1479,12 @@ dnl **** Check for ALSA 1.x ****
 AC_SUBST(ALSALIBS,"")
 if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"
 then
-    AC_CHECK_LIB(asound,snd_pcm_hw_params_get_access,
+    AC_CHECK_LIB(asound,snd_pcm_hw_params_get_access_mask,
         [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_ALSA_ASOUNDLIB_H
 #include <alsa/asoundlib.h>
 #elif defined(HAVE_SYS_ASOUNDLIB_H)
 #include <sys/asoundlib.h>
-#endif]], [[int ret = snd_pcm_hw_params_get_access(NULL, NULL)]])],
+#endif]], [[int ret = snd_pcm_hw_params_get_access_mask(NULL, NULL)]])],
                         [AC_DEFINE(HAVE_ALSA,1,[Define if you have ALSA 1.x including devel headers])
                          ALSALIBS="-lasound"],[])])
 fi