diff options
| author | vimboss <devnull@localhost> | 2009-09-11 11:44:54 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2009-09-11 11:44:54 +0000 |
| commit | 07d6a4766625bb3b160b9f972790124fc3fbe369 (patch) | |
| tree | 22403f80e759df5380492b3803287f74127706c8 | |
| parent | 8058b8dba2fc2308c4ca979806f459e32f574e7a (diff) | |
| download | vim-07d6a4766625bb3b160b9f972790124fc3fbe369.tar.gz | |
| -rwxr-xr-x | src/auto/configure | 2 | ||||
| -rw-r--r-- | src/configure.in | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure index 1049c0ce..85d7da56 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 1ad32d7a..fa58c6e7 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 b0318481..16e319d1 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 251, +/**/ 250, /**/ 249, |