(no commit message)

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 41157ca29e79f21f1e7906f5b27ca755270a306b..9a86199bd3f4ab52bff27a6a6d5c7839464e1e21 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -484,6 +484,18 @@ AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd])
 # restore LIBS
 LIBS=$SAVE_LIBS
 
+# check for python & pexpect (used for some testcases only)
+AC_MSG_CHECKING([for python and pexpect])
+python -c "import pexpect" &> /dev/null
+PYEX=$?
+AM_CONDITIONAL(HAVE_PYTHON_PEXPECT, test $PYEX -eq 0)
+if test $PYEX -eq 0
+then
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([not found])
+fi
+
 # libesmtp
 esmtp=0
 AC_MSG_CHECKING([for libesmtp])
@@ -587,13 +599,6 @@ AC_ARG_WITH(daemon-config-dir,
                 [default daemon config directory (/etc)]),
         [gn_daemon_config_dir=$withval])
 AC_SUBST(GN_DAEMON_CONFIG_DIR, $gn_daemon_config_dir)
-gn_daemon_pidfile="/var/run/gnunetd/pid"
-AC_ARG_WITH(daemon-pidfile,
-        AC_HELP_STRING(
-                [--with-daemon-pidfile=FILE],
-                [default daemon pidfile (/var/run/gnunetd/pid)]),
-        [gn_daemon_pidfile=$withval])
-AC_SUBST(GN_DAEMON_PIDFILE, $gn_daemon_pidfile)
 
 GN_INTLINCL=""
 GN_LIBINTL="$LTLIBINTL"
@@ -645,6 +650,8 @@ src/arm/Makefile
 src/core/Makefile
 src/datacache/Makefile
 src/datastore/Makefile
+src/dv/Makefile
+src/dht/Makefile
 src/fragmentation/Makefile
 src/fs/Makefile
 src/hello/Makefile
@@ -655,6 +662,7 @@ src/nat/Makefile
 src/nat/libnatpmp/Makefile
 src/nat/miniupnp/Makefile
 src/peerinfo/Makefile
+src/peerinfo-tool/Makefile
 src/statistics/Makefile
 src/template/Makefile
 src/testing/Makefile