diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-07-02 14:21:43 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-07-02 14:21:43 +0000 |
commit | 2bb0569cbeba81e8742a6852acd68b07e3e4a41b (patch) | |
tree | c28c4feca8bef5e1ea4f0f0e499b4a70dc31ba8f | |
parent | 77504f563640fa80a5e0e3575d0ebab03af99862 (diff) | |
download | gnunet-2bb0569cbeba81e8742a6852acd68b07e3e4a41b.tar.gz gnunet-2bb0569cbeba81e8742a6852acd68b07e3e4a41b.zip |
adding tests for openssl and making sure that emstp is available when building monkey
-rw-r--r-- | configure.ac | 38 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/fs/Makefile.am | 4 | ||||
-rw-r--r-- | src/monkey/Makefile.am | 4 |
4 files changed, 45 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 0f1a7c91d..70d47378b 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -478,6 +478,44 @@ AC_ARG_WITH(microhttpd, | |||
478 | [#include "src/include/platform.h"])]) | 478 | [#include "src/include/platform.h"])]) |
479 | AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1) | 479 | AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1) |
480 | AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd]) | 480 | AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd]) |
481 | |||
482 | |||
483 | # openssl | ||
484 | openssl=0 | ||
485 | AC_MSG_CHECKING([for openssl]) | ||
486 | AC_ARG_WITH(openssl, | ||
487 | [ --with-openssl=PFX base of openssl installation], | ||
488 | [AC_MSG_RESULT([$with_openssl]) | ||
489 | case $with_openssl in | ||
490 | no) | ||
491 | ;; | ||
492 | yes) | ||
493 | AC_CHECK_HEADERS([openssl/ssl.h], | ||
494 | AC_CHECK_LIB([ssl], [SSL_new], | ||
495 | openssl=1)) | ||
496 | ;; | ||
497 | *) | ||
498 | LDFLAGS="-L$with_openssl/lib $LDFLAGS" | ||
499 | CPPFLAGS="-I$with_openssl/include $CPPFLAGS" | ||
500 | AC_CHECK_HEADERS([openssl/ssl.h], | ||
501 | AC_CHECK_LIB([ssl], [SSL_new], | ||
502 | EXT_LIB_PATH="-L$with_openssl/lib $EXT_LIB_PATH" | ||
503 | openssl=1)) | ||
504 | ;; | ||
505 | esac | ||
506 | ], | ||
507 | [AC_MSG_RESULT([--with-openssl not specified]) | ||
508 | AC_CHECK_HEADERS([openssl/ssl.h], | ||
509 | AC_CHECK_LIB([ssl], [SSL_new], | ||
510 | openssl=1))]) | ||
511 | AM_CONDITIONAL(HAVE_OPENSSL, test x$openssl = x1) | ||
512 | AC_DEFINE_UNQUOTED([HAVE_OPENSSL], $openssl, [We have openssl]) | ||
513 | |||
514 | |||
515 | |||
516 | |||
517 | |||
518 | |||
481 | # restore LIBS | 519 | # restore LIBS |
482 | LIBS=$SAVE_LIBS | 520 | LIBS=$SAVE_LIBS |
483 | 521 | ||
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 | |||
7 | endif | 7 | endif |
8 | 8 | ||
9 | if HAVE_ESMTP | 9 | if HAVE_ESMTP |
10 | if HAVE_OPENSSL | ||
10 | MONKEY_DIR = monkey | 11 | MONKEY_DIR = monkey |
11 | endif | 12 | endif |
13 | endif | ||
12 | 14 | ||
13 | SUBDIRS = \ | 15 | SUBDIRS = \ |
14 | include $(INTLEMU_SUBDIRS) \ | 16 | 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 = \ | |||
164 | test_fs_test_lib \ | 164 | test_fs_test_lib \ |
165 | test_gnunet_service_fs_migration \ | 165 | test_gnunet_service_fs_migration \ |
166 | test_gnunet_service_fs_p2p \ | 166 | test_gnunet_service_fs_p2p \ |
167 | $(check_SCRIPTS) \ | 167 | $(check_SCRIPTS) \ |
168 | # $(check_PROGRAMS) | 168 | $(check_PROGRAMS) |
169 | 169 | ||
170 | 170 | ||
171 | test_fs_collection_SOURCES = \ | 171 | 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 | |||
14 | 14 | ||
15 | bin_PROGRAMS = \ | 15 | bin_PROGRAMS = \ |
16 | gnunet-monkey \ | 16 | gnunet-monkey \ |
17 | gnunet-service-monkey | 17 | gnunet-service-monkey \ |
18 | mail_sender | ||
18 | 19 | ||
19 | noinst_PROGRAMS = \ | 20 | noinst_PROGRAMS = \ |
20 | bug_null_pointer_exception | 21 | bug_null_pointer_exception |
@@ -55,6 +56,7 @@ mail_sender_SOURCES = \ | |||
55 | mail_sender.c | 56 | mail_sender.c |
56 | mail_sender_LDADD = \ | 57 | mail_sender_LDADD = \ |
57 | $(top_builddir)/src/util/libgnunetutil.la \ | 58 | $(top_builddir)/src/util/libgnunetutil.la \ |
59 | -lesmtp \ | ||
58 | $(GN_LIBINTL) | 60 | $(GN_LIBINTL) |
59 | 61 | ||
60 | bug_null_pointer_exception_SOURCES = \ | 62 | bug_null_pointer_exception_SOURCES = \ |