mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-30 10:38:37 +00:00
18057130d3
assignment 2. instead of unconditionally setting LIBS in CONFIGURE_ENV use automake logc to correctly set library dependencies for the case when external libmp4v2 is used Fix #2 also fixes build with non-base gcc: configure stage would pass LIBS to all invocations of gcc and linking would fail because libmp4v2 is a C++ library, but non-base gcc (as opposed to g++) doesn't know where to look for the correct libstdc++. PR: 149765 Submitted by: Andriy Gapon <avg@icyb.net.ua>
15 lines
550 B
Plaintext
15 lines
550 B
Plaintext
--- frontend/Makefile.am.orig 2010-08-18 15:43:04.246728673 +0300
|
|
+++ frontend/Makefile.am 2010-08-18 15:45:44.922966543 +0300
|
|
@@ -7,6 +7,11 @@ if WITH_MP4V2
|
|
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
|
|
LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++
|
|
else
|
|
+if WITH_EXT_MP4V2
|
|
+INCLUDES = -I$(top_srcdir)/include
|
|
+LDADD = $(top_builddir)/libfaac/libfaac.la -lmp4v2 -lm -lstdc++
|
|
+else
|
|
INCLUDES = -I$(top_srcdir)/include
|
|
LDADD = $(top_builddir)/libfaac/libfaac.la -lm
|
|
endif
|
|
+endif
|