diff --git a/configure.ac b/configure.ac index 6a8e705..09b9aa2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([gcfuse], [0.9.1], [mike@multimedia.cx]) -AM_INIT_AUTOMAKE([gcfuse], [0.9.1]) +AM_INIT_AUTOMAKE([1.11 foreign]) AC_CONFIG_HEADER([src/config.h]) AC_PROG_CC @@ -7,14 +7,7 @@ AC_PROG_CC CPPFLAGS="$CPPFLAGS -Wall `getconf LFS_CFLAGS`" LDFLAGS="$LDFLAGS `getconf LFS_LDFLAGS`" -AC_CHECK_LIB([fuse], [fuse_main], , AC_MSG_ERROR([Unable to find libfuse])) - -AC_HEADER_STDC -AC_CHECK_HEADER([fuse/fuse.h], , AC_MSG_ERROR([Unable to find fuse.h])) -AC_PREPROC_IFELSE( -[#define FUSE_USE_VERSION 25 -#include ] -, , AC_MSG_ERROR([You need FUSE version 2.5.x])) +PKG_CHECK_MODULES([FUSE], [fuse >= 2.5]) AC_C_CONST diff --git a/src/Makefile.am b/src/Makefile.am index eca21c2..23c748e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,5 @@ bin_PROGRAMS = gcfuse gcfuse_SOURCES = tree.c gcfs.c main.c noinst_HEADERS = tree.h gcfs.h +gcfuse_CFLAGS = $(CFLAGS) $(FUSE_CFLAGS) +gcfuse_LDADD = $(LDFLAGS) $(FUSE_LDFLAGS) $(FUSE_LIBS)