X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=53db0bfaf457bccc203c66c0df75b9cfa30573f6;hb=3ad52c948d69799351c4a98cd04294d470c49e66;hp=82a94cd460d23e5dd2fa9ea92dff7a82673fc198;hpb=855fbf5b9db9ff680c15e6fd21382c4d7afffc84;p=oweals%2Fgnunet.git diff --git a/configure.ac b/configure.ac index 82a94cd46..53db0bfaf 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ # AC_PREREQ(2.61) # Checks for programs. -AC_INIT([gnunet], [0.11.6], [bug-gnunet@gnu.org]) +AC_INIT([gnunet], [0.11.8], [bug-gnunet@gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) # check for legacy option that is no longer supported (#5627) and fail hard @@ -48,7 +48,7 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET AM_PROG_CC_C_O -LT_INIT([disable-static dlopen win32-dll]) +LT_INIT([disable-static dlopen]) AC_SUBST(MKDIR_P) # allow for different autotools @@ -132,8 +132,6 @@ AS_CASE(["$host_os"], AC_PATH_XTRA ], [*freebsd*],[ - AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) - AC_DEFINE_UNQUOTED(FREEBSD,1,[This is a FreeBSD system]) CFLAGS="-D_THREAD_SAFE $CFLAGS" build_target="freebsd" LIBPREFIX= @@ -141,17 +139,14 @@ AS_CASE(["$host_os"], UNIXONLY="#" ], [*openbsd*],[ - AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) - AC_DEFINE_UNQUOTED(OPENBSD,1,[This is an OpenBSD system]) LIBS=`echo $LIBS | sed -e "s/-ldl//"` build_target="openbsd" + use_openbsd_libtool=true LIBPREFIX= DLLDIR=lib UNIXONLY="#" ], [*netbsd*],[ - AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) - AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system]) build_target="netbsd" LIBPREFIX= DLLDIR=lib @@ -199,6 +194,10 @@ AM_CONDITIONAL(SOLARIS, test "$build_target" = "solaris") AM_CONDITIONAL(XNETBSD, test "$build_target" = "netbsd") AM_CONDITIONAL(XFREEBSD, test "$build_target" = "freebsd") AM_CONDITIONAL(OPENBSD, test "$build_target" = "openbsd") +# FIXME: We need a define BSD for some binaries like we +# need define LINUX for some. This does not scale, how +# can we solve this better? +AM_CONDITIONAL(XBSD, test "$build_target" = "netbsd" -o "$build_target" = "freebsd" -o "$build_target" = "openbsd") AM_CONDITIONAL(LINUX, test "$build_target" = "linux") AM_CONDITIONAL(GNU, test "$build_target" = "gnu") @@ -222,10 +221,17 @@ AC_CHECK_LIB(c, getloadavg, AC_DEFINE(HAVE_GETLOADAVG,1,[getloadavg supported])) AC_CHECK_PROG(VAR_GETOPT_BINARY, getopt, true, false) AM_CONDITIONAL(HAVE_GETOPT_BINARY, $VAR_GETOPT_BINARY) +AC_CHECK_PROGS(PKG_CONFIG, [pkgconf, pkg-config], false) +AM_CONDITIONAL(HAVE_PKG_CONFIG, test x$PKG_CONFIG != xfalse) + AC_CHECK_PROG(VAR_SSH_BINARY, ssh, true, false) AM_CONDITIONAL(HAVE_SSH_BINARY, $VAR_SSH_BINARY) -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) -rm -f /tmp/gnunet_test_cosks_ssh_garbage +AC_MSG_CHECKING(for SSH key) + 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) + if test -f /tmp/gnunet_test_cosks_ssh_garbage; then + rm -f /tmp/gnunet_test_cosks_ssh_garbage + fi + # autotools' m4 for python has no maximum version! # python3.4 - python3.8 for tests (3.8 unchecked) @@ -316,6 +322,10 @@ AS_IF([test x"$VAR_UPNPC_BINARY" != x"false"], [AC_MSG_WARN([warning: 'upnpc' binary not found.])]) +# checkbashisms +AC_CHECK_PROGS(CHECKBASHISMS_BINARY, [checkbashisms checkbashisms.pl], false) +AM_CONDITIONAL(HAVE_CHECKBASHISMS, test x$CHECKBASHISMS_BINARY != xfalse) + # uncrustify # TODO: maybe add flag to pass location AC_CHECK_PROG(UNCRUSTIFY_BINARY, uncrustify, true) @@ -371,6 +381,14 @@ AC_DEFINE_UNQUOTED([NEED_LIBGCRYPT_VERSION], "$NEED_LIBGCRYPT_VERSION", [require AC_CHECK_DECLS([struct in6_ifreq], [], [], [[#include ]]) +AC_CHECK_HEADER([if_tun.h], + [AC_DEFINE([IF_TUN_HDR], ["if_tun.h"], [if_tun.h include path])], + [AC_CHECK_HEADER([linux/if_tun.h], + [AC_DEFINE([IF_TUN_HDR], ["linux/if_tun.h"])], + [AC_CHECK_HEADER([net/if_tun.h], + [AC_DEFINE([IF_TUN_HDR], ["net/if_tun.h"])], + [AC_CHECK_HEADER([net/tun/if_tun.h], + [AC_DEFINE([IF_TUN_HDR], ["net/tun/if_tun.h"])])])])]) # should the build process be building the documentation? @@ -393,7 +411,7 @@ AS_IF([test "x$documentation" = "xyes"], [0], [Not building the documentation])]) -# COMMENT: Check wether to transpile texinfo to mdoc. +# COMMENT: Check whether to transpile texinfo to mdoc. # COMMENT: This is TRUE when --enable-texi2mdoc-generation # COMMENT: but ERRORS when texi2mdoc binary is missing in your $PATH # COMMENT: and makes the configure fail if it is missing. @@ -403,7 +421,7 @@ AS_IF([test "x$documentation" = "xyes"], # COMMENT: There are 2 nested AS_IFs because we need to catch the # COMMENT: potential non-existence of the texi2mdoc binary. # COMMENT: Default return value / setting: no -AC_MSG_CHECKING(wether to include generated texi2mdoc output in installation) +AC_MSG_CHECKING(whether to include generated texi2mdoc output in installation) AC_ARG_ENABLE([texi2mdoc-generation], [AS_HELP_STRING([--enable-texi2mdoc-generation], [include generated texi2mdoc output in installation])], @@ -426,6 +444,27 @@ AS_IF([test "x$texi2mdoc_generation" = "xyes"], [0], [Not building section 7 mdoc output])]) +# test for texi2mdoc (the binary, not the script distributed +# with autogen) +# TODO: refactor this and the check above. +AC_MSG_CHECKING(for texi2mdoc binary) +AC_CHECK_PROGS(TEXI2MDOC_BINARY, [texi2mdoc], false) +AM_CONDITIONAL(HAVE_TEXI2MDOC, test x$TEXI2MDOC_BINARY != xfalse) + +# texi2man is a tool which needs to be investigated and +# is probably incompatible to texi2mdoc in invocation. +# Detection at this point only serves as a reminder that +# I will work this into the build-system. +AC_MSG_CHECKING(for texi2man perl script) +AC_CHECK_PROGS(TEXI2MAN_SCRIPT, [texi2man], false) +AM_CONDITIONAL(HAVE_TEXI2MAN, test x$TEXI2MAN_SCRIPT != xfalse) + + +# test for mandoc +AC_MSG_CHECKING(for mandoc binary) +AC_CHECK_PROGS(MANDOC_BINARY, [mandoc], false) +AM_CONDITIONAL(HAVE_MANDOC, test x$MANDOC_BINARY != xfalse) + # should the build process be building only the documentation? AC_MSG_CHECKING(whether to build only documentation) AC_ARG_ENABLE([documentation-only], @@ -639,6 +678,9 @@ AS_IF([test "$bluetooth" = 1], [AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth library])]) # check for zbar library +# NOTE: Do not add checks for: -lSM, -lICE, -lX11, -lXv and -ljpeg +# NOTE: they must be provided by the build environment, not the +# NOTE: build-system of gnunet, as they are 2nd or 3rd level dependencies. zbar=0 AC_MSG_CHECKING(for libzbar) AC_ARG_WITH(zbar, @@ -1022,7 +1064,7 @@ AS_IF([test x$ltdl = x1], [ AC_MSG_RESULT([libltdl found]) ],[ - AC_MSG_ERROR([GNUnet requires libltdl (from GNU libtool), try installing libltdl-dev]) + AC_MSG_ERROR([GNUnet requires libltdl (from GNU libtool).]) ]) # restore LIBS LIBS=$SAVE_LIBS @@ -1093,8 +1135,7 @@ AS_IF([test x$my_with_libidn2 = x1], [Define to 1 if you have 'libidn2' (-lidn2).])], [MISSING_DEPS="${MISSING_DEPS}${MISSING_SEP}libidn2" MISSING_SEP=", "])]) -AM_CONDITIONAL(HAVE_LIBIDN2, - test x$working_libidn2 = x1) +AM_CONDITIONAL(HAVE_LIBIDN2, test x$working_libidn2 = x1) AS_IF([test x$working_libidn2 = x0], [AS_IF([test x$my_with_libidn = x1], [AC_MSG_NOTICE([Checking for libidn]) @@ -1248,9 +1289,9 @@ AC_SUBST(SQLITE_LDFLAGS) LDFLAGS=$SAVE_LDFLAGS CPPFLAGS=$SAVE_CPPFLAGS -# test for postgres +# test for postgres: postgres=false -# even running the check for postgres breaks emscripten ... +# even running the check for postgres breaks emscripten AS_IF([test "$taler_only" != yes], [AX_LIB_POSTGRESQL([9.5], [CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" @@ -1258,8 +1299,11 @@ AS_IF([test "$taler_only" != yes], postgres=true) ], [AC_MSG_RESULT([no postgres])])]) -AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) +AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) +AS_IF([test "x$postgres" = xtrue], + [AC_DEFINE([HAVE_POSTGRESQL],[1],[Have PostgreSQL])], + [AC_DEFINE([HAVE_POSTGRESQL],[0],[Lacking PostgreSQL])]) LDFLAGS=$SAVE_LDFLAGS CPPFLAGS=$SAVE_CPPFLAGS @@ -1344,9 +1388,11 @@ LIBS=$SAVE_LIBS LDFLAGS=$SAVE_LDFLAGS CPPFLAGS=$SAVE_CPPFLAGS +# TODO: should this test for "or" not "and"? +# TODO: Add postgres? AS_IF([test "$sqlite" = 0 -a "$mysql" = 0], [ - AC_MSG_ERROR([GNUnet requires SQLite or MySQL]) + AC_MSG_ERROR([GNUnet requires SQLite or MySQL / MariaDB.]) ]) # libmicrohttpd @@ -1634,7 +1680,7 @@ AC_MSG_RESULT($enable_benchmarks) AM_CONDITIONAL([HAVE_BENCHMARKS], [test "x$enable_benchmarks" = "xyes"]) # should gnunet-testing be compiled -AC_MSG_CHECKING(wether to compile gnunet-testing) +AC_MSG_CHECKING(whether to compile gnunet-testing) AC_ARG_ENABLE([testing], [AS_HELP_STRING([--disable-testing], [do not build gnunet-testing])], [enable_testing=${enableval}], @@ -1766,7 +1812,6 @@ doc/man/Makefile doc/doxygen/Makefile doc/handbook/Makefile doc/tutorial/Makefile -lint/Makefile m4/Makefile po/Makefile.in src/Makefile @@ -1919,6 +1964,10 @@ AS_IF([test "x$enable_java_ports" = "xyes"], #### but for now let's keep it here. #### +# TODO: We use "WARNING" too often, we need to clarify what +# TODO: constitutes a WARNING, an ERROR, and a NOTICE, and +# TODO: other message levels. + # -- print message regarding enabled experimental features AS_IF([test "x$enable_experimental" = "xyes"], [experimental_msg="experimental features enabled"]) @@ -1932,10 +1981,20 @@ AS_IF([test "x$working_libidn2" = x1], # -- libidn 1 AS_IF([test "x$working_libidn1" = x1], [libidn1_msg="libidn1"]) +# -- texi2mdoc-generation +AS_IF([test "x$texi2mdoc_generation" = "xyes"], + [mdocml_msg="yes"], + [mdocml_msg="no"]) # -- texi2mdoc -AS_IF([test "x$texi2mdoc_generation" = x1], - [mdoc_msg="yes"], - [mdoc_msg="no"]) +AS_IF([test "x$TEXI2MDOC_BINARY" = "false"], + [AC_MSG_NOTICE([WARNING: optional texi2mdoc binary not found]) + texi2mdoc_msg="no (optional)"], + [texi2mdoc_msg="yes"]) +# -- mandoc +AS_IF([test "x$MANDOC_BINARY" = "false"], + [AC_MSG_NOTICE([WARNING: optional mandoc binary not found]) + mandoc_msg="no"], + [mandoc_msg="yes"]) # -- texinfo AS_IF([test "x$makeinfo" != "x1"], [texinfo_msg="no"], @@ -1943,15 +2002,15 @@ AS_IF([test "x$makeinfo" != "x1"], # -- conversation AS_IF([test "x$conversation_backend" = "xnone"], [AS_IF([test "x$pulse" != "x1"], - [AC_MSG_NOTICE([WARNING: libpulse(audio) not found, conversation will not be built.]) + [AC_MSG_NOTICE([WARNING: libpulse(audio) not found (required to build conversation against it).]) libpulse_msg="no"], [libpulse_msg="yes"]) AS_IF([test "x$opus" != "x1"], - [AC_MSG_NOTICE([WARNING: libopus not found, conversation will not be built.]) + [AC_MSG_NOTICE([WARNING: libopus not found (conversation)]) libopus_msg="no"], [libopus_msg="yes"]) AS_IF([test "x$gst" != "x1"], - [AC_MSG_NOTICE([WARNING: GStreamer not found, conversation will not be built.]) + [AC_MSG_NOTICE([WARNING: GStreamer not found (required to build conversation against it).]) gstreamer_msg="no"], [gstreamer_msg="yes"])], [features_msg="$features_msg conversation"]) @@ -1967,7 +2026,7 @@ AS_IF([test "x$jansson" = "x0"], [jansson_msg="yes"]) # -- libextractor AS_IF([test "$extractor" != 1], - [AC_MSG_WARN([ERROR: libextractor not found, but various file-sharing functions require it])], + [AC_MSG_WARN([WARNING: libextractor not found, but various file-sharing functions require it])], [libextractor_msg="yes"]) # -- libzbar AS_IF([test "x$zbar" = "x1"], @@ -2013,7 +2072,9 @@ AS_IF([test x$gnutls != xtrue], gnutls_msg="yes (without DANE support)"], [gnutls_msg="yes (with DANE support)"])]) # -- databases -AS_IF([test $mysqlfail = true] +# TODO: this always returns true, the check might +# TODO: not be working as intended (for msqlfail). +AS_IF([test x$mysqlfail = "true"] [AC_MSG_NOTICE([WARNING: optional MySQL not found (or too old)])]) AS_IF([test "$mysql" = true], [features_msg="$features_msg mysql" @@ -2037,7 +2098,7 @@ AC_SUBST(features_msg) # The summary -# TODO: reduce the length of the last message block ("the message") +# TODO: reduce the length of the last message block, following "IMPORTANT". AC_MSG_NOTICE([ GNUnet Configuration @@ -2075,9 +2136,11 @@ libopus: ${libopus_msg} gstreamer: ${gstreamer_msg} libpulse: ${libpulse_msg} libextractor: ${libextractor_msg} +texi2mdoc: ${texi2mdoc_msg} +mandoc: ${mandoc_msg} texinfo manual: ${texinfo_msg} -transpiled mdoc manual: ${mdoc_msg} +transpiled mdocml manual: ${mdocml_msg} features: ${features_msg} experimental: ${experimental_msg}