diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-03-25 21:55:52 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-03-25 21:55:52 +0000 |
| commit | 2217cae0c0eb20c33f4b02c105278a5127b7c7eb (patch) | |
| tree | 5592797388480a9fe1b6f65f9abfe8037dfc1a0c /src | |
| parent | 1a14c2ccd112d905077daaeae7a234aaa396a088 (diff) | |
updated for version 7.0b01
Diffstat (limited to 'src')
| -rwxr-xr-x | src/auto/configure | 4 | ||||
| -rw-r--r-- | src/configure.in | 4 | ||||
| -rw-r--r-- | src/version.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/auto/configure b/src/auto/configure index 20668eb294..22f724eaa2 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -2781,7 +2781,7 @@ if test -z "$CFLAGS"; then test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall" fi if test "$GCC" = yes; then - gccversion=`"$CC" --version | sed -e '2,$d;s/^[^0-9]*\(darwin.[^0-9]*\)*\([0-9]\.[0-9.]*\).*$/\2/g'` + gccversion=`"$CC" --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[^0-9]*\([0-9]\.[0-9.]*\).*$/\1/g'` if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then echo 'GCC [34].0.[12] has a bug in the optimizer, disabling "-O#"' CFLAGS=`echo "$CFLAGS" | sed 's/-O[23456789]/-O/'` @@ -15249,7 +15249,7 @@ echo "$as_me:$LINENO: checking for GCC 3 or later" >&5 echo $ECHO_N "checking for GCC 3 or later... $ECHO_C" >&6 DEPEND_CFLAGS_FILTER= if test "$GCC" = yes; then - gccmajor=`"$CC" --version | sed -e '2,$d;s/^[^0-9]*\(darwin.[^0-9]*\)*\([1-9]\)\.[0-9].*$/\2/g'` + gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'` if test "$gccmajor" -gt "2"; then DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'" fi diff --git a/src/configure.in b/src/configure.in index aae20b9150..f7648a882f 100644 --- a/src/configure.in +++ b/src/configure.in @@ -29,7 +29,7 @@ if test -z "$CFLAGS"; then test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall" fi if test "$GCC" = yes; then - gccversion=`"$CC" --version | sed -e '2,$d;s/^[[^0-9]]*\(darwin.[[^0-9]]*\)*\([[0-9]]\.[[0-9.]]*\).*$/\2/g'` + gccversion=`"$CC" --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'` dnl version 4.0.1 was reported to cause trouble on Macintosh by Marcin Dalecki if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then echo 'GCC [[34]].0.[[12]] has a bug in the optimizer, disabling "-O#"' @@ -2834,7 +2834,7 @@ dnl the number before the version number. AC_MSG_CHECKING(for GCC 3 or later) DEPEND_CFLAGS_FILTER= if test "$GCC" = yes; then - gccmajor=`"$CC" --version | sed -e '2,$d;s/^[[^0-9]]*\(darwin.[[^0-9]]*\)*\([[1-9]]\)\.[[0-9]].*$/\2/g'` + gccmajor=`echo "$gccversion" | sed -e 's/^\([[1-9]]\)\..*$/\1/g'` if test "$gccmajor" -gt "2"; then DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'" fi diff --git a/src/version.h b/src/version.h index cef0851975..d8cde672c8 100644 --- a/src/version.h +++ b/src/version.h @@ -36,5 +36,5 @@ #define VIM_VERSION_NODOT "vim70b" #define VIM_VERSION_SHORT "7.0b" #define VIM_VERSION_MEDIUM "7.0b BETA" -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0b BETA (2006 Mar 24)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0b BETA (2006 Mar 24, compiled " +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0b BETA (2006 Mar 25)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0b BETA (2006 Mar 25, compiled " |