Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-26

diff --git a/Makefile.am b/Makefile.am
index 4394dec47fa2009b9aacdb0636a9a1d944cf28c8..b0babecaacf8e0be4246944fa29df188b30d7254 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,8 +54,6 @@ include win32/include.am
 
 include m4/include.am
 
-docs: html man
-
 TESTS += ${check_PROGRAMS}
 
 EXTRA_DIST+= ${man_MANS}

diff --git a/docs/include.am b/docs/include.am
index 55e98972018b73bdb5548c4bd6358f0ffb3bc765..4a69ef070a37716de976201264830d7bb671d61f 100644 (file)
--- a/docs/include.am
+++ b/docs/include.am
@@ -135,6 +135,9 @@ man_MANS+= docs/man/memslap.1
 man_MANS+= docs/man/memstat.1
 
 if HAVE_SPHINX
+
+docs: html man
+
 sphinx-help:
        @echo "Please use \`make <target>' where <target> is one of"
        @echo "  html       to make standalone HTML files"
@@ -158,17 +161,20 @@ install-html: html-local
        @rm -r -f /var/www/libmemcached/*
        @cp -r docs/html /var/www/libmemcached
 
-html-local: docs/conf.py changes docs
+docs/_static:
+       @$(mkdir_p) docs/_static
+
+html-local: docs/conf.py docs changes docs/_static
        PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/html
        @echo
        @echo "Build finished. The HTML pages are in $(SPHINX_BUILDDIR)/html."
 
-dirhtml: docs/conf.py changes
+dirhtml: html-local
        PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/dirhtml
        @echo
        @echo "Build finished. The HTML pages are in $(SPHINX_BUILDDIR)/dirhtml."
 
-singlehtml: docs/conf.py changes
+singlehtml: html-local
        PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/singlehtml
        @echo
        @echo "Build finished. The HTML page is in $(SPHINX_BUILDDIR)/singlehtml."
@@ -251,4 +257,8 @@ doctest:
        @echo "Testing of doctests in the sources finished, look at the " \
              "results in $(SPHINX_BUILDDIR)/doctest/output.txt."
 
+else
+
+docs:
+
 endif

diff --git a/m4/ax_harden_compiler_flags.m4 b/m4/ax_harden_compiler_flags.m4
index 4d647996dcd466f0ac97aa2cb9fa5772ebcebd3c..d8b997f7b64d9d6e66c9afb3439b6a74850b68be 100644 (file)
--- a/m4/ax_harden_compiler_flags.m4
+++ b/m4/ax_harden_compiler_flags.m4
@@ -62,7 +62,9 @@
 
       AC_LANG_PUSH([C])
       AX_APPEND_COMPILE_FLAGS([-O2])
-      AX_APPEND_COMPILE_FLAGS([-Werror])
+      AS_IF([test "$ac_cv_vcs_checkout" = yes], [
+        AX_APPEND_COMPILE_FLAGS([-Werror])
+        ])
       AX_APPEND_COMPILE_FLAGS([-Wall])
       AX_APPEND_COMPILE_FLAGS([-Wextra])
       AX_APPEND_COMPILE_FLAGS([-std=c99])
@@ -80,7 +82,9 @@
       AC_REQUIRE([AX_HARDEN_C_COMPILER_FLAGS])
       AC_LANG_PUSH([C++])
       AX_APPEND_COMPILE_FLAGS([-O2])
-      AX_APPEND_COMPILE_FLAGS([-Werror])
+      AS_IF([test "$ac_cv_vcs_checkout" = yes], [
+        AX_APPEND_COMPILE_FLAGS([-Werror])
+        ])
       AX_APPEND_COMPILE_FLAGS([-Wall])
       AX_APPEND_COMPILE_FLAGS([-Wextra])
       AX_APPEND_COMPILE_FLAGS([-Wpragmas])
@@ -114,7 +118,9 @@
       AX_APPEND_COMPILE_FLAGS([-floop-parallelize-all])
       AX_APPEND_COMPILE_FLAGS([-fwrapv])
       AX_APPEND_COMPILE_FLAGS([-ggdb])
-      AX_CHECK_LINK_FLAG([-Werror])
+      AS_IF([test "$ac_cv_vcs_checkout" = yes], [
+          AX_CHECK_LINK_FLAG([-Werror])
+          ])
       AX_CHECK_LINK_FLAG([-z relro -z now])
       AC_LANG_POP
   ])