Attachment #1608 for bug #9821

View | Details | Raw Unified | Return to bug 9821
Collapse All | Expand All





AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
               AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
                            external_mp4v2=no),
               external_mp4v2=no, [#include <mp4.h>])

if test x$external_mp4v2 = xyes; then
  AC_MSG_NOTICE([*** Building with external mp4v2 ***])
  MY_DEFINE(HAVE_LIBMP4V2)
else
  if test x$WITHMP4V2 = xyes; then
     AC_MSG_NOTICE([*** Building with internal mp4v2 ***])

Lines 7-11 Link Here

(-)faac/frontend/Makefile.am.orig (-1 / +1 lines)
7	LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++	7	LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++
8	else	8	else
9	INCLUDES = -I$(top_srcdir)/include	9	INCLUDES = -I$(top_srcdir)/include
10	LDADD = $(top_builddir)/libfaac/libfaac.la -lm	10	LDADD = $(top_builddir)/libfaac/libfaac.la -lmp4v2 -lm
11	endif	11	endif

Return to bug 9821

Lines 30-40 Link Here

(-)faac/configure.in.orig (-1 / +2 lines)
30		30
31	AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],	31	AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
32	AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,	32	AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
33	external_mp4v2=no, -lstdc++),	33	external_mp4v2=no),
34	external_mp4v2=no, [#include <mp4.h>])	34	external_mp4v2=no, [#include <mp4.h>])
35		35
36	if test x$external_mp4v2 = xyes; then	36	if test x$external_mp4v2 = xyes; then
37	AC_MSG_NOTICE([* Building with external mp4v2 *])	37	AC_MSG_NOTICE([* Building with external mp4v2 *])
		38	MY_DEFINE(HAVE_LIBMP4V2)
38	else	39	else
39	if test x$WITHMP4V2 = xyes; then	40	if test x$WITHMP4V2 = xyes; then
40	AC_MSG_NOTICE([* Building with internal mp4v2 *])	41	AC_MSG_NOTICE([* Building with internal mp4v2 *])