ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Marco Pietrobono 2002-08-29 01:51:31 +00:00 committed by Alexandre Julliard
parent eb2db1a4be
commit 0e79a4128c
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

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

4
configure.ac
View File

@ -588,8 +588,8 @@ fi
dnl **** Check for ALSA **** dnl **** Check for ALSA ****
AC_SUBST(ALSALIBS,"") AC_SUBST(ALSALIBS,"")
AC_CHECK_HEADERS(sys/asoundlib.h) AC_CHECK_HEADERS(alsa/asoundlib.h sys/asoundlib.h, break)
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 then
AC_CHECK_LIB(asound,snd_pcm_open, AC_CHECK_LIB(asound,snd_pcm_open,
AC_DEFINE(HAVE_ALSA,1,[Define if you have ALSA including devel headers]) AC_DEFINE(HAVE_ALSA,1,[Define if you have ALSA including devel headers])

4
dlls/winmm/winealsa/alsa.h
View File

@ -19,7 +19,9 @@
# error You must include config.h to use this header # error You must include config.h to use this header
#endif #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> #include <sys/asoundlib.h>
#endif #endif
#ifdef HAVE_SYS_ERRNO_H #ifdef HAVE_SYS_ERRNO_H

3
include/config.h.in
View File

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