patch 7.4.1003

Problem:    Travis could check a few more things.
Solution:   Run autoconf on one of the builds. (James McCoy, closes #510)
            Also build with normal features.

diff --git a/.travis.yml b/.travis.yml
index e6a12933f3729192e933953eb12d72cc5a25b382..fc605686313a5f0e130b2fd0f14a7f9c8f2d01e5 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,10 @@ compiler:
 env:
   - COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT="-C src/shadow" SRCDIR=./src/shadow
     "CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp'"
-  - COVERAGE=no FEATURES=small CONFOPT= SHADOWOPT= SRCDIR=./src
-  - COVERAGE=no FEATURES=tiny  CONFOPT= SHADOWOPT= SRCDIR=./src
+    CHECK_AUTOCONF=yes
+  - COVERAGE=no FEATURES=normal CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
+  - COVERAGE=no FEATURES=small CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
+  - COVERAGE=no FEATURES=tiny  CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
 
 sudo: false
 
@@ -19,6 +21,7 @@ branches:
 addons:
   apt:
     packages:
+      - autoconf
       - lcov
       - libperl-dev
       - python-dev
@@ -31,6 +34,7 @@ before_install:
 
 script:
   - NPROC=$(getconf _NPROCESSORS_ONLN)
+  - if [ "$CHECK_AUTOCONF" = "yes" -a "$CC" = "gcc" ]; then make -C src autoconf; fi
   - if [ "x$SHADOWOPT" != x ]; then make -C src shadow; fi && (cd ${SRCDIR} && ./configure --with-features=$FEATURES $CONFOPT --enable-fail-if-missing && make -j$NPROC)
   - ${SRCDIR}/vim --version
   - make $SHADOWOPT test

diff --git a/src/version.c b/src/version.c
index 62271eda08f7ce23b4e3ccc2ee427f8f7c1cf443..dc25a82547fc7c7891a0ec920b361ff6f480b03d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1003,
 /**/
     1002,
 /**/