]>
Commit | Line | Data |
---|---|---|
bbc11d99 JB |
1 | --- faad2/plugins/xmms/src/Makefile.am.orig 2004-02-06 17:05:07.000000000 +0100 |
2 | +++ faad2/plugins/xmms/src/Makefile.am 2004-02-11 00:21:02.637575048 +0100 | |
3 | @@ -1,12 +1,20 @@ | |
4 | libdir = `$(XMMS_CONFIG) --input-plugin-dir` | |
5 | lib_LTLIBRARIES = libmp4.la | |
6 | ||
7 | +if WITH_MP4V2 | |
8 | +LIBMP4V2 = $(top_builddir)/common/mp4v2/libmp4v2.la | |
9 | +MP4V2_flags = -I$(top_srcdir)/common/mp4v2 | |
10 | +else | |
11 | +LIBMP4V2 = -lmp4v2 | |
12 | +MP4V2_flags = | |
13 | +endif | |
14 | + | |
15 | libmp4_la_CFLAGS = `$(XMMS_CONFIG) --cflags` -Wall \ | |
16 | `$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1 \ | |
17 | - -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2 | |
18 | + -I$(top_srcdir)/include $(MP4V2_flags) | |
19 | ||
20 | libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \ | |
21 | - $(top_builddir)/common/mp4v2/libmp4v2.la | |
22 | + $(LIBMP4V2) | |
23 | ||
24 | libmp4_la_LDFLAGS = -module -avoid-version `$(XMMS_CONFIG) --libs` \ | |
25 | `$(GTK_CONFIG) --libs` -lpthread -lstdc++ | |
26 | --- faad2/configure.in.orig 2004-02-06 17:04:39.000000000 +0100 | |
27 | +++ faad2/configure.in 2004-02-11 00:17:31.385690216 +0100 | |
28 | @@ -102,8 +102,10 @@ | |
29 | fi | |
30 | ||
31 | AM_CONDITIONAL(HAVE_XMMS, true) | |
32 | + if test x$external_mp4v2 != xyes; then | |
33 | AC_MSG_NOTICE("xmms plugin requires libmp4v2 to be build") | |
34 | AM_CONDITIONAL(WITH_MP4V2, true) | |
35 | + fi | |
36 | AC_CONFIG_FILES(plugins/xmms/Makefile plugins/xmms/src/Makefile) | |
37 | else | |
38 | AC_MSG_NOTICE(no xmms build configured) |