commit ed8bbaef9fbe8607bd236c88ecfb343160dfc6da
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Mon Feb 7 21:38:05 2011 +0000
Tidy up m4a filetype plugin enablement
* configure.ac
* m4a plugin enablement depends on both mp4 library and faad
configure.ac | 10 +++++++++-
plugins/filetype_m4a/Makefile.am | 4 +---
2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c3e7f3b..73293b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -299,6 +299,14 @@ AC_CHECK_HEADERS([mp4v2/itmf_tags.h], [], [],
])
AM_CONDITIONAL(HAVE_MP4, test "x$have_mp4" = "xyes")
+dnl Set up variables for M4A plugin
+if test "x$have_mp4" = "xyes" -a "x$have_faad" = "xyes"; then
+ have_m4a="yes"
+else
+ have_m4a="no"
+fi
+AM_CONDITIONAL(HAVE_M4A, test "x$have_m4a" = "xyes")
+
# Check that we have endian.h
AC_CHECK_HEADERS(endian.h, have_endian=yes, have_endian=no)
if test "x$have_endian" = "xno"; then
@@ -519,7 +527,7 @@ Plugin Configuration :
echo " CoverWeb Browser .....: $coverweb"
echo " Media Player .....: $media_player"
echo " MP4 File Type .....: $have_mp4"
-echo " M4A File Type .....: $have_mp4"
+echo " M4A File Type .....: $have_m4a"
echo " Flac File Type .....: $have_flac"
echo " Ogg File Type .....: $have_ogg"
diff --git a/plugins/filetype_m4a/Makefile.am b/plugins/filetype_m4a/Makefile.am
index 249f81b..bbd4c0b 100644
--- a/plugins/filetype_m4a/Makefile.am
+++ b/plugins/filetype_m4a/Makefile.am
@@ -19,8 +19,7 @@ filetype_m4a_plugin_DATA =
SUBDIRS =
-if HAVE_MP4
-if HAVE_FAAD
+if HAVE_M4A
include ../plugins.mk
filetype_m4a.plugin: build-plugin-file
@@ -42,7 +41,6 @@ libfiletype_m4a_la_LIBADD = \
$(LIBANJUTA_LIBS)
endif
-endif
EXTRA_DIST = \
$(plugin_file).in \
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
