From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 25 Feb 2004 19:16:10 +0000 (+0000)
Subject: fixed again - don't link libasound with oss-redir lib.
X-Git-Tag: v1.0.3~12
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=c7cce02dedb3ee8bbd61d9b17266ddd105666083;p=alsa-oss.git

fixed again - don't link libasound with oss-redir lib.
---

diff --git a/alsa/Makefile.am b/alsa/Makefile.am
index c46f317..6bfba23 100644
--- a/alsa/Makefile.am
+++ b/alsa/Makefile.am
@@ -8,4 +8,6 @@ noinst_HEADERS = alsa-oss-emul.h
 libaoss_la_SOURCES = alsa-oss.c
 libaoss_la_LIBADD = -ldl -lalsatoss
 
+libalsatoss_la_CFLAGS = @ALSA_CFLAGS@
 libalsatoss_la_SOURCES = pcm.c mixer.c
+libalsatoss_la_LIBADD = @ALSA_LIBS@
diff --git a/configure.in b/configure.in
index 778e48c..aaf276c 100644
--- a/configure.in
+++ b/configure.in
@@ -22,7 +22,11 @@ fi
 AM_CONDITIONAL(WITH_AOSS, test x$with_aoss = xyes)
 
 if test "$with_aoss" = "yes"; then
+  OLD_CFLAGS="$CFLAGS"
+  OLD_LIBS="$LIBS"
   AM_PATH_ALSA(0.9.0)
+  CFLAGS="$OLD_CFLAGS"
+  LIBS="$OLD_LIBS"
 fi
 
 AC_OUTPUT(Makefile alsa/Makefile alsa/aoss oss-redir/Makefile test/Makefile \