[SCM] GNU libtasn1 branch, master, updated. libtasn1_4.7-7-g0d42c01

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libtasn1".

http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=0d42c018d1031e1e87263c85b02e13037bd958d1

The branch, master has been updated
       via  0d42c018d1031e1e87263c85b02e13037bd958d1 (commit)
       via  18d6b624473b3864908bb010e37189513fd095b1 (commit)
      from  0570b22afd6b771d55bcac2503759b082ddc86a7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0d42c018d1031e1e87263c85b02e13037bd958d1
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Feb 29 10:30:20 2016 +0100

    .gitlab-ci.yml: don't build documentation

commit 18d6b624473b3864908bb010e37189513fd095b1
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Feb 29 10:26:39 2016 +0100

    configure: added --disable-doc
    
    This allows to conditionally build the documentation

-----------------------------------------------------------------------

Summary of changes:
 .gitlab-ci.yml |    4 ++--
 Makefile.am    |    6 +++++-
 configure.ac   |    5 +++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c33b6e7..553bb76 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,12 @@
 # See http://doc.gitlab.com/ce/ci/yaml/ for documentation.
 Build and Check (x86-64):
   script:
-  - git submodule update --init && make autoreconf && ./configure && make -j4 
&& make -j4 check
+  - git submodule update --init && make autoreconf && ./configure 
--disable-doc && make -j4 && make -j4 check
   except:
   - tags
 Build and Check with asan:
   script:
   - git submodule update --init && make autoreconf && 
CFLAGS="-fsanitize=address -g
-    -O2" LDFLAGS="-static-libasan" ./configure --disable-valgrind-tests && 
make -j4 && make check -j4
+    -O2" LDFLAGS="-static-libasan" ./configure --disable-doc 
--disable-valgrind-tests && make -j4 && make check -j4
   except:
   - tags
diff --git a/Makefile.am b/Makefile.am
index a2fc98a..5041eb9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,11 @@ EXTRA_DIST = windows/asn1-parser/asn1-parser.vcproj          
        \
        windows/test-parser/test-parser.vcproj                          \
        windows/test-tree/test-tree.vcproj windows/libtasn14win.mk
 
-SUBDIRS = gl lib src examples tests doc
+SUBDIRS = gl lib src examples tests
+
+if ENABLE_DOC
+SUBDIRS += doc
+endif
 
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I lib/glm4
 
diff --git a/configure.ac b/configure.ac
index 455ef69..056aa84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,11 @@ gl_EARLY
 lgl_EARLY
 AC_PROG_YACC
 
+AC_ARG_ENABLE(doc,
+  AS_HELP_STRING([--disable-doc], [don't generate any documentation]),
+    enable_doc=$enableval, enable_doc=yes)
+AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no")
+
 dnl Checks for programs.
 AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
 AC_LIBTOOL_WIN32_DLL


hooks/post-receive
-- 
GNU libtasn1