]>
Commit | Line | Data |
---|---|---|
f4b489ed JB |
1 | --- audacity-src-1.3.2-beta/lib-src/libnyquist/Makefile.in.orig 2006-10-29 01:05:50.000000000 +0200 |
2 | +++ audacity-src-1.3.2-beta/lib-src/libnyquist/Makefile.in 2006-12-29 17:29:38.478206151 +0100 | |
3 | @@ -6,7 +6,7 @@ | |
4 | INCL = -Inyqsrc -Itran -Ixlisp -Icmt -Isys -Isnd -Ifft | |
5 | ||
6 | CC = @CC@ | |
165c5a81 AM |
7 | -CFLAGS += -DCMTSTUFF -DEXT @CFLAGS@ $(INCL) |
8 | +CFLAGS = @CFLAGS@ -DCMTSTUFF -DEXT @CFLAGS@ $(INCL) | |
9 | ||
10 | INTGEN = misc/intgen | |
f4b489ed JB |
11 | |
12 | --- audacity-src-1.3.2-beta/lib-src/portmixer/configure.ac.orig 2006-10-29 01:05:51.000000000 +0200 | |
13 | +++ audacity-src-1.3.2-beta/lib-src/portmixer/configure.ac 2006-12-29 20:12:30.975109012 +0100 | |
14 | @@ -31,6 +31,10 @@ | |
15 | [AC_SUBST( cflags, ["$cflags -g"] ) AC_MSG_RESULT(yes)], | |
16 | [AC_SUBST( cflags, ["$cflags -O2"] ) AC_MSG_RESULT(no)]) | |
17 | ||
18 | +if test -n "$CFLAGS" ; then | |
19 | + cflags="$CFLAGS" | |
20 | +fi | |
21 | + | |
22 | # | |
23 | # Check for portaudio path | |
24 | # | |
165c5a81 AM |
25 | |
26 | --- a/lib-src/portsmf/configure.ac~ 2008-10-25 14:14:23.000000000 +0200 | |
27 | +++ a/lib-src/portsmf/configure.ac 2009-05-26 14:57:39.406323603 +0200 | |
64c1cc72 | 28 | @@ -25,7 +25,7 @@ |
165c5a81 AM |
29 | # which also contains a subdir containing macros |
30 | AC_CONFIG_MACRO_DIR([autotools/m4]) | |
64c1cc72 | 31 | dnl set up automake |
165c5a81 AM |
32 | -AM_INIT_AUTOMAKE([-Wall foreign]) |
33 | +AM_INIT_AUTOMAKE | |
64c1cc72 | 34 | dnl Audacity policy: don't enable automatic rebuild of configure et al if |
35 | dnl sources change | |
36 | AM_MAINTAINER_MODE([enabled]) |