Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2024-11-10 15:10:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

KDF: now ./configure has --without-gcrypt

Browse Source
This commit is contained in:
boyska 2012-09-05 17:47:40 +02:00 committed by Jaromil
parent 6003623fe5
commit 48f8bf28fc
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -89,7 +89,16 @@ dnl ---------------------------------------------------------------
PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.16], :,
AC_MSG_ERROR([*** Gtk+2 >=2.16 development files not found!]))
AM_PATH_LIBGCRYPT([1.5.0], :, AC_MSG_ERROR([gcrypt development files not found]))
AC_ARG_WITH(gcrypt, "used for kdf=pbkdf2 [reccomended]", [], [with_gcrypt=check])
GCRYPT_DETECTED=no
AS_IF([test "x$with_gcrypt" != xno],
[ AM_PATH_LIBGCRYPT([1.5.0],
[GCRYPT_DETECTED=yes],
[if test "x$with_readline" != check; then
AC_MSG_ERROR([gcrypt development files not found])
fi]) ]
)
AM_CONDITIONAL([GCRYPT], [test "x$GCRYPT_DETECTED" = xyes])
AC_SUBST([GTK2_CFLAGS])
AC_SUBST([GTK2_LIBS])

9
src/kdf/Makefile.am
View File

@ -1,4 +1,11 @@
bin_PROGRAMS = tomb-kdf-pbkdf2 tomb-kdf-pbkdf2-gensalt tomb-kdf-pbkdf2-getiter hexencode
if GCRYPT
gcrypt_needing_programs = tomb-kdf-pbkdf2 tomb-kdf-pbkdf2-getiter
else
gcrypt_needing_programs=
endif
bin_PROGRAMS = $(gcrypt_needing_programs) tomb-kdf-pbkdf2-gensalt hexencode
tomb_kdf_pbkdf2_SOURCES = pbkdf2/pbkdf2.c
tomb_kdf_pbkdf2_CFLAGS = $(LIBGCRYPT_CFLAGS)
tomb_kdf_pbkdf2_LDADD = $(LIBGCRYPT_LIBS)