]> git.alsa-project.org Git - alsa-oss.git/commitdiff
fixed again - don't link libasound with oss-redir lib.
authorTakashi Iwai <tiwai@suse.de>
Wed, 25 Feb 2004 19:16:10 +0000 (19:16 +0000)
committerTakashi Iwai <tiwai@suse.de>
Wed, 25 Feb 2004 19:16:10 +0000 (19:16 +0000)
alsa/Makefile.am
configure.in

index c46f317573da235e48132ac4924df3f4e514ff58..6bfba23d90628db44ae17852e72e1a8c65e454dd 100644 (file)
@@ -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@
index 778e48cf30353b3000da5776ed118e4c015050af..aaf276c8ce70645bd2db27f96e99f10c362af3ca 100644 (file)
@@ -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 \