aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorReuben Thomas <rrt@sc3d.org>2010-10-05 14:11:20 +0000
committerReuben Thomas <rrt@sc3d.org>2010-10-05 14:11:20 +0000
commit2cd437b7b6a93fd7bb347d764876034c64ae557e (patch)
tree730e9563a928464a6ff6090cd8467180887b2c69 /configure.ac
parentbe21eeceee153ad521d91b94f145240d05e113a7 (diff)
downloadplptools-2cd437b7b6a93fd7bb347d764876034c64ae557e.tar.gz
plptools-2cd437b7b6a93fd7bb347d764876034c64ae557e.tar.bz2
plptools-2cd437b7b6a93fd7bb347d764876034c64ae557e.zip
Use pkg-config to test for FUSE; fixes builds on 64-bit systems.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac22
1 files changed, 1 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac
index d362285..b27c4b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,27 +108,7 @@ LIBHISTORY=${ac_cv_libhistory}
AC_SUBST(LIBHISTORY)
# FUSE for plpfuse
-enable_fuse=yes
-AC_CHECK_HEADER(fuse.h,, enable_fuse=no)
-AC_CHECK_LIB(fuse,fuse_new, [true], enable_fuse=no)
-
-# check for a supported version of FUSE
-AC_MSG_CHECKING([for supported FUSE API version])
-AC_RUN_IFELSE([
- AC_LANG_PROGRAM([[
- #define FUSE_USE_VERSION 26
- #include <fuse.h>]],
-[[
- if (FUSE_MAJOR_VERSION == 2 && FUSE_MINOR_VERSION >= 6)
- return 0;
- else
- return -1;
-]])],
- [AC_MSG_RESULT([yes])],
- [AC_MSG_RESULT([no])
- enable_fuse=no
- ]
-)
+PKG_CHECK_MODULES([FUSE], [fuse >= 2.6], [enable_fuse=yes], [enable_fuse=no])
# check for libattr for plpfuse
AC_CHECK_HEADER(attr/attributes.h,, enable_fuse=no)