sys/asoundlib.h:1: This header is deprecated

[Marco Pietrobono]

On Sun, 4 Aug 2002, Gerald Pfeifer wrote:

> On a SuSE Linux 8.0 box[1] I'm getting the following #warning a few times
> while building the current CVS version of Wine:
>
>   In file included from alsa.h:23,
>                    from audio.c:46:
>   /usr/include/sys/asoundlib.h:1: warning: #warning This header is
>   deprecated, use <alsa/asoundlib.h> instead.

  Hi Gerald, sys/asoundlib.h is the old 0.5 version header, and it seems
that SuSE has added it just for backward compatibility.

  Can you try the attached patch? I had prepared it few days ago but I've
forgot to submit it...

> Gerald

  bye,

/pietrobo

-- 
Stud. Marco Pietrobono            | Murphy's Law: if something could
v. del Calice, 39 - 00178 ROMA    |     go wrong, it does.
Tel. +39.6.7186329  0339.7410893  | Legge di Murphy: se qualcosa può
http://www.pietrobo.com           |    andar male, lo farà.
------------------------------------------------------------------------
Strange game.
The only winning move
is not to play.
What about a nice play of chess ?
-------------- next part --------------
Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.66
diff -u -r1.66 configure.ac
--- configure.ac	1 Aug 2002 18:22:38 -0000	1.66
+++ configure.ac	2 Aug 2002 09:38:40 -0000
@@ -561,7 +561,11 @@
 dnl **** Check for ALSA ****
 AC_SUBST(ALSALIBS,"")
 AC_CHECK_HEADERS(sys/asoundlib.h)
-if test "$ac_cv_header_sys_asoundlib_h" = "yes"
+if test "$ac_cv_header_sys_asoundlib_h" = "no"
+then
+  AC_CHECK_HEADERS(alsa/asoundlib.h)
+fi
+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])
Index: dlls/winmm/winealsa/alsa.h
===================================================================
RCS file: /home/wine/wine/dlls/winmm/winealsa/alsa.h,v
retrieving revision 1.2
diff -u -r1.2 alsa.h
--- dlls/winmm/winealsa/alsa.h	28 Jun 2002 18:31:01 -0000	1.2
+++ dlls/winmm/winealsa/alsa.h	2 Aug 2002 09:38:50 -0000
@@ -22,6 +22,9 @@
 #ifdef HAVE_SYS_ASOUNDLIB_H
 #include <sys/asoundlib.h>
 #endif
+#ifdef HAVE_ALSA_ASOUNDLIB_H
+#include <alsa/asoundlib.h>
+#endif
 #ifdef HAVE_SYS_ERRNO_H
 #include <sys/errno.h>
 #endif
Index: include/config.h.in
===================================================================
RCS file: /home/wine/wine/include/config.h.in,v
retrieving revision 1.126
diff -u -r1.126 config.h.in
--- include/config.h.in	1 Aug 2002 18:26:23 -0000	1.126
+++ include/config.h.in	2 Aug 2002 09:38:50 -0000
@@ -455,6 +455,9 @@
 /* Define to 1 if you have the <sys/asoundlib.h> header file. */
 #undef HAVE_SYS_ASOUNDLIB_H
 
+/* Define to 1 if you have the <alsa/asoundlib.h> header file. */
+#undef HAVE_ALSA_ASOUNDLIB_H
+
 /* Define to 1 if you have the <sys/cdio.h> header file. */
 #undef HAVE_SYS_CDIO_H