diff options
author | Philip Langdale <philipl@overt.org> | 2013-03-16 22:00:37 -0700 |
---|---|---|
committer | Philip Langdale <philipl@overt.org> | 2013-03-16 22:03:17 -0700 |
commit | 5c61c7092d025242c74054f7eacd340d30e0b332 (patch) | |
tree | c32a25c086d68afe2dbaeb22d5298b7c5916c239 /configure.ac | |
parent | 7855cb474a061b0908a2fa8f4b3687f1d9759e97 (diff) | |
download | gvfs-5c61c7092d025242c74054f7eacd340d30e0b332.tar.gz |
MTP: Switch to version based checks for new libmtp features.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index c8f5579b..0f5ab9ab 100644 --- a/configure.ac +++ b/configure.ac @@ -544,18 +544,10 @@ if test "x$enable_libmtp" != "xno" -a "x$msg_gudev" = "xyes"; then PKG_CHECK_MODULES(LIBMTP, libmtp >= 1.1.0) AC_DEFINE(HAVE_LIBMTP, 1, [Define to 1 if libmtp is available]) - save_libs="$LIBS" - LIBS="$LIBMTP_LIBS" - AC_CHECK_LIB(mtp, LIBMTP_Get_Thumbnail, have_libmtp_get_thumbnail=yes) - if test "x$have_libmtp_get_thumbnail" = "xyes"; then - AC_DEFINE(HAVE_LIBMTP_GET_THUMBNAIL, 1, [Define to 1 if LIBMTP_Get_Thumbnail is available]) - fi - - AC_CHECK_LIB(mtp, LIBMTP_Read_Event, have_libmtp_read_event=yes) - if test "x$have_libmtp_read_event" = "xyes"; then - AC_DEFINE(HAVE_LIBMTP_READ_EVENT, 1, [Define to 1 if LIBMTP_Read_Event is available]) - fi - LIBS="$save_libs" + PKG_CHECK_MODULES(LIBMTP_1_1_5, libmtp >= 1.1.5, + AC_DEFINE(HAVE_LIBMTP_1_1_5, 1, [Define to 1 if libmtp 1.1.5 is available]), + [] + ) fi fi |