summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorJeremy Lea <reg@FreeBSD.org>2000-10-03 01:07:56 +0000
committerJeremy Lea <reg@FreeBSD.org>2000-10-03 01:07:56 +0000
commit6f3b4bd632d38ab5af521351ac548f1086418d7f (patch)
treedf77ffe72f444a603abe616cd86b7d8f5b07175e /audio
parentUSE_LIBTOOL. (diff)
Don't hack CFLAGS support. Fix the problem.
Diffstat (limited to 'audio')
-rw-r--r--audio/wsoundserver/Makefile1
-rw-r--r--audio/wsoundserver/files/patch-af25
2 files changed, 25 insertions, 1 deletions
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index f03c9e46ac31..0bfa0f1ee90d 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -23,7 +23,6 @@ RUN_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
-MAKE_ARGS= "-E CFLAGS"
.if defined(WITH_ESD)
ESD_DEPENDS= esd.2:${PORTSDIR}/audio/esound
diff --git a/audio/wsoundserver/files/patch-af b/audio/wsoundserver/files/patch-af
new file mode 100644
index 000000000000..50cb9f9940b4
--- /dev/null
+++ b/audio/wsoundserver/files/patch-af
@@ -0,0 +1,25 @@
+--- configure.orig Sat Jun 3 14:45:53 2000
++++ configure Sat Jun 3 14:48:21 2000
+@@ -3401,9 +3401,9 @@
+
+
+ rm -f conf.audiofiletest
+
+- CFLAGS=$AUDIOFILE_CFLAGS
+- LIBS=$AUDIOFILE_LIBS
++ CFLAGS="$CFLAGS $AUDIOFILE_CFLAGS"
++ LIBS="$LIBS $AUDIOFILE_LIBS"
+
+ if test "x$AUDIOFILE_LIBS" = "x"; then
+ echo
+@@ -3677,8 +3674,8 @@
+
+ rm -f conf.esdtest
+
+- CFLAGS=$ESD_CFLAGS
+- LIBS=$ESD_LIBS
++ CFLAGS="$CFLAGS $ESD_CFLAGS"
++ LIBS="$LIBS $ESD_LIBS"
+ for ac_func in esd_get_latency
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6