RepoMirrors
/
simple-mtpfs
mirror of https://github.com/phatina/simple-mtpfs
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #76 from barak/master 

minor build tweaks
This commit is contained in:
Peter Hatina 2020-07-19 11:31:11 +02:00 committed by GitHub
parent 9c763c0d59 b1ec133f76
commit a6ba1dd445
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 30 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.gitignore vendored Normal file
View File

@ -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

15
configure.ac
View File

@ -1,18 +1,18 @@
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])
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])],
@ -78,11 +78,12 @@ else
AC_MSG_WARN([Mounting by real device path is not supported. Fallback to <bus>/<device> notation]);
fi
AC_OUTPUT([
AC_CONFIG_FILES([
makefile
src/makefile
man/makefile
])
AC_OUTPUT
AC_MSG_NOTICE([

107
m4/cxx11.m4
View File

@ -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 <bkoz@redhat.com>
# Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
#
# 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 <typename T>
struct check
{
static_assert(sizeof(int) <= sizeof(T), "not big enough");
};
typedef check<check<bool>> right_angle_brackets;
int a;
decltype(a) b;
typedef check<int> check_type;
check_type c;
check_type&& cr = static_cast<check_type&&>(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
])

4
src/makefile.am
View File

@ -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 \

2
src/simple-mtpfs-fuse.cpp
View File

@ -19,7 +19,7 @@
#include <iostream>
extern "C" {
# include <errno.h>
# include <fuse/fuse_opt.h>
# include <fuse_opt.h>
# include <unistd.h>
# include <stddef.h>
}

2
src/simple-mtpfs-fuse.h
View File

@ -23,7 +23,7 @@
#include <string>
#include <cstdlib>
extern "C" {
# include <fuse/fuse.h>
# include <fuse.h>
}
#include "simple-mtpfs-mtp-device.h"
#include "simple-mtpfs-tmp-files-pool.h"

4
src/simple-mtpfs-mtp-device.cpp
View File

@ -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;