extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2025-02-16 17:50:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

automate build on Darwin, fix error from gcc 4.4

Browse Source 
git-svn-id: http://encfs.googlecode.com/svn/trunk@46 db9cf616-1c43-0410-9cb8-a902689de0d6
This commit is contained in:
Valient Gough 2009-11-23 05:24:05 +00:00
parent b5cecb2b71
commit a3d9440256
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure.ac
View File

@ -6,6 +6,12 @@ AM_INIT_AUTOMAKE(encfs, 1.5.1) dnl searches for some needed programs
RELEASE=1 RELEASE=1
AC_SUBST(RELEASE) AC_SUBST(RELEASE)
AC_CANONICAL_HOST
AM_CONDITIONAL([DARWIN],
[case $host_os in darwin*) true;; *) false;; esac])
AC_CONFIG_MACRO_DIR([m4])
dnl without this order in this file, automake will be confused! dnl without this order in this file, automake will be confused!
dnl dnl
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
@ -54,6 +60,11 @@ CPPFLAGS="$CPPFLAGS $USER_INCLUDES $FUSEFLAGS -D__STDC_FORMAT_MACROS"
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $USER_INCLUDES" CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $USER_INCLUDES"
LDFLAGS="$LDFLAGS $PTHREAD_LIBS $USER_LDFLAGS" LDFLAGS="$LDFLAGS $PTHREAD_LIBS $USER_LDFLAGS"
# default install path on Darwin of Macports, which is where rlog may be
if test -z "${DARWIN_TRUE}"; then
LDFLAGS="$LDFLAGS -L/opt/local/lib"
fi
if test "$GXX" = "yes"; then if test "$GXX" = "yes"; then
CXXFLAGS="-W -Wall -Wpointer-arith -Wwrite-strings $CXXFLAGS" CXXFLAGS="-W -Wall -Wpointer-arith -Wwrite-strings $CXXFLAGS"
dnl CXXFLAGS="$CXXFLAGS -Wformat=2 -Wconversion" dnl CXXFLAGS="$CXXFLAGS -Wformat=2 -Wconversion"
@ -64,11 +75,13 @@ AC_CHECK_HEADER(fuse.h,,
Can't find fuse.h - add the search path to CPPFLAGS and Can't find fuse.h - add the search path to CPPFLAGS and
rerun configure, eg: rerun configure, eg:
export CPPFLAGS=-I/usr/local/include ])]) export CPPFLAGS=-I/usr/local/include ])])
AC_CHECK_LIB(fuse,fuse_new, [FUSE_LIBS="-lfuse"], AC_CHECK_LIB(fuse_ino64,fuse_new, [FUSE_LIBS="-lfuse_ino64"],
[AC_MSG_ERROR([ [ AC_CHECK_LIB(fuse,fuse_new, [FUSE_LIBS="-lfuse"],
Can't find libfuse.a - add the search path to LDFLAGS [AC_MSG_ERROR([
and rerun configure, eg: Can't find libfuse.a - add the search path to LDFLAGS
export LDFLAGS=-L/usr/local/lib ])],) and rerun configure, eg:
export LDFLAGS=-L/usr/local/lib ])],)
],)
AC_SUBST(FUSE_LIBS) AC_SUBST(FUSE_LIBS)

5
encfs/Makefile.am
View File

@ -9,6 +9,11 @@ INCLUDES = $(all_includes) -I../intl
AM_CXXFLAGS = -DRLOG_COMPONENT="encfs" $(ALL_INCLUDES) AM_CXXFLAGS = -DRLOG_COMPONENT="encfs" $(ALL_INCLUDES)
if DARWIN
# needed to select correct API in fuse.h
AM_CXXFLAGS += -D__FreeBSD__=10
endif
if BUILD_NLS if BUILD_NLS
# define a C macro LOCALEDIR indicating where catalogs will be installed # define a C macro LOCALEDIR indicating where catalogs will be installed
#localedir = $(datadir)/locale #localedir = $(datadir)/locale

2
encfs/NameIO.cpp
View File

@ -190,7 +190,7 @@ std::string NameIO::recodePath( const char *path,
} else } else
{ {
bool isDotFile = (*path == '.'); bool isDotFile = (*path == '.');
char *next = strchr( path, '/' ); const char *next = strchr( path, '/' );
int len = next ? next - path : strlen( path ); int len = next ? next - path : strlen( path );
// at this point we know that len > 0 // at this point we know that len > 0