diff options
| author | IBBoard <dev@ibboard.co.uk> | 2013-01-05 09:24:28 +0000 |
|---|---|---|
| committer | Bertrand Lorentz <bertrand.lorentz@gmail.com> | 2013-01-06 15:37:58 +0100 |
| commit | de85d6a2fbcf0b88f8b7024aefc5397b69efea09 (patch) | |
| tree | 2315437ca7075f9ef04501baf650c62cadbeb991 /build/m4 | |
| parent | aee01f847105daeee48b97291ad69502ca5b6f74 (diff) | |
Mtp: Fix file type in sync with libmtp > 1.1.0 (bgo#688540)
libmtp 1.1.0 added a new file type at the beginning of the FileType
enum. Update the enum to match and made it conditional based on the
detected libmtp features.
Signed-off-by: Bertrand Lorentz <bertrand.lorentz@gmail.com>
Diffstat (limited to 'build/m4')
| -rw-r--r-- | build/m4/banshee/dap-mtp.m4 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/build/m4/banshee/dap-mtp.m4 b/build/m4/banshee/dap-mtp.m4 index 0721b92b5..264d32b26 100644 --- a/build/m4/banshee/dap-mtp.m4 +++ b/build/m4/banshee/dap-mtp.m4 @@ -21,10 +21,19 @@ AC_DEFUN([BANSHEE_CHECK_DAP_MTP], 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"]) ]) |