]>
Commit | Line | Data |
---|---|---|
da0f2c8b JB |
1 | --- faac/libfaac/Makefile.am.orig 2003-10-17 18:41:05.000000000 +0200 |
2 | +++ faac/libfaac/Makefile.am 2004-02-09 21:50:24.505376480 +0100 | |
3 | @@ -2,6 +2,7 @@ | |
4 | ||
5 | libfaac_la_SOURCES = aacquant.c bitstream.c fft.c frame.c midside.c psychkni.c util.c backpred.c channels.c filtbank.c huffman.c ltp.c tns.c | |
6 | libfaac_la_INCLUDES = aacquant.h channels.h filtbank.h hufftab.h psych.h backpred.h coder.h frame.h midside.h tns.h bitstream.h fft.h huffman.h ltp.h util.h | |
7 | +libfaac_la_LIBADD = -lm | |
8 | ||
9 | INCLUDES = -I$(top_srcdir)/include | |
10 | ||
64dc7cd1 JB |
11 | --- faac/frontend/Makefile.am.orig 2004-03-24 12:00:40.000000000 +0100 |
12 | +++ faac/frontend/Makefile.am 2004-04-23 22:13:07.649197000 +0200 | |
13 | @@ -3,5 +3,5 @@ | |
14 | faac_SOURCES = main.c input.c | |
15 | ||
16 | INCLUDES = -I$(top_srcdir)/include | |
17 | -LDADD = $(top_builddir)/libfaac/libfaac.la -lm | |
18 | +LDADD = $(top_builddir)/libfaac/libfaac.la $(MP4LIBS) -lm | |
19 | ||
20 | --- faac/configure.in.orig 2004-04-16 11:49:09.000000000 +0200 | |
21 | +++ faac/configure.in 2004-04-23 22:12:27.599285512 +0200 | |
22 | @@ -24,7 +24,8 @@ | |
23 | AC_CHECK_LIB(mp4v2, MP4MetadataDelete, | |
24 | [AC_MSG_NOTICE([*** Building with MP4 support ***]) | |
25 | MY_DEFINE([HAVE_LIBMP4V2]) | |
26 | - LIBS="$LIBS -lstdc++ -lmp4v2"], | |
27 | + MP4LIBS="-lmp4v2"], | |
28 | [AC_MSG_NOTICE([*** Building without MP4 support ***])], | |
29 | -lstdc++) | |
30 | +AC_SUBST(MP4LIBS) | |
31 | AC_C_BIGENDIAN |