1 --- faac/frontend/Makefile.am.orig 2004-07-28 10:18:21.000000000 +0200
2 +++ faac/frontend/Makefile.am 2006-08-23 23:19:38.375803500 +0200
4 LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++
\r
6 INCLUDES = -I$(top_srcdir)/include
\r
8 +LDADD = $(top_builddir)/libfaac/libfaac.la -lmp4v2 -lm -lstdc++
\r
10 LDADD = $(top_builddir)/libfaac/libfaac.la -lm
\r
13 --- faac/configure.in.orig 2006-08-23 23:13:15.707888000 +0200
14 +++ faac/configure.in 2006-08-23 23:18:43.204355500 +0200
16 AC_CHECK_LIB(gnugetopt, getopt_long)
\r
18 AM_CONDITIONAL(WITH_MP4V2, false)
\r
19 +AM_CONDITIONAL(WITH_EXT_MP4V2, false)
\r
21 AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
\r
22 AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
\r
25 if test x$external_mp4v2 = xyes; then
\r
26 AC_MSG_NOTICE([*** Building with external mp4v2 ***])
\r
27 + AM_CONDITIONAL(WITH_EXT_MP4V2, true)
\r
28 + MY_DEFINE(HAVE_LIBMP4V2)
\r
30 if test x$WITHMP4V2 = xyes; then
\r
31 AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
\r