]> granicus.if.org Git - vim/commitdiff
updated for version 7.3.1193 v7.3.1193
authorBram Moolenaar <Bram@vim.org>
Fri, 14 Jun 2013 19:22:39 +0000 (21:22 +0200)
committerBram Moolenaar <Bram@vim.org>
Fri, 14 Jun 2013 19:22:39 +0000 (21:22 +0200)
Problem:    fail_if_missing not used for Python 3.
Solution:   Give an error when Python 3 can't be configured. (Andrei Olsen)

src/auto/configure
src/configure.in
src/version.c

index 0d1c56304d272dc3f7910467b800d65e601f3dd5..ba9ae56ff516c2e63d855c611b01c671b43408da 100755 (executable)
@@ -5826,6 +5826,9 @@ rm -f core conftest.err conftest.$ac_objext \
 $as_echo "too old" >&6; }
     fi
   fi
+  if test "$fail_if_missing" = "yes" -a "$python3_ok" != "yes"; then
+    as_fn_error "could not configure python3" "$LINENO" 5
+  fi
 fi
 
 
index 1418f56d2ccd757cb73f4c586555bc3fa637dd6b..37b6c141019b8cea839bf6b92a4be81d67a96c13 100644 (file)
@@ -1229,6 +1229,9 @@ eof
       AC_MSG_RESULT(too old)
     fi
   fi
+  if test "$fail_if_missing" = "yes" -a "$python3_ok" != "yes"; then
+    AC_MSG_ERROR([could not configure python3])
+  fi
 fi
 
 AC_SUBST(PYTHON3_CONFDIR)
index 28f680dfd224099da2f2afbb59ee4d2ec029e6da..7ca5094f8c30360690f33ba39cd1dd2cb8d22d72 100644 (file)
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1193,
 /**/
     1192,
 /**/