Big renaming - from sound to asound...

diff --git a/Makefile.conf.in b/Makefile.conf.in
index ed8edb907562d4092c1b2373c58f71c1d3265da4..77bc5b97ecadd601584d7fcfa9e8d27c83444aed 100644 (file)
--- a/Makefile.conf.in
+++ b/Makefile.conf.in
@@ -23,7 +23,7 @@ INCLUDE=-I/usr/local/include -I$(TOPDIR)/include
 COPTS = $(c_opts)
 COPTS += -Wall -Wstrict-prototypes -fomit-frame-pointer -pipe
 LINKER=ld
-SNDLIB=-lsound
+SNDLIB=-lasound
 NCURSESINC="<ncurses.h>"
 NCURSESLIB=-lncurses
 LN_S=@LN_S@

diff --git a/alsamixer/alsamixer.c b/alsamixer/alsamixer.c
index 377ff71b8905447fc413eeddb24fd61d71acb09e..daadbf89a22110a2874011b2425b7176b161a83a 100644 (file)
--- a/alsamixer/alsamixer.c
+++ b/alsamixer/alsamixer.c
@@ -20,7 +20,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include <linux/sound.h>
 
 #include <errno.h>
 
@@ -36,7 +35,7 @@
 #endif
 #include <time.h>
 
-#include <sys/soundlib.h>
+#include <sys/asoundlib.h>
 
 /* example compilation commandline:
  * clear; gcc -Wall -pipe -O2 alsamixer.c -o alsamixer -lncurses

diff --git a/amixer/amain.cpp b/amixer/amain.cpp
index e0d9255678768f3db4b09819ff79c6bf9f1cee4b..e98b593a6c3033c43a4f467086a37938b7b89bd6 100644 (file)
--- a/amixer/amain.cpp
+++ b/amixer/amain.cpp
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/soundlib.h>
+#include <sys/asoundlib.h>
 #include "amixer.h"
 
 #define MIXER_RC ".amixerrc"

diff --git a/amixer/amixer.cpp b/amixer/amixer.cpp
index af7f925410ce05f23fa5534835403a5caf9c2463..189bd14195f228e070dad26afa11b9773d9ad7c9 100644 (file)
--- a/amixer/amixer.cpp
+++ b/amixer/amixer.cpp
@@ -23,7 +23,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/soundlib.h>
+#include <sys/asoundlib.h>
 #include "amixer.h"
 
 

diff --git a/aplay/aplay.c b/aplay/aplay.c
index 55835c4cd72ae599c2daaf6ffaf1147d959ce1ec..11db6136214e3d909506e019860be2017a1223fa 100644 (file)
--- a/aplay/aplay.c
+++ b/aplay/aplay.c
@@ -34,7 +34,7 @@
 #include <getopt.h>
 #include <fcntl.h>
 #include <ctype.h>
-#include <sys/soundlib.h>
+#include <sys/asoundlib.h>
 #include "config.h"
 #include "formats.h"
 

diff --git a/configure.in b/configure.in
index eed6393378ea6529da7b9eb34feabf4ffd0fd6c4..ff8182acea5a2f59e8f22934d5f35170aafe73de 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ AC_PROG_LN_S
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CONFIG_HEADER(include/config.h)
-AC_CHECK_HEADERS(linux/sound.h sys/soundlib.h)
+AC_CHECK_HEADERS(linux/asound.h sys/asoundlib.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -28,12 +28,12 @@ if test "$myprefix" = "NONE"; then
   myprefix=$ac_default_prefix
 fi
 CFLAGS="-I$myprefix/include"
-LIBS="-L$myprefix/lib -lsound"
+LIBS="-L$myprefix/lib -lasound"
 #echo "CFLAGS=$CFLAGS"
 #echo "LIBS=$LIBS"
 AC_MSG_CHECKING(for alsa-lib package)
 AC_TRY_RUN([
-#include <sys/soundlib.h>
+#include <sys/asoundlib.h>
 void main(void)
 {
   snd_cards();