diff options
| author | Christian Grothoff <christian@grothoff.org> | 2021-01-04 18:55:22 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2021-01-04 18:55:22 +0100 |
| commit | aaeadf1598baf7b2193d03b17c73dcd8956dc9cb (patch) | |
| tree | 8a7312d5e05097d2b20ab4ccdba1926dd50854af | |
| parent | 72fdbcdfaf0ded13518cc96dee6244950c3ecad5 (diff) | |
| parent | 2bd118007e177583a637274c59a9481d439ffd30 (diff) | |
| download | exchange-aaeadf1598baf7b2193d03b17c73dcd8956dc9cb.tar.gz exchange-aaeadf1598baf7b2193d03b17c73dcd8956dc9cb.tar.bz2 exchange-aaeadf1598baf7b2193d03b17c73dcd8956dc9cb.zip | |
Merge branch 'master' of git+ssh://git.taler.net/exchange
| -rw-r--r-- | Makefile.am | 14 | ||||
| -rw-r--r-- | configure.ac | 42 |
2 files changed, 3 insertions, 53 deletions
diff --git a/Makefile.am b/Makefile.am index d2e8d8e05..d62e19a50 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,19 +1,7 @@ # This Makefile.am is in the public domain AM_CPPFLAGS = -I$(top_srcdir)/src/include -if DOC_ONLY -if ENABLE_DOC - SUBDIRS = . contrib doc -else - SUBDIRS = . contrib -endif -else -if ENABLE_DOC - SUBDIRS = . contrib src doc -else - SUBDIRS = . contrib src -endif -endif +SUBDIRS = . contrib src doc BUILT_SOURCES = src/include/taler_error_codes.h diff --git a/configure.ac b/configure.ac index 7b6977ee9..b47aeb982 100644 --- a/configure.ac +++ b/configure.ac @@ -48,18 +48,6 @@ DX_INIT_DOXYGEN([taler-exchange],,, DX_CHI_FEATURE(OFF), DX_XML_FEATURE(OFF)) -AC_MSG_CHECKING([whether to compile documentation ONLY]) -AC_ARG_ENABLE([only-doc], - [AS_HELP_STRING([--enable-only-doc], [only compile Taler documentation])], - [doc_only=${enableval}], - [doc_only=no]) -AC_MSG_RESULT($doc_only) -AM_CONDITIONAL([DOC_ONLY], [test "x$doc_only" = "xyes"]) - - -# Not indented, as most of the file falls under this one... -AS_IF([test "x$doc_only" != xyes],[ - # Checks for programs. AC_PROG_CC @@ -194,11 +182,11 @@ LIBS_SAVE=$LIBS LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0) LIBCURL_CHECK_CONFIG(,7.34.0,[curl=1],[curl=0]) +# cURL must support CURLINFO_TLS_SESSION, version >= 7.34 AS_IF([test "x$curl" = x1],[ AC_CHECK_HEADER([curl/curl.h], - AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=1],[curl=0],[[#include <curl/curl.h>]]), + [AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=1],[curl=0],[[#include <curl/curl.h>]])], [curl=0]) - # cURL must support CURLINFO_TLS_SESSION, version >= 7.34 ]) @@ -501,32 +489,6 @@ AC_TYPE_UINTMAX_T # Checks for library functions. AC_CHECK_FUNCS([strdup]) - -AC_ARG_ENABLE([[doc]], - [AS_HELP_STRING([[--disable-doc]], [do not build any documentation])], , - [enable_doc=yes]) -test "x$enable_doc" = "xno" || enable_doc=yes -AM_CONDITIONAL([ENABLE_DOC], [test "x$enable_doc" = "xyes"]) - - -],[ # This is the big test "$doc_only" on top of the file! - - -# logic if doc_only is set, make sure conditionals are still defined -AM_CONDITIONAL([HAVE_EXPENSIVE_TESTS], [false]) -AM_CONDITIONAL([MHD_HAVE_EPOLL], [false]) -AM_CONDITIONAL([HAVE_POSTGRESQL], [false]) -AM_CONDITIONAL([HAVE_SQLITE], [false]) -AM_CONDITIONAL([HAVE_LIBCURL], [false]) -AM_CONDITIONAL([HAVE_LIBGNURL], [false]) -AM_CONDITIONAL([HAVE_DEVELOPER], [false]) -AM_CONDITIONAL([USE_COVERAGE], [false]) -AM_CONDITIONAL([ENABLE_DOC], [true]) -AM_CONDITIONAL([HAVE_TWISTER], [false]) - -# end of 'doc_only' -]) - AC_CONFIG_FILES([Makefile contrib/Makefile doc/Makefile |