tomb

commit 48f8bf28fc70007c919011834d4c194c1c617d90
parent 6003623fe587d49bc3dcf5c3856bb4b7b4577c21
Author: boyska <piuttosto@logorroici.org>
Date:   Wed,  5 Sep 2012 17:47:40 +0200

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

Diffstat:
M
configure.ac
 | 
11
++++++++++-
M
src/kdf/Makefile.am
 | 
9
++++++++-

2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -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])
 
diff --git a/src/kdf/Makefile.am b/src/kdf/Makefile.am
@@ -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)