GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-10-12 01:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

.gitlab-ci.yml: don't check libopts match in make dist

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2015-09-23 00:07:11 +02:00
parent 5dd511d0aa
commit 43ebfb9986
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+1 -1
View File
@@ -1,6 +1,6 @@
Build with separate build dir: Build with separate build dir:
script: script:
- git submodule update --init && autoreconf -fvi && mkdir -p build && cd build && - 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: except:
- tags - tags
Makefile.am
+1 -1
View File
@@ -37,7 +37,7 @@ dist-hook: ChangeLog
@echo "Checking whether included libopts matches the system's. If the" @echo "Checking whether included libopts matches the system's. If the"
@echo "check fails upgrade the included libopts." @echo "check fails upgrade the included libopts."
@echo "*****************************************************************" @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 \ cd $(distdir)/src/ && for i in ocserv-args.def ocpasswd-args.def;do \
$(AUTOGEN) $$i; \ $(AUTOGEN) $$i; \
done done