Menu
▾
▴
[Pmplib-commits] SF.net SVN: pmplib: [406] trunk/pmplib
|
From: <suc...@us...> - 2007-04-08 16:42:22
|
Revision: 406
http://svn.sourceforge.net/pmplib/?rev=406&view=rev
Author: sucknblow
Date: 2007-04-08 09:42:23 -0700 (Sun, 08 Apr 2007)
Log Message:
-----------
* Make use of the mp4v2 library optional, via --without-mp4v2
configure option.
* Run autoupdate - adds a little extra quoting to configure.in,
bumps AC_PREREQ, and remove obsolete AM_PROG_CC_STDC.
* Add libmp4v2-dev to list of Debian build dependencies.
Modified Paths:
--------------
trunk/pmplib/configure.in
trunk/pmplib/debian/control
trunk/pmplib/lib/gmi/Makefile.am
trunk/pmplib/lib/gmi/gmi.c
Added Paths:
-----------
trunk/pmplib/m4/mp4v2.m4
Modified: trunk/pmplib/configure.in
===================================================================
--- trunk/pmplib/configure.in 2007-04-08 14:52:22 UTC (rev 405)
+++ trunk/pmplib/configure.in 2007-04-08 16:42:23 UTC (rev 406)
@@ -10,7 +10,7 @@
dnl ------------------------------------------------------------------
dnl Initialization for autoconf
dnl ------------------------------------------------------------------
-AC_PREREQ(2.53)
+AC_PREREQ(2.61)
AC_INIT
AC_CONFIG_SRCDIR([frontend/easypmp/cui/main.c])
@@ -36,7 +36,6 @@
dnl ------------------------------------------------------------------
dnl Checks for program
dnl ------------------------------------------------------------------
-AM_PROG_CC_STDC
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_LN_S
@@ -127,7 +126,7 @@
dnl ------------------------------------------------------------------
AC_ARG_ENABLE(
debug,
- [AC_HELP_STRING(--enable-debug, [Turn on debugging])]
+ [AS_HELP_STRING([--enable-debug],[Turn on debugging])]
)
if test "$enable_debug" = "yes"; then
@@ -156,13 +155,13 @@
dnl Checks for id3tag
AC_ARG_WITH(
id3tag-header,
- [AC_HELP_STRING(--with-id3tag-header=DIR, [id3tag header directory])],
+ [AS_HELP_STRING([--with-id3tag-header=DIR],[id3tag header directory])],
[CFLAGS="-I$withval ${CFLAGS}"]
)
AC_ARG_WITH(
id3tag-library,
- [AC_HELP_STRING(--with-id3tag-library=DIR, [id3tag library directory])],
+ [AS_HELP_STRING([--with-id3tag-library=DIR],[id3tag library directory])],
[LDFLAGS="-L$withval ${LDFLAGS}"]
)
@@ -184,18 +183,8 @@
dnl Checks for vorbis
AM_PATH_VORBIS
-dnl Checks for libmp4v2
-AC_CHECK_HEADER(
- mp4.h,
- ,
- [AC_MSG_ERROR(mp4v2 header not found!)]
-)
-AC_CHECK_LIB(
- mp4v2,
- MP4Read,
- [MP4V2_LIBS="-lmp4v2"],
- AC_MSG_ERROR([mp4v2 library is not found!])
-)
+dnl Checks for mp4v2
+PMP_PATH_MP4V2
dnl Check for libsmjs (SpiderMonkey JavaScript engine)
AC_PATH_SPIDERMONKEY
@@ -245,7 +234,7 @@
dnl ------------------------------------------------------------------
AC_ARG_ENABLE(
versioned-libdir,
- [AC_HELP_STRING(--enable-versioned-libdir, [Include version number in plugins path])]
+ [AS_HELP_STRING([--enable-versioned-libdir],[Include version number in plugins path])]
)
if test "$enable_versioned_libdir" = "yes" ; then
PLUGIN_DIR=$PACKAGE-$VERSION
@@ -259,7 +248,7 @@
dnl ------------------------------------------------------------------
AC_ARG_ENABLE(
versioned-jspldir,
- [AC_HELP_STRING(--enable-versioned-jspldir, [Include version number in JSPL path])]
+ [AS_HELP_STRING([--enable-versioned-jspldir],[Include version number in JSPL path])]
)
if test "$enable_versioned_jspldir" = "yes" ; then
JSPL_DIR=$PACKAGE-$VERSION
@@ -280,9 +269,17 @@
AC_OUTPUT
if test -z "$JS_CFLAGS" ; then
+ echo
if test "$enable_js" != no ; then
- echo
echo " Warning: JavaScript interpreter engine not found"
fi
echo " pmplib will be build without support for JavaScript playlists."
fi
+
+if test -z "$HAVE_MP4V2" ; then
+ echo
+ if test "$with_mp4v2" != no ; then
+ echo " Warning: mp4v2 development files not found"
+ fi
+ echo " pmplib will be build without support for MP4 files."
+fi
Modified: trunk/pmplib/debian/control
===================================================================
--- trunk/pmplib/debian/control 2007-04-08 14:52:22 UTC (rev 405)
+++ trunk/pmplib/debian/control 2007-04-08 16:42:23 UTC (rev 406)
@@ -2,7 +2,7 @@
Section: sound
Priority: extra
Maintainer: Martin Ellis <ma...@do...>
-Build-Depends: debhelper (>= 5), libvorbis-dev, libid3tag0-dev, libmozjs-dev
+Build-Depends: debhelper (>= 5), libvorbis-dev, libid3tag0-dev, libmp4v2-dev, libmozjs-dev
Standards-Version: 3.7.2
Package: easypmp
Modified: trunk/pmplib/lib/gmi/Makefile.am
===================================================================
--- trunk/pmplib/lib/gmi/Makefile.am 2007-04-08 14:52:22 UTC (rev 405)
+++ trunk/pmplib/lib/gmi/Makefile.am 2007-04-08 16:42:23 UTC (rev 406)
@@ -2,10 +2,13 @@
noinst_LTLIBRARIES = libgmi.la
+if have_mp4v2
+ gmi_mp4v2_c=gmi_mp4v2.c
+endif
libgmi_la_SOURCES = \
../../include/gmi.h \
gmi_mp3.c \
- gmi_mp4v2.c \
+ $(gmi_mp4v2_c) \
gmi_wma.c \
gmi_wav.c \
gmi_vorbis.c \
Modified: trunk/pmplib/lib/gmi/gmi.c
===================================================================
--- trunk/pmplib/lib/gmi/gmi.c 2007-04-08 14:52:22 UTC (rev 405)
+++ trunk/pmplib/lib/gmi/gmi.c 2007-04-08 16:42:23 UTC (rev 406)
@@ -39,8 +39,10 @@
int gmi_mp3(media_info_t* info, const ucs2char_t *filename, const char *charset);
static const ucs2char_t ucs2cs_ext_mp3[] = {'.','m','p','3',0};
+#if HAVE_MP4V2
int gmi_mp4v2(media_info_t* info, const ucs2char_t *filename, const char *charset);
static const ucs2char_t ucs2cs_ext_m4a[] = {'.','m','4','a',0};
+#endif
int gmi_wma(media_info_t* info, const ucs2char_t *filename, const char *charset);
static const ucs2char_t ucs2cs_ext_wma[] = {'.','w','m','a',0};
@@ -58,7 +60,9 @@
static gmi_exports_t gmi_exports[] = {
{gmi_mp3, ucs2cs_ext_mp3},
+#if HAVE_MP4V2
{gmi_mp4v2, ucs2cs_ext_m4a},
+#endif
{gmi_wma, ucs2cs_ext_wma},
{gmi_vorbis, ucs2cs_ext_ogg},
{gmi_wav, ucs2cs_ext_wav},
Added: trunk/pmplib/m4/mp4v2.m4
===================================================================
--- trunk/pmplib/m4/mp4v2.m4 (rev 0)
+++ trunk/pmplib/m4/mp4v2.m4 2007-04-08 16:42:23 UTC (rev 406)
@@ -0,0 +1,32 @@
+AC_DEFUN([PMP_PATH_MP4V2],[
+dnl Checks for libmp4v2
+ AC_ARG_WITH(
+ mp4v2,
+ [AS_HELP_STRING([--without-mp4v2],[do not try to use mp4v2 for MP4 file support])]
+ )
+
+ if test "$with_mp4v2" != "no" ; then
+
+ AC_CHECK_HEADER(
+ [mp4.h],
+ [HAVE_MP4V2_HEADER="yes"],
+ AC_MSG_WARN(mp4v2 header not found!)
+ )
+
+ AC_CHECK_LIB(
+ mp4v2,
+ MP4Read,
+ [MP4V2_LIBS="-lmp4v2"],
+ AC_MSG_WARN([mp4v2 library is not found!])
+ )
+ fi
+
+ if test "$HAVE_MP4V2_HEADER" = "yes" -a "MP4V2_LIBS" != "" ; then
+ HAVE_MP4V2=yes
+ AC_DEFINE([HAVE_MP4_H], 1, [Define if you have the mp4.h header])
+ AC_SUBST(MP4V2_LIBS)
+ fi
+
+ AM_CONDITIONAL(have_mp4v2, test "$HAVE_MP4V2" = "yes")
+])
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
