diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-02-23 10:48:08 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-02-23 10:48:08 +0100 |
commit | f1e8076ed474a429aff32839ed5f8fc20371839c (patch) | |
tree | bb38cb99b0e9cb7b937d33b539e74b9eb9fe4d32 /configure.ac | |
parent | 3d0f1dd3805bfef30ff7a7f8e246a926b7fa7838 (diff) | |
parent | 7b01b7b1760cc973719c9a20123f99e4a7e1b5a6 (diff) | |
download | gnunet-f1e8076ed474a429aff32839ed5f8fc20371839c.tar.gz gnunet-f1e8076ed474a429aff32839ed5f8fc20371839c.zip |
merge
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 58 |
1 files changed, 16 insertions, 42 deletions
diff --git a/configure.ac b/configure.ac index 3dd1ce3e6..87a60cb04 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,5 +1,5 @@ | |||
1 | # This file is part of GNUnet. | 1 | # This file is part of GNUnet. |
2 | # (C) 2001--2018 GNUnet e.V. | 2 | # (C) 2001--2019 GNUnet e.V. |
3 | # | 3 | # |
4 | # GNUnet is free software: you can redistribute it and/or modify it | 4 | # GNUnet is free software: you can redistribute it and/or modify it |
5 | # under the terms of the GNU Affero General Public License as published | 5 | # under the terms of the GNU Affero General Public License as published |
@@ -71,6 +71,7 @@ case "$host_os" in | |||
71 | CPPFLAGS="-D_APPLE_C_SOURCE $CPPFLAGS" | 71 | CPPFLAGS="-D_APPLE_C_SOURCE $CPPFLAGS" |
72 | CFLAGS="-fno-common $CFLAGS" | 72 | CFLAGS="-fno-common $CFLAGS" |
73 | AC_MSG_WARN([WARNING: The VPN application cannot be compiled on your OS]) | 73 | AC_MSG_WARN([WARNING: The VPN application cannot be compiled on your OS]) |
74 | AC_CHECK_LIB(intl, gettext) | ||
74 | build_target="darwin" | 75 | build_target="darwin" |
75 | DEFAULT_INTERFACE="\"en0\"" | 76 | DEFAULT_INTERFACE="\"en0\"" |
76 | LIBPREFIX= | 77 | LIBPREFIX= |
@@ -192,8 +193,8 @@ AC_UNALIGNED_64_ACCESS | |||
192 | 193 | ||
193 | # some other checks for standard libs | 194 | # some other checks for standard libs |
194 | AC_SEARCH_LIBS([gethostbyname], [nsl ws2_32]) | 195 | AC_SEARCH_LIBS([gethostbyname], [nsl ws2_32]) |
195 | AC_SEARCH_LIBS([memrchr], [], [], | 196 | AC_SEARCH_LIBS([memrchr], [], |
196 | AC_DEFINE(HAVE_MEMRCHR,1,[memrchr supported])) | 197 | AC_DEFINE(HAVE_MEMRCHR,1,[memrchr supported]), []) |
197 | AC_CHECK_LIB(socket, socket) | 198 | AC_CHECK_LIB(socket, socket) |
198 | AC_CHECK_LIB(m, log) | 199 | AC_CHECK_LIB(m, log) |
199 | AC_CHECK_LIB(c, getloadavg, AC_DEFINE(HAVE_GETLOADAVG,1,[getloadavg supported])) | 200 | AC_CHECK_LIB(c, getloadavg, AC_DEFINE(HAVE_GETLOADAVG,1,[getloadavg supported])) |
@@ -206,6 +207,13 @@ AM_CONDITIONAL(HAVE_SSH_BINARY, $VAR_SSH_BINARY) | |||
206 | AM_CONDITIONAL(HAVE_SSH_KEY, ssh -D 12345 -o "BatchMode yes" -o "UserKnownHostsFile /tmp/gnunet_test_cosks_ssh_garbage" -o "StrictHostKeyChecking no" 127.0.0.1 echo -n) | 207 | AM_CONDITIONAL(HAVE_SSH_KEY, ssh -D 12345 -o "BatchMode yes" -o "UserKnownHostsFile /tmp/gnunet_test_cosks_ssh_garbage" -o "StrictHostKeyChecking no" 127.0.0.1 echo -n) |
207 | rm -f /tmp/gnunet_test_cosks_ssh_garbage | 208 | rm -f /tmp/gnunet_test_cosks_ssh_garbage |
208 | 209 | ||
210 | # autotools' m4 for python has no maximum version! | ||
211 | # python3.7 for tests | ||
212 | m4_define_default([_AM_PYTHON_INTERPRETER_LIST],[python3 python3.7 python]) | ||
213 | AM_PATH_PYTHON([3.7],, [:]) | ||
214 | AC_SUBST([PYTHON]) | ||
215 | AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) | ||
216 | |||
209 | # iptables is a soft requirement to run tests | 217 | # iptables is a soft requirement to run tests |
210 | AC_PATH_TARGET_TOOL(VAR_IPTABLES_BINARY, iptables, false) | 218 | AC_PATH_TARGET_TOOL(VAR_IPTABLES_BINARY, iptables, false) |
211 | 219 | ||
@@ -369,7 +377,6 @@ AC_ARG_ENABLE(gcc-hardening, | |||
369 | LDFLAGS="$LDFLAGS -pie" | 377 | LDFLAGS="$LDFLAGS -pie" |
370 | fi]) | 378 | fi]) |
371 | 379 | ||
372 | |||
373 | # Linker hardening options | 380 | # Linker hardening options |
374 | # Currently these options are ELF specific - you can't use this with MacOSX | 381 | # Currently these options are ELF specific - you can't use this with MacOSX |
375 | AC_ARG_ENABLE(linker-hardening, | 382 | AC_ARG_ENABLE(linker-hardening, |
@@ -862,7 +869,7 @@ AS_IF([test x$my_with_libidn2 = x1], | |||
862 | LIBS="-lidn2 $LIBS" | 869 | LIBS="-lidn2 $LIBS" |
863 | AC_DEFINE_UNQUOTED([HAVE_LIBIDN2], | 870 | AC_DEFINE_UNQUOTED([HAVE_LIBIDN2], |
864 | [1], | 871 | [1], |
865 | [Define to 1 if you have 'libidn2' (-lidn).])], | 872 | [Define to 1 if you have 'libidn2' (-lidn2).])], |
866 | [MISSING_DEPS="${MISSING_DEPS}${MISSING_SEP}libidn2" | 873 | [MISSING_DEPS="${MISSING_DEPS}${MISSING_SEP}libidn2" |
867 | MISSING_SEP=", "])]) | 874 | MISSING_SEP=", "])]) |
868 | AM_CONDITIONAL(HAVE_LIBIDN2, test x$working_libidn2 = x1) | 875 | AM_CONDITIONAL(HAVE_LIBIDN2, test x$working_libidn2 = x1) |
@@ -1208,10 +1215,6 @@ AM_CONDITIONAL(HAVE_JSON, [test x$jansson = x1]) | |||
1208 | # restore LIBS | 1215 | # restore LIBS |
1209 | LIBS=$SAVE_LIBS | 1216 | LIBS=$SAVE_LIBS |
1210 | 1217 | ||
1211 | # check for python & pexpect (used for some testcases only) | ||
1212 | AM_PATH_PYTHON([2.6],, [:]) | ||
1213 | AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) | ||
1214 | |||
1215 | # check for gettext | 1218 | # check for gettext |
1216 | AM_GNU_GETTEXT([external]) | 1219 | AM_GNU_GETTEXT([external]) |
1217 | AM_GNU_GETTEXT_VERSION([0.18.1]) | 1220 | AM_GNU_GETTEXT_VERSION([0.18.1]) |
@@ -1297,6 +1300,8 @@ AC_SUBST(LIBPREFIX) | |||
1297 | AC_SUBST(DLLDIR) | 1300 | AC_SUBST(DLLDIR) |
1298 | AC_SUBST(EXT_LIB_PATH) | 1301 | AC_SUBST(EXT_LIB_PATH) |
1299 | 1302 | ||
1303 | DATAROOTDIR=$datarootdir | ||
1304 | AC_SUBST(DATAROOTDIR) | ||
1300 | 1305 | ||
1301 | # test for sudo | 1306 | # test for sudo |
1302 | AC_MSG_CHECKING(for sudo) | 1307 | AC_MSG_CHECKING(for sudo) |
@@ -1436,23 +1441,6 @@ AC_MSG_RESULT($enable_test_run) | |||
1436 | AM_CONDITIONAL([ENABLE_TEST_RUN], [test "x$enable_tests_run" = "xyes"]) | 1441 | AM_CONDITIONAL([ENABLE_TEST_RUN], [test "x$enable_tests_run" = "xyes"]) |
1437 | 1442 | ||
1438 | 1443 | ||
1439 | # should monkey be used when running (certain) services? | ||
1440 | AC_MSG_CHECKING(whether to run with monkey) | ||
1441 | AC_ARG_ENABLE([monkey], | ||
1442 | [AS_HELP_STRING([--enable-monkey], [enable running with monkey])], | ||
1443 | [enable_monkey=${enableval}], | ||
1444 | [enable_monkey=no]) | ||
1445 | AC_MSG_RESULT($enable_monkey) | ||
1446 | AM_CONDITIONAL([ENABLE_MONKEY], [test "x$enable_monkey" = "xyes"]) | ||
1447 | if test "x$enable_monkey" = "xyes" | ||
1448 | then | ||
1449 | MONKEYPREFIX="pathologist -d $(eval echo ${datarootdir}/gnunet/gnunet.sqlite) -p 30 --" | ||
1450 | else | ||
1451 | MONKEYPREFIX="" | ||
1452 | fi | ||
1453 | AC_SUBST(MONKEYPREFIX) | ||
1454 | |||
1455 | |||
1456 | AC_MSG_CHECKING([whether to compile in benchmarks (currently for http and crypto)]) | 1444 | AC_MSG_CHECKING([whether to compile in benchmarks (currently for http and crypto)]) |
1457 | AC_ARG_ENABLE([benchmark], | 1445 | AC_ARG_ENABLE([benchmark], |
1458 | [AS_HELP_STRING([--enable-benchmark], [enable benchmarking])], | 1446 | [AS_HELP_STRING([--enable-benchmark], [enable benchmarking])], |
@@ -1542,7 +1530,7 @@ AC_MSG_CHECKING(whether to start peer's services on demand by default) | |||
1542 | AC_ARG_ENABLE([autostart], | 1530 | AC_ARG_ENABLE([autostart], |
1543 | [AS_HELP_STRING([--disable-autostart], [do not start peer's services by default])], | 1531 | [AS_HELP_STRING([--disable-autostart], [do not start peer's services by default])], |
1544 | [enable_autostart=${enableval} | 1532 | [enable_autostart=${enableval} |
1545 | if test "x$enable_autostart" == "xno" | 1533 | if test "x$enable_autostart" = "xno" |
1546 | then | 1534 | then |
1547 | START_ON_DEMAND="NO" | 1535 | START_ON_DEMAND="NO" |
1548 | fi | 1536 | fi |
@@ -1766,8 +1754,6 @@ src/include/Makefile | |||
1766 | src/integration-tests/Makefile | 1754 | src/integration-tests/Makefile |
1767 | src/json/Makefile | 1755 | src/json/Makefile |
1768 | src/hostlist/Makefile | 1756 | src/hostlist/Makefile |
1769 | src/multicast/Makefile | ||
1770 | src/multicast/multicast.conf | ||
1771 | src/my/Makefile | 1757 | src/my/Makefile |
1772 | src/mysql/Makefile | 1758 | src/mysql/Makefile |
1773 | src/namecache/Makefile | 1759 | src/namecache/Makefile |
@@ -1787,11 +1773,6 @@ src/peerinfo-tool/Makefile | |||
1787 | src/peerstore/Makefile | 1773 | src/peerstore/Makefile |
1788 | src/peerstore/peerstore.conf | 1774 | src/peerstore/peerstore.conf |
1789 | src/pq/Makefile | 1775 | src/pq/Makefile |
1790 | src/psycutil/Makefile | ||
1791 | src/psyc/Makefile | ||
1792 | src/psyc/psyc.conf | ||
1793 | src/psycstore/Makefile | ||
1794 | src/psycstore/psycstore.conf | ||
1795 | src/pt/Makefile | 1776 | src/pt/Makefile |
1796 | src/regex/Makefile | 1777 | src/regex/Makefile |
1797 | src/regex/regex.conf | 1778 | src/regex/regex.conf |
@@ -1805,8 +1786,6 @@ src/scalarproduct/Makefile | |||
1805 | src/scalarproduct/scalarproduct.conf | 1786 | src/scalarproduct/scalarproduct.conf |
1806 | src/set/Makefile | 1787 | src/set/Makefile |
1807 | src/set/set.conf | 1788 | src/set/set.conf |
1808 | src/social/Makefile | ||
1809 | src/social/social.conf | ||
1810 | src/sq/Makefile | 1789 | src/sq/Makefile |
1811 | src/statistics/Makefile | 1790 | src/statistics/Makefile |
1812 | src/statistics/statistics.conf | 1791 | src/statistics/statistics.conf |
@@ -1842,7 +1821,6 @@ pkgconfig/gnunetdatacache.pc | |||
1842 | pkgconfig/gnunetdatastore.pc | 1821 | pkgconfig/gnunetdatastore.pc |
1843 | pkgconfig/gnunetdht.pc | 1822 | pkgconfig/gnunetdht.pc |
1844 | pkgconfig/gnunetdns.pc | 1823 | pkgconfig/gnunetdns.pc |
1845 | pkgconfig/gnunetdv.pc | ||
1846 | pkgconfig/gnunetenv.pc | 1824 | pkgconfig/gnunetenv.pc |
1847 | pkgconfig/gnunetfragmentation.pc | 1825 | pkgconfig/gnunetfragmentation.pc |
1848 | pkgconfig/gnunetfs.pc | 1826 | pkgconfig/gnunetfs.pc |
@@ -1850,21 +1828,17 @@ pkgconfig/gnunetgns.pc | |||
1850 | pkgconfig/gnunethello.pc | 1828 | pkgconfig/gnunethello.pc |
1851 | pkgconfig/gnunetidentity.pc | 1829 | pkgconfig/gnunetidentity.pc |
1852 | pkgconfig/gnunetmicrophone.pc | 1830 | pkgconfig/gnunetmicrophone.pc |
1853 | pkgconfig/gnunetmulticast.pc | ||
1854 | pkgconfig/gnunetmysql.pc | 1831 | pkgconfig/gnunetmysql.pc |
1855 | pkgconfig/gnunetnamestore.pc | 1832 | pkgconfig/gnunetnamestore.pc |
1856 | pkgconfig/gnunetnat.pc | 1833 | pkgconfig/gnunetnat.pc |
1857 | pkgconfig/gnunetnse.pc | 1834 | pkgconfig/gnunetnse.pc |
1858 | pkgconfig/gnunetpeerinfo.pc | 1835 | pkgconfig/gnunetpeerinfo.pc |
1859 | pkgconfig/gnunetpq.pc | 1836 | pkgconfig/gnunetpq.pc |
1860 | pkgconfig/gnunetpsyc.pc | ||
1861 | pkgconfig/gnunetpsycstore.pc | ||
1862 | pkgconfig/gnunetregex.pc | 1837 | pkgconfig/gnunetregex.pc |
1863 | pkgconfig/gnunetrevocation.pc | 1838 | pkgconfig/gnunetrevocation.pc |
1864 | pkgconfig/gnunetrps.pc | 1839 | pkgconfig/gnunetrps.pc |
1865 | pkgconfig/gnunetscalarproduct.pc | 1840 | pkgconfig/gnunetscalarproduct.pc |
1866 | pkgconfig/gnunetset.pc | 1841 | pkgconfig/gnunetset.pc |
1867 | pkgconfig/gnunetsocial.pc | ||
1868 | pkgconfig/gnunetspeaker.pc | 1842 | pkgconfig/gnunetspeaker.pc |
1869 | pkgconfig/gnunetstatistics.pc | 1843 | pkgconfig/gnunetstatistics.pc |
1870 | pkgconfig/gnunettestbed.pc | 1844 | pkgconfig/gnunettestbed.pc |
@@ -1974,7 +1948,7 @@ require fresh login to come into effect): | |||
1974 | "USERNAME" with the respective login names). If you have a global IP | 1948 | "USERNAME" with the respective login names). If you have a global IP |
1975 | address, no further configuration is required. | 1949 | address, no further configuration is required. |
1976 | 1950 | ||
1977 | For more detailed setup instructions, see https://gnunet.org/installation | 1951 | For more detailed setup instructions, see https://docs.gnunet.org/ |
1978 | 1952 | ||
1979 | Optionally, download and compile gnunet-gtk to get a GUI for | 1953 | Optionally, download and compile gnunet-gtk to get a GUI for |
1980 | file-sharing and configuration. This is particularly recommended | 1954 | file-sharing and configuration. This is particularly recommended |