Made ntfsprogs compilation conditional and turned off by default. It is enabled with '--enable-ntfsprogs'.

This commit is contained in:
Erik Larsson 2010-12-15 14:58:24 +01:00
parent f3a30779dd
commit 7287c05ff4
4 changed files with 17 additions and 0 deletions

View File

@ -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

View File

@ -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 <autoconf-2.60
if test -z "${docdir}"; then

View File

@ -78,5 +78,7 @@ if INSTALL_LIBRARY
$(RM) -f "$(DESTDIR)/$(rootlibdir)"/libntfs-3g.so*
endif
if ENABLE_NTFSPROGS
libs: $(lib_LTLIBRARIES)
endif

View File

@ -11,6 +11,8 @@ endif
# Workaround to make REALLYSTATIC work with automake 1.5.
LINK=$(STATIC_LINK) $(LIBTOOL_LINK)
if ENABLE_NTFSPROGS
bin_PROGRAMS = ntfsfix ntfsinfo ntfscluster ntfsls ntfscat ntfscmp
sbin_PROGRAMS = mkntfs ntfslabel ntfsundelete ntfsresize ntfsclone \
ntfscp
@ -137,3 +139,5 @@ install-data-hook:
uninstall-local:
$(RM) -f $(DESTDIR)/sbin/mkfs.ntfs
$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ntfs.8
endif