|
From: Anton A. <an...@us...> - 2005-08-04 10:36:51
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29862 Modified Files: ChangeLog configure.ac 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: ChangeLog =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v retrieving revision 1.262 retrieving revision 1.263 diff -u -p -r1.262 -r1.263 --- ChangeLog 4 Aug 2005 09:59:39 -0000 1.262 +++ ChangeLog 4 Aug 2005 10:36:35 -0000 1.263 @@ -5,7 +5,7 @@ - Move ntfs2utc and utc2ntfs from utils.[ch] to ntfstime.h. (Yura, Anton) - Add [acm]time fields to struct ntfs_inode and set them during - ntfs_inode_openi(). Update ntfsmount to use them. (Yura) + ntfs_inode_open(). Update ntfsmount to use them. (Yura) - index.c::ntfs_index_lookup(): Fix bug when index context did not point to the index root in which the entry located. (Yura) - ntfsresize: relocate_attributes(): Do not stop processing MFT record Index: configure.ac =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v retrieving revision 1.69 retrieving revision 1.70 diff -u -p -r1.69 -r1.70 --- configure.ac 4 Aug 2005 00:00:28 -0000 1.69 +++ configure.ac 4 Aug 2005 10:36:35 -0000 1.70 @@ -51,7 +51,7 @@ fi # Command-line options. AC_ARG_ENABLE(debug, AS_HELP_STRING(--enable-debug,enable additional debugging code and - output), , + output), , enable_debug=no ) @@ -77,14 +77,20 @@ AC_ARG_ENABLE(gnome-vfs, ) AC_ARG_ENABLE(fuse-module, - AS_HELP_STRING(--disable-fuse-module,omit FUSE 'libntfs' - interface (default=detect)), , + AS_HELP_STRING(--disable-fuse-module,omit FUSE 'libntfs' interface + (default=detect)), , enable_fuse_module=auto ) +AC_ARG_ENABLE(crypto, + AS_HELP_STRING(--enable-crypto,enable crypto related code and utilities + (default=no)), , + enable_crypto=no +) + AC_ARG_ENABLE(really-static, - AS_HELP_STRING(--enable-really-static,create completely static - binaries for the utilities), , + AS_HELP_STRING(--enable-really-static,create completely static binaries + for the utilities), , enable_really_static=no ) AM_CONDITIONAL(REALLYSTATIC, test "$enable_really_static" = yes) @@ -150,6 +156,20 @@ if test "$enable_fuse_module" != "no"; t fi AM_CONDITIONAL(ENABLE_FUSE_MODULE, $compile_fuse_module) +# Autodetect whether we can build crypto stuff or not. +compile_crypto=false +if test "$enable_crypto" != "no"; then + PKG_CHECK_MODULES(CRYPTO, [libgcrypt], [ compile_crypto=true ], + [ + if test "$enable_crypto" = "yes"; then + AC_MSG_ERROR([Linux-NTFS crypto code requires the gcrypt library.]) + else + AC_MSG_WARN([Linux-NTFS crypto code requires the gcrypt library.]) + fi + ]) +fi +AM_CONDITIONAL(ENABLE_CRYPTO, $compile_crypto) + # add --with-extra-includes and --with-extra-libs switch to ./configure all_libraries="$all_libraries $USER_LDFLAGS" all_includes="$all_includes $USER_INCLUDES" @@ -217,7 +237,7 @@ AC_CHECK_HEADERS([ctype.h fcntl.h libint errno.h time.h unistd.h utime.h wchar.h getopt.h features.h endian.h \ byteswap.h sys/byteorder.h sys/endian.h sys/param.h sys/ioctl.h \ sys/mount.h sys/stat.h sys/types.h sys/vfs.h linux/major.h linux/fd.h \ - linux/hdreg.h machine/endian.h]) + linux/hdreg.h machine/endian.h gcrypt.h windows.h wincrypt.h]) # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL @@ -243,7 +263,7 @@ AC_FUNC_UTIME_NULL AC_FUNC_VPRINTF AC_CHECK_FUNCS([atexit fdatasync hasmntopt memmove memset regcomp setlocale \ strcasecmp strchr strdup strerror strtol strtoul utime mbsinit \ - setxattr]) + setxattr getopt_long ]) # Makefiles to be created by configure. AC_CONFIG_FILES([ |
