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

diff --git a/configure.ac b/configure.ac
index 0f1a7c91dd6cbc473be2e7137c33c344025c8f0c..70d47378b0c7c529d514c1fdc532ade1e3d6f092 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -478,6 +478,44 @@ AC_ARG_WITH(microhttpd,
        [#include "src/include/platform.h"])])
 AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1)
 AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd])
+
+
+# openssl
+openssl=0
+AC_MSG_CHECKING([for openssl])
+AC_ARG_WITH(openssl,
+   [  --with-openssl=PFX   base of openssl installation],
+   [AC_MSG_RESULT([$with_openssl])
+    case $with_openssl in
+      no)
+        ;;
+      yes)
+        AC_CHECK_HEADERS([openssl/ssl.h],
+            AC_CHECK_LIB([ssl], [SSL_new],
+            openssl=1))
+        ;;
+      *)
+        LDFLAGS="-L$with_openssl/lib $LDFLAGS"
+        CPPFLAGS="-I$with_openssl/include $CPPFLAGS"
+        AC_CHECK_HEADERS([openssl/ssl.h],
+            AC_CHECK_LIB([ssl], [SSL_new],
+              EXT_LIB_PATH="-L$with_openssl/lib $EXT_LIB_PATH"
+              openssl=1))
+        ;;
+    esac
+   ],
+   [AC_MSG_RESULT([--with-openssl not specified])
+    AC_CHECK_HEADERS([openssl/ssl.h],
+        AC_CHECK_LIB([ssl], [SSL_new],
+          openssl=1))])
+AM_CONDITIONAL(HAVE_OPENSSL, test x$openssl = x1)
+AC_DEFINE_UNQUOTED([HAVE_OPENSSL], $openssl, [We have openssl])
+
+
+
+
+
+
 # restore LIBS
 LIBS=$SAVE_LIBS
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 46189da719f766549ccd92f14fbf79338504d762..1066433687aa5807412b074bd2fbee7307e5167a 100644 (file)
--- 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 5a532d15fa3f50ccc0463a88d4475c74263ac30b..62dae940e0b9b26205608fda0b177eb3629f5f5c 100644 (file)
--- 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 8fee7573376cb24f04287e0a7a2ede54654d77e5..dee65d729292c9a09ed52ca075071e092115abac 100644 (file)
--- 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 = \