diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2014-03-05 13:21:11 +0000 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2014-03-05 13:21:11 +0000 |
commit | d1fe54e512738aeb82696cd107d720e16ebdbc3e (patch) | |
tree | 23a6dcc2a135ea5450852a551f7b289a127a738a | |
parent | f55e22f529fc0a9c176db912cb6e25526c09efed (diff) | |
download | libmicrohttpd-d1fe54e512738aeb82696cd107d720e16ebdbc3e.tar.gz libmicrohttpd-d1fe54e512738aeb82696cd107d720e16ebdbc3e.zip |
configure.ac: add --disable-doc and --disable-examples options
-rw-r--r-- | Makefile.am | 5 | ||||
-rw-r--r-- | configure.ac | 14 | ||||
-rw-r--r-- | src/Makefile.am | 4 |
3 files changed, 22 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 5a67d875..1a0951ca 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -1,7 +1,10 @@ | |||
1 | ACLOCAL_AMFLAGS = -I m4 | 1 | ACLOCAL_AMFLAGS = -I m4 |
2 | SUBDIRS = contrib src doc m4 . | 2 | SUBDIRS = contrib src m4 . |
3 | EXTRA_DIST = acinclude.m4 libmicrohttpd.pc.in libmicrospdy.pc.in | 3 | EXTRA_DIST = acinclude.m4 libmicrohttpd.pc.in libmicrospdy.pc.in |
4 | 4 | ||
5 | pkgconfigdir = $(libdir)/pkgconfig | 5 | pkgconfigdir = $(libdir)/pkgconfig |
6 | pkgconfig_DATA = libmicrohttpd.pc | 6 | pkgconfig_DATA = libmicrohttpd.pc |
7 | 7 | ||
8 | if BUILD_DOC | ||
9 | SUBDIRS += doc | ||
10 | endif | ||
diff --git a/configure.ac b/configure.ac index 365d5efb..214dcd5f 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -180,6 +180,18 @@ AM_CONDITIONAL(USE_MS_LIB_TOOL, [test "x$ac_cv_use_ms_lib_tool" = "xyes"]) | |||
180 | AM_CONDITIONAL(W32_STATIC_LIB, [test "x$os_is_native_w32" = "xyes" && test "x$enable_static" = "xyes"]) | 180 | AM_CONDITIONAL(W32_STATIC_LIB, [test "x$os_is_native_w32" = "xyes" && test "x$enable_static" = "xyes"]) |
181 | 181 | ||
182 | 182 | ||
183 | AC_ARG_ENABLE([[doc]], | ||
184 | [AS_HELP_STRING([[--disable-doc]], [do not build any documentation])], , | ||
185 | [enable_doc=yes]) | ||
186 | test "x$enable_doc" = "xno" || enable_doc=yes | ||
187 | AM_CONDITIONAL([BUILD_DOC], [test "x$enable_doc" = "xyes"]) | ||
188 | |||
189 | AC_ARG_ENABLE([[examples]], | ||
190 | [AS_HELP_STRING([[--disable-examples]], [do not build any examples])], , | ||
191 | [enable_examples=yes]) | ||
192 | test "x$enable_examples" = "xno" || enable_examples=yes | ||
193 | AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$enable_examples" = "xyes"]) | ||
194 | |||
183 | AC_ARG_ENABLE([[epoll]], | 195 | AC_ARG_ENABLE([[epoll]], |
184 | [AS_HELP_STRING([[--enable-epoll[=ARG]]], [enable epoll support (yes, no, auto) [auto]])], | 196 | [AS_HELP_STRING([[--enable-epoll[=ARG]]], [enable epoll support (yes, no, auto) [auto]])], |
185 | [enable_epoll=${enableval}], | 197 | [enable_epoll=${enableval}], |
@@ -691,6 +703,8 @@ AC_MSG_NOTICE([Configuration Summary: | |||
691 | Postproc: ${enable_postprocessor} | 703 | Postproc: ${enable_postprocessor} |
692 | HTTPS support: ${MSG_HTTPS} | 704 | HTTPS support: ${MSG_HTTPS} |
693 | epoll support: ${enable_epoll=no} | 705 | epoll support: ${enable_epoll=no} |
706 | build docs: ${enable_doc} | ||
707 | build examples: ${enable_examples} | ||
694 | libmicrospdy: ${enable_spdy} | 708 | libmicrospdy: ${enable_spdy} |
695 | spdylay (testing): ${have_spdylay} | 709 | spdylay (testing): ${have_spdylay} |
696 | ]) | 710 | ]) |
diff --git a/src/Makefile.am b/src/Makefile.am index d01c622a..4d64e22c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -20,6 +20,10 @@ endif | |||
20 | 20 | ||
21 | SUBDIRS = include platform microhttpd $(microspdy) examples $(curltests) $(zzuftests) . | 21 | SUBDIRS = include platform microhttpd $(microspdy) examples $(curltests) $(zzuftests) . |
22 | 22 | ||
23 | if BUILD_EXAMPLES | ||
24 | SUBDIRS += examples | ||
25 | endif | ||
26 | |||
23 | EXTRA_DIST = \ | 27 | EXTRA_DIST = \ |
24 | datadir/cert-and-key.pem \ | 28 | datadir/cert-and-key.pem \ |
25 | datadir/cert-and-key-for-wireshark.pem \ | 29 | datadir/cert-and-key-for-wireshark.pem \ |