From 43ebfb998689c19a6f47519d950d223b0142b55e Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 22 Sep 2015 23:14:03 +0200
Subject: [PATCH] .gitlab-ci.yml: don't check libopts match in make dist

---
 .gitlab-ci.yml | 2 +-
 Makefile.am    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f952133..a616c9e1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 Build with separate build dir:
   script:
   - git submodule update --init && autoreconf -fvi && mkdir -p build && cd build &&
-    ../configure && make -j4 && make check -j4 && make dist
+    ../configure && make -j4 && make check -j4 && make SKIP_LIBOPTS_CHECK=1 dist
   except:
   - tags
diff --git a/Makefile.am b/Makefile.am
index 7ec4b047..a026b1e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,7 @@ dist-hook: ChangeLog
 	@echo "Checking whether included libopts matches the system's. If the"
 	@echo "check fails upgrade the included libopts."
 	@echo "*****************************************************************"
-	test "`autoopts-config libsrc|cut -d '-' -f 2|sed 's/.tar.gz//'`" = "`cat $(srcdir)/libopts/autoopts/options.h |grep OPTIONS_VERSION_STRING|cut -d '"' -f 2|sed 's/:/./g'`"
+	test "$(SKIP_LIBOPTS_CHECK)" = "1" || test "`autoopts-config libsrc|cut -d '-' -f 2|sed 's/.tar.gz//'`" = "`cat $(srcdir)/libopts/autoopts/options.h |grep OPTIONS_VERSION_STRING|cut -d '"' -f 2|sed 's/:/./g'`"
 	cd $(distdir)/src/ && for i in ocserv-args.def ocpasswd-args.def;do \
 		$(AUTOGEN) $$i; \
 	done