From 16ba09b70fbed22bc4397a0923efb67bd66bd16e Mon Sep 17 00:00:00 2001 From: Erik Larsson Date: Thu, 1 Jul 2010 19:10:02 +0200 Subject: [PATCH] Introduced a pkg-config check for libntfs-3g at configure time, using the CFLAGS and LDFLAGS specified in the .pc file. --- configure.ac | 4 ++++ ntfsprogs/Makefile.am | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index c38fe821..3dd68d46 100644 --- a/configure.ac +++ b/configure.ac @@ -232,6 +232,10 @@ if test "$enable_fuse_module" != "no"; then fi AM_CONDITIONAL(ENABLE_FUSE_MODULE, $compile_fuse_module) +PKG_CHECK_MODULES(NTFS_3G_MODULE, libntfs-3g >= 2009.4.4, [], + AC_MSG_ERROR([ntfs-3g.progs requires libntfs-3g version >= 2009.4.4.]) +) + # Autodetect whether we can build crypto stuff or not. compile_crypto=false if test "$enable_crypto" != "no"; then diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am index bfb99c4b..7aeeea41 100644 --- a/ntfsprogs/Makefile.am +++ b/ntfsprogs/Makefile.am @@ -3,8 +3,9 @@ AM_LIBS = AM_LFLAGS = -static STATIC_LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ else -AM_LIBS = -AM_LFLAGS = $(all_libraries) -lntfs-3g +AM_LIBS = $(NTFS_3G_MODULE_LIBS) +AM_CFLAGS = $(NTFS_3G_MODULE_CFLAGS) +AM_LFLAGS = $(all_libraries) LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ endif