View | Details | Raw Unified
Collapse All | Expand All

(-) faac/common/Makefile.am (-1 / +1 lines)
 Lines 1-4    Link Here  
if WITH_MP4V2
 
if WITH_INTERNAL_MP4V2
 
SUBDIRS = mp4v2
SUBDIRS = mp4v2
else
else
SUBDIRS =
SUBDIRS =
(-) faac/configure.in (-1 / +5 lines)
 Lines 7-13    Link Here  

        
AC_ARG_WITH( mp4v2,  [  --with-mp4v2            compile libmp4v2],WITHMP4V2=$withval, WITHMP4V2=yes)
AC_ARG_WITH( mp4v2,  [  --with-mp4v2            compile libmp4v2],WITHMP4V2=$withval, WITHMP4V2=yes)

        

            

              
AC_DEFUN(MY_DEFINE, [ AC_DEFINE($1, 1, [define if needed]) ])

              
AC_DEFUN([MY_DEFINE], [ AC_DEFINE($1, 1, [define if needed]) ])

            

        

        
CFLAGS=${CFLAGS:-"-O2 -Wall"}
CFLAGS=${CFLAGS:-"-O2 -Wall"}

        

  

    

    

       Lines 27-32
       
    
  Link Here 
    

  

        
AC_CHECK_LIB(gnugetopt, getopt_long)
AC_CHECK_LIB(gnugetopt, getopt_long)

        

        
AM_CONDITIONAL(WITH_MP4V2, false)
AM_CONDITIONAL(WITH_MP4V2, false)

            

              
              
AM_CONDITIONAL(WITH_INTERNAL_MP4V2, false)

            

        

        
AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],

        
               AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
               AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,

  

    

    

       Lines 35-44
       
    
  Link Here 
    

  

        

        
if test x$external_mp4v2 = xyes; then
if test x$external_mp4v2 = xyes; then

        
  AC_MSG_NOTICE([*** Building with external mp4v2 ***])
  AC_MSG_NOTICE([*** Building with external mp4v2 ***])

            

              
              
  MY_DEFINE(HAVE_LIBMP4V2)

            

            

              
              
  AM_CONDITIONAL(WITH_MP4V2, true)

            

        
else
else

        
  if test x$WITHMP4V2 = xyes; then
  if test x$WITHMP4V2 = xyes; then

        
     AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
     AC_MSG_NOTICE([*** Building with internal mp4v2 ***])

        
     AM_CONDITIONAL(WITH_MP4V2, true)
     AM_CONDITIONAL(WITH_MP4V2, true)

            

              
              
     AM_CONDITIONAL(WITH_INTERNAL_MP4V2, true)

            

        
     AC_CONFIG_LINKS(common/mp4v2/mpeg4ip_config.h:config.h)
     AC_CONFIG_LINKS(common/mp4v2/mpeg4ip_config.h:config.h)

        
     MY_DEFINE(HAVE_LIBMP4V2)
     MY_DEFINE(HAVE_LIBMP4V2)

        
  else
  else



(-) faac/frontend/Makefile.am
      (+5 lines)




  

    

    

       Lines 3-11
       
    
  Link Here 
    

  

        
faac_SOURCES = main.c input.c
faac_SOURCES = main.c input.c

        

        
if WITH_MP4V2
if WITH_MP4V2

            

              
              
if WITH_INTERNAL_MP4V2

            

        
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2

        
LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++
LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++

        
else
else

        
INCLUDES = -I$(top_srcdir)/include 
INCLUDES = -I$(top_srcdir)/include 

            

              
              
LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lmp4v2

            

            

              
              
endif

            

            

              
              
else

            

            

              
              
INCLUDES = -I$(top_srcdir)/include 

            

        
LDADD = $(top_builddir)/libfaac/libfaac.la -lm
LDADD = $(top_builddir)/libfaac/libfaac.la -lm

        
endif
endif