adding tests for openssl and making sure that emstp is available when building monkey

3 files changed, 7 insertions, 3 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 46189da71..106643368 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,8 +7,10 @@ if !MINGW
 endif
 
 if HAVE_ESMTP
+if HAVE_OPENSSL
  MONKEY_DIR = monkey
 endif
+endif
 
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 5a532d15f..62dae940e 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -164,8 +164,8 @@ TESTS = \
  test_fs_test_lib \
  test_gnunet_service_fs_migration \
  test_gnunet_service_fs_p2p \
- $(check_SCRIPTS) \
-# $(check_PROGRAMS)
+ $(check_SCRIPTS)  \
+ $(check_PROGRAMS)
 
 
 test_fs_collection_SOURCES = \
diff --git a/src/monkey/Makefile.am b/src/monkey/Makefile.am
index 8fee75733..dee65d729 100644
--- a/src/monkey/Makefile.am
+++ b/src/monkey/Makefile.am
@@ -14,7 +14,8 @@ if !MINGW
 
 bin_PROGRAMS = \
  gnunet-monkey \
- gnunet-service-monkey 
+ gnunet-service-monkey \
+ mail_sender
 
 noinst_PROGRAMS = \
  bug_null_pointer_exception 
@@ -55,6 +56,7 @@ mail_sender_SOURCES = \
         mail_sender.c
 mail_sender_LDADD = \
         $(top_builddir)/src/util/libgnunetutil.la \
+        -lesmtp \
         $(GN_LIBINTL)
 
 bug_null_pointer_exception_SOURCES = \