diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-07-03 06:53:33 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-07-03 06:53:33 +0000 |
commit | 0eb708afde86ce4e342bb19b7caac55e314c04c1 (patch) | |
tree | 366091e86633cc0a37d8bc565657e90e4fbd9bd2 | |
parent | dead1b9df9816132d97f716916fc478c997a2822 (diff) | |
download | gnunet-0eb708afde86ce4e342bb19b7caac55e314c04c1.tar.gz gnunet-0eb708afde86ce4e342bb19b7caac55e314c04c1.zip |
nicer build system
-rw-r--r-- | configure.ac | 12 | ||||
-rw-r--r-- | src/monkey/Makefile.am | 4 | ||||
-rw-r--r-- | src/nat/Makefile.am | 3 |
3 files changed, 18 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 70d47378b..d5a4f09a6 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -735,7 +735,17 @@ then | |||
735 | AC_MSG_NOTICE([NOTICE: libmicrohttpd not found, http transport will not be installed.]) | 735 | AC_MSG_NOTICE([NOTICE: libmicrohttpd not found, http transport will not be installed.]) |
736 | fi | 736 | fi |
737 | 737 | ||
738 | AC_MSG_NOTICE([NOTICE: Database support is set to MySQL: $mysql, SQLite: $sqlite]) | 738 | if test "x$esmtp" != "x1" |
739 | then | ||
740 | AC_MSG_NOTICE([NOTICE: libesmtp not found, monkey will not be installed.]) | ||
741 | fi | ||
742 | |||
743 | if test "x$ssl" != "x1" | ||
744 | then | ||
745 | AC_MSG_NOTICE([NOTICE: OpenSSL not found, monkey will not be installed.]) | ||
746 | fi | ||
747 | |||
748 | AC_MSG_NOTICE([NOTICE: Database support is set to MySQL: $mysql, SQLite: $sqlite, Postgres: $postgres]) | ||
739 | 749 | ||
740 | if test "$enable_framework_build" = "yes" | 750 | if test "$enable_framework_build" = "yes" |
741 | then | 751 | then |
diff --git a/src/monkey/Makefile.am b/src/monkey/Makefile.am index b0394787f..6c8c6f9b3 100644 --- a/src/monkey/Makefile.am +++ b/src/monkey/Makefile.am | |||
@@ -11,6 +11,8 @@ endif | |||
11 | 11 | ||
12 | 12 | ||
13 | if !MINGW | 13 | if !MINGW |
14 | if HAVE_ESMTP | ||
15 | if HAVE_OPENSSL | ||
14 | 16 | ||
15 | bin_PROGRAMS = \ | 17 | bin_PROGRAMS = \ |
16 | gnunet-monkey \ | 18 | gnunet-monkey \ |
@@ -75,4 +77,6 @@ EXTRA_DIST = \ | |||
75 | $(check_SCRIPTS) | 77 | $(check_SCRIPTS) |
76 | 78 | ||
77 | endif | 79 | endif |
80 | endif | ||
81 | endif | ||
78 | 82 | ||
diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am index 3ec124c5e..57be6832d 100644 --- a/src/nat/Makefile.am +++ b/src/nat/Makefile.am | |||
@@ -10,6 +10,8 @@ if USE_COVERAGE | |||
10 | AM_CFLAGS = -fprofile-arcs -ftest-coverage | 10 | AM_CFLAGS = -fprofile-arcs -ftest-coverage |
11 | endif | 11 | endif |
12 | 12 | ||
13 | if !MINGW | ||
14 | |||
13 | lib_LTLIBRARIES = libgnunetnat.la | 15 | lib_LTLIBRARIES = libgnunetnat.la |
14 | 16 | ||
15 | libgnunetnat_la_SOURCES = \ | 17 | libgnunetnat_la_SOURCES = \ |
@@ -42,3 +44,4 @@ test_nat_LDADD = \ | |||
42 | $(top_builddir)/src/nat/libgnunetnat.la \ | 44 | $(top_builddir)/src/nat/libgnunetnat.la \ |
43 | $(top_builddir)/src/util/libgnunetutil.la | 45 | $(top_builddir)/src/util/libgnunetutil.la |
44 | 46 | ||
47 | endif \ No newline at end of file | ||