From 1d7ad738e5c629817e1e059d21b788f943c6c4d4 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 11 Sep 2009 11:44:54 +0000
Subject: updated for version 7.2-251

---
 src/auto/configure | 2 +-
 src/configure.in   | 2 +-
 src/version.c      | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/auto/configure b/src/auto/configure
index 1049c0ceb..85d7da564 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -17135,7 +17135,7 @@ $as_echo "no" >&6; }
       { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5
 $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
   if test "$gccmajor" -gt "3"; then
-    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
+    CFLAGS=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'`
     { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
   else
diff --git a/src/configure.in b/src/configure.in
index 1ad32d7a3..fa58c6e75 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -3233,7 +3233,7 @@ if test "$GCC" = yes; then
   dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.
   AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
   if test "$gccmajor" -gt "3"; then
-    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
+    CFLAGS=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'`
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
diff --git a/src/version.c b/src/version.c
index b0318481c..16e319d1d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    251,
 /**/
     250,
 /**/
-- 
cgit v1.2.3