- really support external mp4v2

[packages/faac.git] / faac-link.patch

diff --git a/faac-link.patch b/faac-link.patch
index fc1028161fbb792345ac157391eb48dc058b5e48..4015a1e4a3a3954f11b4f912da0c7e75edc94ba4 100644 (file)
--- a/faac-link.patch
+++ b/faac-link.patch
@@ -1,31 +1,31 @@
---- faac/libfaac/Makefile.am.orig      2003-10-17 18:41:05.000000000 +0200
-+++ faac/libfaac/Makefile.am   2004-02-09 21:50:24.505376480 +0100
-@@ -2,6 +2,7 @@
- 
- 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
- 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
-+libfaac_la_LIBADD = -lm
- 
- INCLUDES = -I$(top_srcdir)/include
- 
---- faac/frontend/Makefile.am.orig     2004-03-24 12:00:40.000000000 +0100
-+++ faac/frontend/Makefile.am  2004-04-23 22:13:07.649197000 +0200
-@@ -3,5 +3,5 @@
- faac_SOURCES = main.c input.c
- 
- INCLUDES = -I$(top_srcdir)/include 
--LDADD = $(top_builddir)/libfaac/libfaac.la -lm
-+LDADD = $(top_builddir)/libfaac/libfaac.la $(MP4LIBS) -lm
- 
---- faac/configure.in.orig     2004-04-16 11:49:09.000000000 +0200
-+++ faac/configure.in  2004-04-23 22:12:27.599285512 +0200
-@@ -24,7 +24,8 @@
- AC_CHECK_LIB(mp4v2, MP4MetadataDelete,
-                   [AC_MSG_NOTICE([*** Building with MP4 support ***])
-                    MY_DEFINE([HAVE_LIBMP4V2])
--                   LIBS="$LIBS -lstdc++ -lmp4v2"],
-+                   MP4LIBS="-lmp4v2"],
-                    [AC_MSG_NOTICE([*** Building without MP4 support ***])],
-                    -lstdc++)
-+AC_SUBST(MP4LIBS)
- AC_C_BIGENDIAN
+--- faac/frontend/Makefile.am.orig     2004-07-28 10:18:21.000000000 +0200
++++ faac/frontend/Makefile.am  2006-08-23 23:19:38.375803500 +0200
+@@ -7,5 +7,9 @@
+ LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++\r
+ else\r
+ INCLUDES = -I$(top_srcdir)/include \r
++if WITH_EXT_MP4V2\r
++LDADD = $(top_builddir)/libfaac/libfaac.la -lmp4v2 -lm -lstdc++\r
++else\r
+ LDADD = $(top_builddir)/libfaac/libfaac.la -lm\r
+ endif\r
++endif\r
+--- faac/configure.in.orig     2006-08-23 23:13:15.707888000 +0200
++++ faac/configure.in  2006-08-23 23:18:43.204355500 +0200
+@@ -27,6 +27,7 @@
+ AC_CHECK_LIB(gnugetopt, getopt_long)\r
+ \r
+ AM_CONDITIONAL(WITH_MP4V2, false)\r
++AM_CONDITIONAL(WITH_EXT_MP4V2, false)\r
+ \r
+ AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],\r
+                AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,\r
+@@ -35,6 +36,8 @@
+ \r
+ if test x$external_mp4v2 = xyes; then\r
+   AC_MSG_NOTICE([*** Building with external mp4v2 ***])\r
++  AM_CONDITIONAL(WITH_EXT_MP4V2, true)\r
++  MY_DEFINE(HAVE_LIBMP4V2)\r
+ else\r
+   if test x$WITHMP4V2 = xyes; then\r
+      AC_MSG_NOTICE([*** Building with internal mp4v2 ***])\r