From 0699dd0841fe6a14bcdea9eabe83749d5233ceb7 Mon Sep 17 00:00:00 2001 From: "Barak A. Pearlmutter" Date: Sat, 18 Jul 2020 16:26:32 +0100 Subject: [PATCH 1/5] autoupdate --- configure.ac | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index c143af2..44dab36 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ -AC_PREREQ([2.60]) -AC_INIT([simple-mtpfs], [0.3.0], [phatina@gmail.com]) +AC_PREREQ([2.69]) +AC_INIT([simple-mtpfs],[0.3.0],[phatina@gmail.com]) AC_CONFIG_MACRO_DIR([m4]) @@ -78,11 +78,12 @@ else AC_MSG_WARN([Mounting by real device path is not supported. Fallback to / notation]); fi -AC_OUTPUT([ +AC_CONFIG_FILES([ makefile src/makefile man/makefile ]) +AC_OUTPUT AC_MSG_NOTICE([ From a3db5cfe5e95930d3c579f81cc69f567b4dc4264 Mon Sep 17 00:00:00 2001 From: "Barak A. Pearlmutter" Date: Sat, 18 Jul 2020 17:21:51 +0100 Subject: [PATCH 2/5] git ignore build debris --- .gitignore | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a8e1e04 --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +.deps/ +/aclocal.m4 +/autom4te.cache/ +/config.h +/config.h.in +/config.log +/config.status +/configure +/depcomp +/install-sh +/missing +/src/*.o +/src/simple-mtpfs +/stamp-h1 +makefile +makefile.in From 1c02d34ca3216690eef583f012c1f7368f96508d Mon Sep 17 00:00:00 2001 From: "Barak A. Pearlmutter" Date: Sat, 18 Jul 2020 20:01:49 +0100 Subject: [PATCH 3/5] update autotools scripts --- configure.ac | 8 ++-- m4/cxx11.m4 | 107 ------------------------------------------------ src/makefile.am | 4 +- 3 files changed, 6 insertions(+), 113 deletions(-) delete mode 100644 m4/cxx11.m4 diff --git a/configure.ac b/configure.ac index 44dab36..857bcdc 100644 --- a/configure.ac +++ b/configure.ac @@ -3,16 +3,16 @@ AC_INIT([simple-mtpfs],[0.3.0],[phatina@gmail.com]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AC_CONFIG_HEADERS(config.h) -AM_SILENT_RULES([yes]) +AM_INIT_AUTOMAKE([foreign dist-bzip2 -Wall]) +AC_CONFIG_SRCDIR([src/simple-mtpfs-fuse.cpp]) +AC_CONFIG_HEADERS([config.h]) AC_LANG([C++]) AC_PROG_CXX AC_PROG_INSTALL -m4_include([m4/cxx11.m4]) AX_CXX_COMPILE_STDCXX_11([noext]) +AX_CXXFLAGS_WARN_ALL AC_CHECK_LIB([mtp], [LIBMTP_Init], [], [AC_MSG_ERROR([libmtp not found])]) AC_CHECK_LIB([mtp], [LIBMTP_Check_Capability], [AC_DEFINE([HAVE_LIBMTP_CHECK_CAPABILITY], [1], [Check device capabilities])], diff --git a/m4/cxx11.m4 b/m4/cxx11.m4 deleted file mode 100644 index 0d96c07..0000000 --- a/m4/cxx11.m4 +++ /dev/null @@ -1,107 +0,0 @@ -# ============================================================================ -# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html -# ============================================================================ -# -# SYNOPSIS -# -# AX_CXX_COMPILE_STDCXX_11([ext|noext]) -# -# DESCRIPTION -# -# Check for baseline language coverage in the compiler for the C++11 -# standard; if necessary, add switches to CXXFLAGS to enable support. -# Errors out if no mode that supports C++11 baseline syntax can be found. -# The argument, if specified, indicates whether you insist on an extended -# mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. -std=c++11). -# If neither is specified, you get whatever works, with preference for an -# extended mode. -# -# LICENSE -# -# Copyright (c) 2008 Benjamin Kosnik -# Copyright (c) 2012 Zack Weinberg -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 1 - -m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [ - template - struct check - { - static_assert(sizeof(int) <= sizeof(T), "not big enough"); - }; - - typedef check> right_angle_brackets; - - int a; - decltype(a) b; - - typedef check check_type; - check_type c; - check_type&& cr = static_cast(c); -]) - -AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl - m4_if([$1], [], [], - [$1], [ext], [], - [$1], [noext], [], - [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl - AC_LANG_ASSERT([C++])dnl - ac_success=no - AC_CACHE_CHECK(whether $CXX supports C++11 features by default, - ax_cv_cxx_compile_cxx11, - [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], - [ax_cv_cxx_compile_cxx11=yes], - [ax_cv_cxx_compile_cxx11=no])]) - if test x$ax_cv_cxx_compile_cxx11 = xyes; then - ac_success=yes - fi - - m4_if([$1], [noext], [], [dnl - if test x$ac_success = xno; then - for switch in -std=gnu++11 -std=gnu++0x; do - cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) - AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, - $cachevar, - [ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS $switch" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], - [eval $cachevar=yes], - [eval $cachevar=no]) - CXXFLAGS="$ac_save_CXXFLAGS"]) - if eval test x\$$cachevar = xyes; then - CXXFLAGS="$CXXFLAGS $switch" - ac_success=yes - break - fi - done - fi]) - - m4_if([$1], [ext], [], [dnl - if test x$ac_success = xno; then - for switch in -std=c++11 -std=c++0x; do - cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) - AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, - $cachevar, - [ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS $switch" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], - [eval $cachevar=yes], - [eval $cachevar=no]) - CXXFLAGS="$ac_save_CXXFLAGS"]) - if eval test x\$$cachevar = xyes; then - CXXFLAGS="$CXXFLAGS $switch" - ac_success=yes - break - fi - done - fi]) - - if test x$ac_success = xno; then - AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.]) - fi -]) diff --git a/src/makefile.am b/src/makefile.am index b9b7da0..99ccb00 100644 --- a/src/makefile.am +++ b/src/makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = simple-mtpfs -simple_mtpfs_CXXFLAGS = -Wall -pedantic $(FUSE_CFLAGS) $(LIBUSB1_CFLAGS) -simple_mtpfs_CPPFLAGS = -DFUSE_USE_VERSION=28 +simple_mtpfs_CXXFLAGS = $(FUSE_CFLAGS) $(LIBUSB1_CFLAGS) $(AM_CXXFLAGS) +simple_mtpfs_CPPFLAGS = -DFUSE_USE_VERSION=28 $(AM_CPPFLAGS) simple_mtpfs_LDADD = $(MTP_LIBS) $(FUSE_LIBS) $(LIBUSB1_LIBS) simple_mtpfs_SOURCES = \ simple-mtpfs-fuse.h \ From 16948b0dea434d9d2b82c52096b66b3977c47028 Mon Sep 17 00:00:00 2001 From: "Barak A. Pearlmutter" Date: Sat, 18 Jul 2020 20:12:49 +0100 Subject: [PATCH 4/5] fuse include dir passed on include path --- src/simple-mtpfs-fuse.cpp | 2 +- src/simple-mtpfs-fuse.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/simple-mtpfs-fuse.cpp b/src/simple-mtpfs-fuse.cpp index f0de485..f842b06 100644 --- a/src/simple-mtpfs-fuse.cpp +++ b/src/simple-mtpfs-fuse.cpp @@ -19,7 +19,7 @@ #include extern "C" { # include -# include +# include # include # include } diff --git a/src/simple-mtpfs-fuse.h b/src/simple-mtpfs-fuse.h index b10683b..657cf12 100644 --- a/src/simple-mtpfs-fuse.h +++ b/src/simple-mtpfs-fuse.h @@ -23,7 +23,7 @@ #include #include extern "C" { -# include +# include } #include "simple-mtpfs-mtp-device.h" #include "simple-mtpfs-tmp-files-pool.h" From b1ec133f765ec7d9d994c7ccb5f39409de6f01ac Mon Sep 17 00:00:00 2001 From: "Barak A. Pearlmutter" Date: Sat, 18 Jul 2020 20:27:55 +0100 Subject: [PATCH 5/5] spelling --- src/simple-mtpfs-mtp-device.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/simple-mtpfs-mtp-device.cpp b/src/simple-mtpfs-mtp-device.cpp index 58e120a..3b80c7a 100644 --- a/src/simple-mtpfs-mtp-device.cpp +++ b/src/simple-mtpfs-mtp-device.cpp @@ -108,10 +108,10 @@ bool MTPDevice::connect_priv(int dev_no, const std::string &dev_file) logerr("Encountered a Memory Allocation Error. Exiting.\n"); break; case LIBMTP_ERROR_GENERAL: - logerr("General error occured. Exiting.\n"); + logerr("General error occurred. Exiting.\n"); break; case LIBMTP_ERROR_USB_LAYER: - logerr("USB Layer error occured. Exiting.\n"); + logerr("USB Layer error occurred. Exiting.\n"); break; default: break;