From 7287c05ff44031be1e35f567357348310dfb5975 Mon Sep 17 00:00:00 2001 From: Erik Larsson Date: Wed, 15 Dec 2010 14:58:24 +0100 Subject: [PATCH] Made ntfsprogs compilation conditional and turned off by default. It is enabled with '--enable-ntfsprogs'. --- Makefile.am | 2 ++ configure.ac | 9 +++++++++ libntfs-3g/Makefile.am | 2 ++ ntfsprogs/Makefile.am | 4 ++++ 4 files changed, 17 insertions(+) diff --git a/Makefile.am b/Makefile.am index 5d139f0b..172e4f66 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,6 +34,7 @@ dist-hook: libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck +if ENABLE_NTFSPROGS strip: (cd ntfsprogs && $(MAKE) strip) || exit 1; @@ -44,3 +45,4 @@ extra: extras extras: libs (cd ntfsprogs && $(MAKE) extras) || exit 1; +endif diff --git a/configure.ac b/configure.ac index 29e27840..41c45bb0 100644 --- a/configure.ac +++ b/configure.ac @@ -128,6 +128,14 @@ AC_ARG_ENABLE( [enable_device_default_io_ops="yes"] ) +AC_ARG_ENABLE( + [ntfsprogs], + [AS_HELP_STRING([--enable-ntfsprogs],[enable ntfsprogs utilities + (default=no)])], + , + [enable_ntfsprogs="no"] +) + AC_ARG_ENABLE(crypto, AS_HELP_STRING(--enable-crypto,enable crypto related code and utilities (default=no)), , @@ -444,6 +452,7 @@ AM_CONDITIONAL([RUN_LDCONFIG], [test "${enable_ldconfig}" = "yes"]) AM_CONDITIONAL([REALLYSTATIC], [test "${enable_really_static}" = "yes"]) AM_CONDITIONAL([INSTALL_LIBRARY], [test "${enable_library}" = "yes"]) AM_CONDITIONAL([ENABLE_MOUNT_HELPER], [test "${enable_mount_helper}" = "yes"]) +AM_CONDITIONAL([ENABLE_NTFSPROGS], [test "${enable_ntfsprogs}" != "no"]) # workaround for