nicer build system

diff --git a/configure.ac b/configure.ac
index 70d47378b0c7c529d514c1fdc532ade1e3d6f092..d5a4f09a645dafc09a369162cfbe50c8ea4ddbdc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -735,7 +735,17 @@ then
  AC_MSG_NOTICE([NOTICE: libmicrohttpd not found, http transport will not be installed.])
 fi
 
-AC_MSG_NOTICE([NOTICE: Database support is set to MySQL: $mysql, SQLite: $sqlite])
+if test "x$esmtp" != "x1"
+then
+ AC_MSG_NOTICE([NOTICE: libesmtp not found, monkey will not be installed.])
+fi
+
+if test "x$ssl" != "x1"
+then
+ AC_MSG_NOTICE([NOTICE: OpenSSL not found, monkey will not be installed.])
+fi
+
+AC_MSG_NOTICE([NOTICE: Database support is set to MySQL: $mysql, SQLite: $sqlite, Postgres: $postgres])
 
 if test "$enable_framework_build" = "yes"
 then

diff --git a/src/monkey/Makefile.am b/src/monkey/Makefile.am
index b0394787fa2225af217613e9dd1528feb50fc5bf..6c8c6f9b3eca80419e51896c8e4cb690e5e6b951 100644 (file)
--- a/src/monkey/Makefile.am
+++ b/src/monkey/Makefile.am
@@ -11,6 +11,8 @@ endif
 
 
 if !MINGW
+if HAVE_ESMTP
+if HAVE_OPENSSL
 
 bin_PROGRAMS = \
  gnunet-monkey \
@@ -75,4 +77,6 @@ EXTRA_DIST = \
   $(check_SCRIPTS) 
 
 endif
+endif
+endif
 

diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index 3ec124c5e508b4061db321cc770e63fb6faf9219..57be6832d5cdc5842921638d0e9ba228f5cbf030 100644 (file)
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -10,6 +10,8 @@ if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
+if !MINGW
+
 lib_LTLIBRARIES = libgnunetnat.la
 
 libgnunetnat_la_SOURCES = \
@@ -42,3 +44,4 @@ test_nat_LDADD = \
  $(top_builddir)/src/nat/libgnunetnat.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
+endif
\ No newline at end of file