|
From: Anton A. <an...@us...> - 2005-08-04 10:36:51
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29862/ntfsprogs Modified Files: Makefile.am Log Message: Fix typo in ChangeLog (thanks Szaka!). Do more detection in configure.ac and in particular check for getopt_long, windows.h, wincrypt.h, and gcrypt.h and most importantly (for now) give command line option to enable crypto stuff and autodetect if libgcrypt is present. And only build ntfsdecrypt (still make extra only) only if both --enable-crypto was specified AND libgcrypt was found. Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.am,v retrieving revision 1.41 retrieving revision 1.42 diff -u -p -r1.41 -r1.42 --- Makefile.am 29 Jul 2005 15:51:49 -0000 1.41 +++ Makefile.am 4 Aug 2005 10:36:36 -0000 1.42 @@ -15,7 +15,7 @@ bin_PROGRAMS = ntfsfix ntfsinfo ntfsclu sbin_PROGRAMS = mkntfs ntfslabel ntfsundelete ntfsresize ntfsclone \ ntfscp EXTRA_PROGRAMS = ntfsdump_logfile ntfswipe ntfstruncate ntfsmove \ - ntfsrm ntfsmftalloc ntfsdecrypt + ntfsrm ntfsmftalloc man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 \ ntfsundelete.8 ntfsresize.8 ntfsprogs.8 ntfsls.8 \ @@ -33,6 +33,10 @@ if ENABLE_FUSE_MODULE bin_PROGRAMS += ntfsmount endif +if ENABLE_CRYPTO +EXTRA_PROGRAMS += ntfsdecrypt +endif + # Set the include path. AM_CPPFLAGS = -I$(top_srcdir)/include/ntfs $(all_includes) @@ -89,10 +93,6 @@ endif # We don't distribute these -ntfsdecrypt_SOURCES = ntfsdecrypt.c decrypt.c decrypt.h utils.c utils.h -ntfsdecrypt_LDADD = $(AM_LIBS) -ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) -lgcrypt - ntfsrm_SOURCES = ntfsrm.c ntfsrm.h utils.c utils.h ntfsrm_LDADD = $(AM_LIBS) ntfsrm_LDFLAGS = $(AM_LFLAGS) @@ -117,6 +117,12 @@ ntfsdump_logfile_SOURCES= ntfsdump_logfi ntfsdump_logfile_LDADD = $(AM_LIBS) ntfsdump_logfile_LDFLAGS= $(AM_LFLAGS) +if ENABLE_CRYPTO +ntfsdecrypt_SOURCES = ntfsdecrypt.c decrypt.c decrypt.h utils.c utils.h +ntfsdecrypt_LDADD = $(AM_LIBS) +ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) -lgcrypt +endif + # Extra targets strip: $(bin_PROGRAMS) $(sbin_PROGRAMS) @@ -125,4 +131,3 @@ strip: $(bin_PROGRAMS) $(sbin_PROGRAMS) extra: extras extras: $(EXTRA_PROGRAMS) - |
