[GNUnet-SVN] r32523 - in libmicrohttpd: . src

[gnunet]

Author: Karlson2k
Date: 2014-03-05 14:21:11 +0100 (Wed, 05 Mar 2014)
New Revision: 32523

Modified:
   libmicrohttpd/Makefile.am
   libmicrohttpd/configure.ac
   libmicrohttpd/src/Makefile.am
Log:
configure.ac: add --disable-doc and --disable-examples options

Modified: libmicrohttpd/Makefile.am
===================================================================
--- libmicrohttpd/Makefile.am   2014-03-05 13:21:03 UTC (rev 32522)
+++ libmicrohttpd/Makefile.am   2014-03-05 13:21:11 UTC (rev 32523)
@@ -1,7 +1,10 @@
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS  = contrib src doc m4 . 
+SUBDIRS = contrib src m4 .
 EXTRA_DIST = acinclude.m4 libmicrohttpd.pc.in libmicrospdy.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libmicrohttpd.pc
 
+if BUILD_DOC
+SUBDIRS += doc
+endif

Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac  2014-03-05 13:21:03 UTC (rev 32522)
+++ libmicrohttpd/configure.ac  2014-03-05 13:21:11 UTC (rev 32523)
@@ -180,6 +180,18 @@
 AM_CONDITIONAL(W32_STATIC_LIB, [test "x$os_is_native_w32" = "xyes"  && test 
"x$enable_static" = "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([BUILD_DOC], [test "x$enable_doc" = "xyes"])
+
+AC_ARG_ENABLE([[examples]],
+  [AS_HELP_STRING([[--disable-examples]], [do not build any examples])], ,
+    [enable_examples=yes])
+test "x$enable_examples" = "xno" || enable_examples=yes
+AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$enable_examples" = "xyes"])
+
 AC_ARG_ENABLE([[epoll]],
   [AS_HELP_STRING([[--enable-epoll[=ARG]]], [enable epoll support (yes, no, 
auto) [auto]])],
     [enable_epoll=${enableval}],
@@ -691,6 +703,8 @@
   Postproc:          ${enable_postprocessor}
   HTTPS support:     ${MSG_HTTPS}
   epoll support:     ${enable_epoll=no}
+  build docs:        ${enable_doc}
+  build examples:    ${enable_examples}
   libmicrospdy:      ${enable_spdy}
   spdylay (testing): ${have_spdylay}
 ])

Modified: libmicrohttpd/src/Makefile.am
===================================================================
--- libmicrohttpd/src/Makefile.am       2014-03-05 13:21:03 UTC (rev 32522)
+++ libmicrohttpd/src/Makefile.am       2014-03-05 13:21:11 UTC (rev 32523)
@@ -20,6 +20,10 @@
 
 SUBDIRS = include platform microhttpd $(microspdy) examples $(curltests) 
$(zzuftests) .
 
+if BUILD_EXAMPLES
+SUBDIRS += examples
+endif
+
 EXTRA_DIST = \
  datadir/cert-and-key.pem \
  datadir/cert-and-key-for-wireshark.pem \