diff options
| author | Bertrand Lorentz <bertrand.lorentz@gmail.com> | 2013-01-06 16:20:07 +0100 |
|---|---|---|
| committer | Bertrand Lorentz <bertrand.lorentz@gmail.com> | 2013-01-06 16:20:07 +0100 |
| commit | 40a78764595406f6576826164fa11d893e601535 (patch) | |
| tree | 5e2338796e024f3e5518438a86700e8d32939347 /build/m4 | |
| parent | de85d6a2fbcf0b88f8b7024aefc5397b69efea09 (diff) | |
build: Bump libmtp dependency to 1.1.0
Libmtp 1.1.0 has been released in June 2011 and has several ABI changes
compared to 0.3.0. Requiring this version allows us to get rid of
several compile-time checks and trickery.
Original suggestion and patch by IBBoard and Andres Aragoneses.
Diffstat (limited to 'build/m4')
| -rw-r--r-- | build/m4/banshee/dap-mtp.m4 | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/build/m4/banshee/dap-mtp.m4 b/build/m4/banshee/dap-mtp.m4 index 264d32b26..b939f6fc5 100644 --- a/build/m4/banshee/dap-mtp.m4 +++ b/build/m4/banshee/dap-mtp.m4 @@ -1,6 +1,6 @@ AC_DEFUN([BANSHEE_CHECK_DAP_MTP], [ - LIBMTP_REQUIRED=0.3.0 + LIBMTP_REQUIRED=1.1.0 AC_ARG_ENABLE(mtp, AC_HELP_STRING([--disable-mtp], [Disable MTP DAP support]), , enable_mtp="yes") @@ -17,23 +17,9 @@ AC_DEFUN([BANSHEE_CHECK_DAP_MTP], if test "x$enable_libmtp" = "xyes"; then LIBMTP_SO_MAP=$(basename $(find $($PKG_CONFIG --variable=libdir libmtp) -maxdepth 1 -regex '.*libmtp\.so\.[[0-9]][[0-9]]*$' | sort | tail -n 1)) AC_SUBST(LIBMTP_SO_MAP) - AC_CHECK_MEMBER([struct LIBMTP_track_struct.modificationdate], - LIBMTP_HAS_MODDATE=yes, - LIBMTP_HAS_MODDATE=no, - [[#include <libmtp.h>]]) - - AC_MSG_CHECKING([whether LIBMTP_FILETYPE_FOLDER enum value is defined]) - AC_COMPUTE_INT([LIBMTP_HAS_FOLDER], [LIBMTP_FILETYPE_FOLDER], [#include <libmtp.h>], LIBMTP_HAS_FOLDER=no) - if test "x$LIBMTP_HAS_FOLDER" = "xno"; then - AC_MSG_RESULT([no]) - else - AC_MSG_RESULT([yes]) - fi fi AM_CONDITIONAL(ENABLE_MTP, test "x$enable_libmtp" = "xyes") - AM_CONDITIONAL(LIBMTP_TRACK_STRUCT_HAS_MODDATE, [test "$LIBMTP_HAS_MODDATE" = "yes"]) - AM_CONDITIONAL(LIBMTP_FILETYPE_ENUM_HAS_FOLDER, [test "$LIBMTP_HAS_FOLDER" = "0"]) AC_CHECK_SIZEOF(time_t) AM_CONDITIONAL(LIBMTP_SIZEOF_TIME_T_64, [test "x$ac_cv_sizeof_time_t" = "x8"]) ]) |