[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12148 - in gnunet: . src/monkey src/nat
From: |
gnunet |
Subject: |
[GNUnet-SVN] r12148 - in gnunet: . src/monkey src/nat |
Date: |
Sat, 3 Jul 2010 08:53:33 +0200 |
Author: grothoff
Date: 2010-07-03 08:53:33 +0200 (Sat, 03 Jul 2010)
New Revision: 12148
Modified:
gnunet/configure.ac
gnunet/src/monkey/Makefile.am
gnunet/src/nat/Makefile.am
Log:
nicer build system
Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2010-07-02 22:21:51 UTC (rev 12147)
+++ gnunet/configure.ac 2010-07-03 06:53:33 UTC (rev 12148)
@@ -735,8 +735,18 @@
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
AC_MSG_NOTICE([NOTICE: Mac OS X framework build enabled.])
Modified: gnunet/src/monkey/Makefile.am
===================================================================
--- gnunet/src/monkey/Makefile.am 2010-07-02 22:21:51 UTC (rev 12147)
+++ gnunet/src/monkey/Makefile.am 2010-07-03 06:53:33 UTC (rev 12148)
@@ -11,6 +11,8 @@
if !MINGW
+if HAVE_ESMTP
+if HAVE_OPENSSL
bin_PROGRAMS = \
gnunet-monkey \
@@ -75,4 +77,6 @@
$(check_SCRIPTS)
endif
+endif
+endif
Modified: gnunet/src/nat/Makefile.am
===================================================================
--- gnunet/src/nat/Makefile.am 2010-07-02 22:21:51 UTC (rev 12147)
+++ gnunet/src/nat/Makefile.am 2010-07-03 06:53:33 UTC (rev 12148)
@@ -10,6 +10,8 @@
AM_CFLAGS = -fprofile-arcs -ftest-coverage
endif
+if !MINGW
+
lib_LTLIBRARIES = libgnunetnat.la
libgnunetnat_la_SOURCES = \
@@ -42,3 +44,4 @@
$(top_builddir)/src/nat/libgnunetnat.la \
$(top_builddir)/src/util/libgnunetutil.la
+endif
\ No newline at end of file
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12148 - in gnunet: . src/monkey src/nat,
gnunet <=