ref: 58b5f3d3568d3c904fc0b9cece3f520f09625b8a
parent: 3355b74f09a966b393fd49c7230e1161ba4bcfaf
author: menno <menno>
date: Mon Aug 23 15:16:11 EDT 2004
Linux fix
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@
dnl - libmp4ff.a (only static for moment)
dnl - faad
dnl - xmms input mp4/aac plugin
-dnl - mpeg4ip plugin (broken) -> disable for moment
+dnl - mpeg4ip plugin (requires mpeg4ip's libmp4v2 to be installed)
AC_INIT
AC_CONFIG_AUX_DIR(.)
@@ -35,6 +35,9 @@
dnl AC_ARG_WITH(mp4v2,[ --with-mp4v2 compile libmp4v2],
dnl WITHMP4V2=$withval, WITHMP4V2=no)
+AC_ARG_WITH(mpeg4ip, [ --with-mpeg4ip compile mpeg4ip plugin],
+ WITHMPEG4IP=$withval, WITHMPEG4IP=no)
+
dnl Checks for header files required for mp4.h
AC_HEADER_STDC
AC_CHECK_HEADERS(stdint.h inttypes.h)
@@ -106,6 +109,17 @@
dnl AM_CONDITIONAL(WITH_MP4V2, true)
dnl fi
dnl fi
+
+AC_CHECK_PROG(external_mp4v2, mpeg4ip-config, yes, no)
+AM_CONDITIONAL(HAVE_MPEG4IP_PLUG, false)
+if test x$WITHMPEG4IP = xyes; then
+ if test x$external_mp4v2 = xyes; then
+ AM_CONDITIONAL(HAVE_MPEG4IP_PLUG, true)
+ AC_MSG_NOTICE("Building MPEG4IP plugin")+ else
+ AC_MSG_NOTICE("MPEG4IP libmp4v2 is required for MPEG4IP plugin")+ fi
+fi
if test x$WITHXMMS = xyes; then
AC_CHECK_PROGS(XMMS_CONFIG, xmms-config,"not_found")
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,5 +1,14 @@
+if HAVE_MPEG4IP_PLUG
if HAVE_XMMS
+SUBDIRS = xmms mpeg4ip
+else
+SUBDIRS = mpeg4ip
+endif
+else
+if HAVE_XMMS
SUBDIRS = xmms
else
SUBDIRS =
endif
+endif
+