opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deleted libntfs example crypto configuration file and removed the check for libconfig in configure.ac. (libconfig is not used in libntfs-3g.)

edge.strict_endians
Erik Larsson 2010-12-17 09:37:19 +01:00
parent 1edc6fbc9a
commit 58b40c8cf1
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -294,17 +294,8 @@ if test "$enable_crypto" != "no"; then
AC_MSG_WARN([ntfsprogs crypto code requires the gnutls library.]) AC_MSG_WARN([ntfsprogs crypto code requires the gnutls library.])
fi fi
) )
have_libconfig=false
PKG_CHECK_MODULES(libconfig, libconfig >= 1.0.1, [ have_libconfig=true ],
if test "$enable_crypto" = "yes"; then
AC_MSG_ERROR([ntfsprogs crypto code requires the libconfig.])
else
AC_MSG_WARN([ntfsprogs crypto code requires the libconfig.])
fi
)
if test "$have_libgcrypt" = "true"; then if test "$have_libgcrypt" = "true"; then
if test "$have_libgnutls" = "true"; then if test "$have_libgnutls" = "true"; then
if test "$have_libconfig" = "true"; then
compile_crypto=true compile_crypto=true
AC_DEFINE([ENABLE_CRYPTO], 1, AC_DEFINE([ENABLE_CRYPTO], 1,
[Define this to 1 if you want to enable support of [Define this to 1 if you want to enable support of
@ -312,7 +303,6 @@ if test "$enable_crypto" != "no"; then
fi fi
fi fi
fi fi
fi
AM_CONDITIONAL(ENABLE_CRYPTO, $compile_crypto) AM_CONDITIONAL(ENABLE_CRYPTO, $compile_crypto)
# add --with-extra-includes and --with-extra-libs switch to ./configure # add --with-extra-includes and --with-extra-libs switch to ./configure

10
libntfs/config
View File

@ -1,10 +0,0 @@
# libntfs sample configuration file
crypto : {
keys = (
("/home/yura/ntfs/my3.pfx", "my3"), # key with password
# ("/home/yura/ntfs/my-rec.pfx", ""), // password-less key
("/home/yura/ntfs/my.pfx") /* password-less key */
);
};