| | 1 | --- configure.ac.orig 2011-07-25 21:25:36.000000000 -0400 |
| | 2 | +++ configure.ac 2011-07-25 21:27:48.000000000 -0400 |
| | 3 | @@ -67,41 +67,10 @@ |
| | 4 | dnl CXXFLAGS="$CXXFLAGS -Wformat=2 -Wconversion" |
| | 5 | fi |
| | 6 | |
| | 7 | -AC_CHECK_HEADER(fuse.h,, |
| | 8 | - [AC_MSG_ERROR([ |
| | 9 | - Can't find fuse.h - add the search path to CPPFLAGS and |
| | 10 | - rerun configure, eg: |
| | 11 | - export CPPFLAGS=-I/usr/local/include ])]) |
| | 12 | -AC_CHECK_LIB(fuse_ino64,fuse_new, [FUSE_LIBS="-lfuse_ino64"], |
| | 13 | - [ AC_CHECK_LIB(fuse,fuse_new, [FUSE_LIBS="-lfuse"], |
| | 14 | - [AC_MSG_ERROR([ |
| | 15 | - Can't find libfuse.a - add the search path to LDFLAGS |
| | 16 | - and rerun configure, eg: |
| | 17 | - export LDFLAGS=-L/usr/local/lib ])],) |
| | 18 | - ],) |
| | 19 | +PKG_CHECK_MODULES([FUSE], [fuse >= 2.5]) |
| | 20 | |
| | 21 | AC_SUBST(FUSE_LIBS) |
| | 22 | |
| | 23 | -# check for a supported FUSE_MAJOR_VERSION. |
| | 24 | -AC_MSG_CHECKING([For supported FUSE API version]) |
| | 25 | -AC_RUN_IFELSE([ |
| | 26 | - AC_LANG_PROGRAM([[#include "fuse.h"]], |
| | 27 | -[[ |
| | 28 | - if(FUSE_MAJOR_VERSION == 2 && FUSE_MINOR_VERSION >= 5) |
| | 29 | - { |
| | 30 | - return 0; |
| | 31 | - } else |
| | 32 | - return -1; |
| | 33 | -]])], |
| | 34 | - [AC_MSG_RESULT([yes])], |
| | 35 | - [AC_MSG_RESULT([no]) |
| | 36 | - AC_MSG_FAILURE([ |
| | 37 | -Encfs 1.3 requires FUSE 2.5 or newer. Please check config.log for errors. If |
| | 38 | -you cannot determine the problem, mail encfs-users@lists.sourceforge.net |
| | 39 | -and include the config.log file]) |
| | 40 | - ] |
| | 41 | -) |
| | 42 | - |
| | 43 | dnl fuse_operations.setxattr was added 2004-03-31 |
| | 44 | dnl only enable it if setxattr function is found.. |
| | 45 | AC_CHECK_HEADERS([attr/xattr.h sys/xattr.h]) |
