[GNUnet-SVN] r12125 - in gnunet: . src src/fs src/monkey

[gnunet]

Author: grothoff
Date: 2010-07-02 16:21:43 +0200 (Fri, 02 Jul 2010)
New Revision: 12125

Modified:
   gnunet/configure.ac
   gnunet/src/Makefile.am
   gnunet/src/fs/Makefile.am
   gnunet/src/monkey/Makefile.am
Log:
adding tests for openssl and making sure that emstp is available when building 
monkey

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2010-07-02 14:17:43 UTC (rev 12124)
+++ gnunet/configure.ac 2010-07-02 14:21:43 UTC (rev 12125)
@@ -478,6 +478,44 @@
        [#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
 

Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am      2010-07-02 14:17:43 UTC (rev 12124)
+++ gnunet/src/Makefile.am      2010-07-02 14:21:43 UTC (rev 12125)
@@ -7,8 +7,10 @@
 endif
 
 if HAVE_ESMTP
+if HAVE_OPENSSL
  MONKEY_DIR = monkey
 endif
+endif
 
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \

Modified: gnunet/src/fs/Makefile.am
===================================================================
--- gnunet/src/fs/Makefile.am   2010-07-02 14:17:43 UTC (rev 12124)
+++ gnunet/src/fs/Makefile.am   2010-07-02 14:21:43 UTC (rev 12125)
@@ -164,8 +164,8 @@
  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 = \

Modified: gnunet/src/monkey/Makefile.am
===================================================================
--- gnunet/src/monkey/Makefile.am       2010-07-02 14:17:43 UTC (rev 12124)
+++ gnunet/src/monkey/Makefile.am       2010-07-02 14:21:43 UTC (rev 12125)
@@ -14,7 +14,8 @@
 
 bin_PROGRAMS = \
  gnunet-monkey \
- gnunet-service-monkey 
+ gnunet-service-monkey \
+ mail_sender
 
 noinst_PROGRAMS = \
  bug_null_pointer_exception 
@@ -55,6 +56,7 @@
        mail_sender.c
 mail_sender_LDADD = \
        $(top_builddir)/src/util/libgnunetutil.la \
+        -lesmtp \
        $(GN_LIBINTL)
 
 bug_null_pointer_exception_SOURCES = \