Removed ALSA_OSS_WRAPPER environment variable

diff --git a/alsa/alsa-oss.c b/alsa/alsa-oss.c
index 497e7e4d254e95f44925d617f1c32e54aca1d072..08aec240089781534d2312222831e724f8c1bdc2 100644 (file)
--- a/alsa/alsa-oss.c
+++ b/alsa/alsa-oss.c
@@ -693,10 +693,7 @@ static void initialize() __attribute__ ((constructor));
 
 static void initialize()
 {
-       char *s = getenv("ALSA_OSS_WRAPPER");
-       if (s == NULL)
-               return;
-       s = getenv("ALSA_OSS_DEBUG");
+       char *s = getenv("ALSA_OSS_DEBUG");
        if (s)
                oss_wrapper_debug = 1;
        open_max = sysconf(_SC_OPEN_MAX);

diff --git a/alsa/aoss.in b/alsa/aoss.in
index c1b0ad7634cfbac3fccbd5d4e16ea5f2e0b7ad3a..98c7ddcb8bf3e1951b2885644f87eeea6bb4e995 100644 (file)
--- a/alsa/aoss.in
+++ b/alsa/aoss.in
@@ -6,4 +6,4 @@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-ALSA_OSS_WRAPPER=1 LD_PRELOAD=@libdir@/libaoss.so exec "$@"
+LD_PRELOAD=@libdir@/libaoss.so exec "$@"

diff --git a/alsa/testaoss.in b/alsa/testaoss.in
index 9020147029e629fc83b651883eca88319182a7da..d7642a5225cb33c695950fb1c22398c7511c53a7 100644 (file)
--- a/alsa/testaoss.in
+++ b/alsa/testaoss.in
@@ -5,5 +5,4 @@
 #      testaoss <command> <command options and arguments>
 
 prefix=@top_srcdir@
-ALSA_OSS_WRAPPER=1 LD_PRELOAD=${prefix}/alsa/.libs/libaoss.so exec "$@"
-
+LD_PRELOAD=${prefix}/alsa/.libs/libaoss.so exec "$@"

diff --git a/test/testaoss.in b/test/testaoss.in
index bd04c7fb81efed00343f723a0c3f49d4d1b129ba..d7642a5225cb33c695950fb1c22398c7511c53a7 100644 (file)
--- a/test/testaoss.in
+++ b/test/testaoss.in
@@ -5,4 +5,4 @@
 #      testaoss <command> <command options and arguments>
 
 prefix=@top_srcdir@
-ALSA_OSS_WRAPPER=1 LD_PRELOAD=${prefix}/alsa/.libs/libaoss.so exec "$@"
+LD_PRELOAD=${prefix}/alsa/.libs/libaoss.so exec "$@"