summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-02-20 10:05:26 +0100
committerChristian Grothoff <christian@grothoff.org>2019-02-20 10:05:26 +0100
commit756799b50daeaaec1dc0594f1506d83bbef7d4b5 (patch)
treee8a568b3318669537e5c799478703a2cf0ed4396 /configure.ac
parent4a1e326038f86f496af3a33c3786253fe80cdf0a (diff)
fix build system to actually handle openssl.cnf properly
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac23
1 files changed, 2 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac
index b3caee676..8b93d8d6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -377,10 +377,6 @@ AC_ARG_ENABLE(gcc-hardening,
LDFLAGS="$LDFLAGS -pie"
fi])
-# gnunet-gns-proxy-setup-ca requires openssl and certutil (nss)
-AC_CHECK_PROG(have_openssl, [openssl], [yes], [no])
-AC_CHECK_PROG(have_certutil, [certutil], [yes], [no])
-
# Linker hardening options
# Currently these options are ELF specific - you can't use this with MacOSX
AC_ARG_ENABLE(linker-hardening,
@@ -1304,6 +1300,8 @@ AC_SUBST(LIBPREFIX)
AC_SUBST(DLLDIR)
AC_SUBST(EXT_LIB_PATH)
+DATAROOTDIR=$datarootdir
+AC_SUBST(DATAROOTDIR)
# test for sudo
AC_MSG_CHECKING(for sudo)
@@ -1443,23 +1441,6 @@ AC_MSG_RESULT($enable_test_run)
AM_CONDITIONAL([ENABLE_TEST_RUN], [test "x$enable_tests_run" = "xyes"])
-# should monkey be used when running (certain) services?
-AC_MSG_CHECKING(whether to run with monkey)
-AC_ARG_ENABLE([monkey],
- [AS_HELP_STRING([--enable-monkey], [enable running with monkey])],
- [enable_monkey=${enableval}],
- [enable_monkey=no])
-AC_MSG_RESULT($enable_monkey)
-AM_CONDITIONAL([ENABLE_MONKEY], [test "x$enable_monkey" = "xyes"])
-if test "x$enable_monkey" = "xyes"
-then
- MONKEYPREFIX="pathologist -d $(eval echo ${datarootdir}/gnunet/gnunet.sqlite) -p 30 --"
-else
- MONKEYPREFIX=""
-fi
-AC_SUBST(MONKEYPREFIX)
-
-
AC_MSG_CHECKING([whether to compile in benchmarks (currently for http and crypto)])
AC_ARG_ENABLE([benchmark],
[AS_HELP_STRING([--enable-benchmark], [enable benchmarking])],