commit fe52be4cd26021e7f02bf88c87cd46d149319b15
Merge: 76ae6d1 53ddce8
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Tue May 3 20:39:19 2011 +0000
Merge branch 'master' into gtk-3.0
Conflicts:
configure.ac
ChangeLog | 247 ++++++++++++++++++++++++
NEWS | 18 ++
configure.ac | 7 +-
libgtkpod/gp_private.c | 2 +-
plugins/media_player/media_player.c | 5 +
plugins/repository_editor/repository_creator.c | 16 +-
version.sh | 4 +-
7 files changed, 290 insertions(+), 9 deletions(-)
---
diff --cc configure.ac
index 0334193,c2b191f..badb995
--- a/configure.ac
+++ b/configure.ac
@@@ -282,10 -277,13 +282,15 @@@ if test "x$have_faad" = "xyes"; the
fi
AM_CONDITIONAL(HAVE_FAAD, test "x$have_faad" = "xyes")
+
dnl Check for MP4 Headers
+dnl -------------------------------------------------------------
- AC_CHECK_HEADERS([mp4v2/platform.h], have_mp4=yes, have_mp4=no)
+ AC_CHECK_HEADERS([mp4v2/mp4v2.h], have_mp4=yes, have_mp4=no)
+ if test "x$have_mp4" = "xno"; then
+ dnl rollback to older mp4 library - should help with distros
+ dnl not using 1.9.1 of the mp4v2 library
+ AC_CHECK_HEADERS([mp4.h], have_mp4=yes, have_mp4=no)
+ fi
AC_CHECK_HEADERS([mp4v2/itmf_tags.h], [], [],
[#ifdef HAVE_MP4V2_PLATFORM_H
# include <mp4v2/platform.h>
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
