diff options
| author | Christian Grothoff <christian@grothoff.org> | 2017-10-24 15:37:40 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2017-10-24 15:37:40 +0200 |
| commit | 1e2a852a9559fa27c13fb06e4704c7cf47870dfa (patch) | |
| tree | 1d4f04a663f467732f09969a476734737959549c | |
| parent | 868a853f0e29c9611542c3e18cb4dfee84779ee3 (diff) | |
fix #5108
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 9 |
2 files changed, 16 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index c42e33dd..9309390b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,17 @@ # This Makefile is in the public domain if DOC_ONLY +if ENABLE_DOC SUBDIRS = . doc else + SUBDIRS = . +endif +else +if ENABLE_DOC SUBDIRS = . src doc +else + SUBDIRS = . src doc +endif endif @DX_RULES@ diff --git a/configure.ac b/configure.ac index 73c850d3..b13a58a5 100644 --- a/configure.ac +++ b/configure.ac @@ -153,7 +153,7 @@ AS_IF([test $microhttpd = 0], *** ]])]) jansson=0 -PKG_CHECK_MODULES([JANSSON], [jansson >= 2.3], +PKG_CHECK_MODULES([JANSSON], [jansson >= 2.3], [LDFLAGS="$JANSSON_LIBS $LDFLAGS" CPPFLAGS="$JANSSON_CFLAGS $CPPFLAGS"], [AC_MSG_ERROR([[ @@ -265,6 +265,12 @@ AC_CHECK_PROG([tsc],[tsc],[yes],[no]) AM_CONDITIONAL([HAVE_TSC], [test "x$tsc" = xyes]) +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"]) + else # logic if doc_only is set, make sure conditionals are still defined @@ -275,6 +281,7 @@ AM_CONDITIONAL([HAVE_LIBCURL], [false]) AM_CONDITIONAL([HAVE_LIBGNURL], [false]) AM_CONDITIONAL([HAVE_TSC], [false]) AM_CONDITIONAL([USE_COVERAGE], [false]) +AM_CONDITIONAL([ENABLE_DOC], [true]) # end of 'doc_only' |