]>
Commit | Line | Data |
---|---|---|
989930ed | 1 | --- faac/frontend/Makefile.am.orig 2004-07-28 10:18:21.000000000 +0200 |
e5c4746b | 2 | +++ faac/frontend/Makefile.am 2007-11-04 11:26:06.598027652 +0100 |
989930ed | 3 | @@ -7,5 +7,9 @@ |
e5c4746b JB |
4 | LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++ |
5 | else | |
6 | INCLUDES = -I$(top_srcdir)/include | |
7 | +if WITH_EXT_MP4V2 | |
8 | +LDADD = $(top_builddir)/libfaac/libfaac.la -lmp4v2 -lm -lstdc++ | |
9 | +else | |
10 | LDADD = $(top_builddir)/libfaac/libfaac.la -lm | |
11 | endif | |
12 | +endif | |
13 | --- faac/configure.in.orig 2007-08-20 20:03:22.000000000 +0200 | |
14 | +++ faac/configure.in 2007-11-04 11:20:45.451726567 +0100 | |
15 | @@ -28,6 +28,7 @@ | |
16 | AC_CHECK_LIB(gnugetopt, getopt_long) | |
17 | ||
18 | AM_CONDITIONAL(WITH_MP4V2, false) | |
19 | +AM_CONDITIONAL(WITH_EXT_MP4V2, false) | |
20 | ||
21 | AC_CHECK_DECLS([MP4Create, MP4MetadataDelete], | |
22 | AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes, | |
23 | @@ -36,6 +37,8 @@ | |
24 | ||
25 | if test x$external_mp4v2 = xyes; then | |
26 | AC_MSG_NOTICE([*** Building with external mp4v2 ***]) | |
27 | + AM_CONDITIONAL(WITH_EXT_MP4V2, true) | |
28 | + MY_DEFINE(HAVE_LIBMP4V2) | |
29 | else | |
30 | if test x$WITHMP4V2 = xyes; then | |
31 | AC_MSG_NOTICE([*** Building with internal mp4v2 ***]) |