Karsten Hopp cf6c82
To: vim_dev@googlegroups.com
Karsten Hopp cf6c82
Subject: Patch 7.4.258
Karsten Hopp cf6c82
Fcc: outbox
Karsten Hopp cf6c82
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp cf6c82
Mime-Version: 1.0
Karsten Hopp cf6c82
Content-Type: text/plain; charset=UTF-8
Karsten Hopp cf6c82
Content-Transfer-Encoding: 8bit
Karsten Hopp cf6c82
------------
Karsten Hopp cf6c82
Karsten Hopp cf6c82
Patch 7.4.258
Karsten Hopp cf6c82
Problem:    Configure fails if $CC contains options.
Karsten Hopp cf6c82
Solution:   Remove quotes around $CC. (Paul Barker)
Karsten Hopp cf6c82
Files:	    src/configure.in, src/auto/configure
Karsten Hopp cf6c82
Karsten Hopp cf6c82
Karsten Hopp cf6c82
*** ../vim-7.4.257/src/configure.in	2014-04-10 20:00:03.708106386 +0200
Karsten Hopp cf6c82
--- src/configure.in	2014-04-12 13:00:51.332428899 +0200
Karsten Hopp cf6c82
***************
Karsten Hopp cf6c82
*** 46,55 ****
Karsten Hopp cf6c82
  fi
Karsten Hopp cf6c82
  if test "$GCC" = yes; then
Karsten Hopp cf6c82
    dnl method that should work for nearly all versions
Karsten Hopp cf6c82
!   gccversion=`"$CC" -dumpversion`
Karsten Hopp cf6c82
    if test "x$gccversion" = "x"; then
Karsten Hopp cf6c82
      dnl old method; fall-back for when -dumpversion doesn't work
Karsten Hopp cf6c82
!     gccversion=`"$CC" --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'`
Karsten Hopp cf6c82
    fi
Karsten Hopp cf6c82
    dnl version 4.0.1 was reported to cause trouble on Macintosh by Marcin Dalecki
Karsten Hopp cf6c82
    if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then
Karsten Hopp cf6c82
--- 46,55 ----
Karsten Hopp cf6c82
  fi
Karsten Hopp cf6c82
  if test "$GCC" = yes; then
Karsten Hopp cf6c82
    dnl method that should work for nearly all versions
Karsten Hopp cf6c82
!   gccversion=`$CC -dumpversion`
Karsten Hopp cf6c82
    if test "x$gccversion" = "x"; then
Karsten Hopp cf6c82
      dnl old method; fall-back for when -dumpversion doesn't work
Karsten Hopp cf6c82
!     gccversion=`$CC --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'`
Karsten Hopp cf6c82
    fi
Karsten Hopp cf6c82
    dnl version 4.0.1 was reported to cause trouble on Macintosh by Marcin Dalecki
Karsten Hopp cf6c82
    if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then
Karsten Hopp cf6c82
***************
Karsten Hopp cf6c82
*** 68,74 ****
Karsten Hopp cf6c82
  dnl the version number of the clang in use.
Karsten Hopp cf6c82
  dnl Note that this does not work to get the version of clang 3.1 or 3.2.
Karsten Hopp cf6c82
  AC_MSG_CHECKING(for recent clang version)
Karsten Hopp cf6c82
! CLANG_VERSION_STRING=`"$CC" --version 2>/dev/null | sed  -n -e 's/^.*clang.*\([[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\).*$/\1/p'`
Karsten Hopp cf6c82
  if test x"$CLANG_VERSION_STRING" != x"" ; then
Karsten Hopp cf6c82
    CLANG_MAJOR=`echo "$CLANG_VERSION_STRING" | sed -n -e 's/\([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*\.[[0-9]][[0-9]]*/\1/p'`
Karsten Hopp cf6c82
    CLANG_MINOR=`echo "$CLANG_VERSION_STRING" | sed -n -e 's/[[0-9]][[0-9]]*\.\([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*/\1/p'`
Karsten Hopp cf6c82
--- 68,74 ----
Karsten Hopp cf6c82
  dnl the version number of the clang in use.
Karsten Hopp cf6c82
  dnl Note that this does not work to get the version of clang 3.1 or 3.2.
Karsten Hopp cf6c82
  AC_MSG_CHECKING(for recent clang version)
Karsten Hopp cf6c82
! CLANG_VERSION_STRING=`$CC --version 2>/dev/null | sed  -n -e 's/^.*clang.*\([[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\).*$/\1/p'`
Karsten Hopp cf6c82
  if test x"$CLANG_VERSION_STRING" != x"" ; then
Karsten Hopp cf6c82
    CLANG_MAJOR=`echo "$CLANG_VERSION_STRING" | sed -n -e 's/\([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*\.[[0-9]][[0-9]]*/\1/p'`
Karsten Hopp cf6c82
    CLANG_MINOR=`echo "$CLANG_VERSION_STRING" | sed -n -e 's/[[0-9]][[0-9]]*\.\([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*/\1/p'`
Karsten Hopp cf6c82
*** ../vim-7.4.257/src/auto/configure	2014-04-10 20:00:03.716106386 +0200
Karsten Hopp cf6c82
--- src/auto/configure	2014-04-12 13:00:58.436428915 +0200
Karsten Hopp cf6c82
***************
Karsten Hopp cf6c82
*** 4074,4082 ****
Karsten Hopp cf6c82
    test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall"
Karsten Hopp cf6c82
  fi
Karsten Hopp cf6c82
  if test "$GCC" = yes; then
Karsten Hopp cf6c82
!     gccversion=`"$CC" -dumpversion`
Karsten Hopp cf6c82
    if test "x$gccversion" = "x"; then
Karsten Hopp cf6c82
!         gccversion=`"$CC" --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[^0-9]*\([0-9]\.[0-9.]*\).*$/\1/g'`
Karsten Hopp cf6c82
    fi
Karsten Hopp cf6c82
      if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then
Karsten Hopp cf6c82
      echo 'GCC [34].0.[12] has a bug in the optimizer, disabling "-O#"'
Karsten Hopp cf6c82
--- 4074,4082 ----
Karsten Hopp cf6c82
    test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall"
Karsten Hopp cf6c82
  fi
Karsten Hopp cf6c82
  if test "$GCC" = yes; then
Karsten Hopp cf6c82
!     gccversion=`$CC -dumpversion`
Karsten Hopp cf6c82
    if test "x$gccversion" = "x"; then
Karsten Hopp cf6c82
!         gccversion=`$CC --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[^0-9]*\([0-9]\.[0-9.]*\).*$/\1/g'`
Karsten Hopp cf6c82
    fi
Karsten Hopp cf6c82
      if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then
Karsten Hopp cf6c82
      echo 'GCC [34].0.[12] has a bug in the optimizer, disabling "-O#"'
Karsten Hopp cf6c82
***************
Karsten Hopp cf6c82
*** 4091,4097 ****
Karsten Hopp cf6c82
  
Karsten Hopp cf6c82
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for recent clang version" >&5
Karsten Hopp cf6c82
  $as_echo_n "checking for recent clang version... " >&6; }
Karsten Hopp cf6c82
! CLANG_VERSION_STRING=`"$CC" --version 2>/dev/null | sed  -n -e 's/^.*clang.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/p'`
Karsten Hopp cf6c82
  if test x"$CLANG_VERSION_STRING" != x"" ; then
Karsten Hopp cf6c82
    CLANG_MAJOR=`echo "$CLANG_VERSION_STRING" | sed -n -e 's/\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*/\1/p'`
Karsten Hopp cf6c82
    CLANG_MINOR=`echo "$CLANG_VERSION_STRING" | sed -n -e 's/[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*/\1/p'`
Karsten Hopp cf6c82
--- 4091,4097 ----
Karsten Hopp cf6c82
  
Karsten Hopp cf6c82
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for recent clang version" >&5
Karsten Hopp cf6c82
  $as_echo_n "checking for recent clang version... " >&6; }
Karsten Hopp cf6c82
! CLANG_VERSION_STRING=`$CC --version 2>/dev/null | sed  -n -e 's/^.*clang.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/p'`
Karsten Hopp cf6c82
  if test x"$CLANG_VERSION_STRING" != x"" ; then
Karsten Hopp cf6c82
    CLANG_MAJOR=`echo "$CLANG_VERSION_STRING" | sed -n -e 's/\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*/\1/p'`
Karsten Hopp cf6c82
    CLANG_MINOR=`echo "$CLANG_VERSION_STRING" | sed -n -e 's/[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*/\1/p'`
Karsten Hopp cf6c82
*** ../vim-7.4.257/src/version.c	2014-04-12 12:26:25.856424387 +0200
Karsten Hopp cf6c82
--- src/version.c	2014-04-12 13:05:09.372429463 +0200
Karsten Hopp cf6c82
***************
Karsten Hopp cf6c82
*** 736,737 ****
Karsten Hopp cf6c82
--- 736,739 ----
Karsten Hopp cf6c82
  {   /* Add new patch number below this line */
Karsten Hopp cf6c82
+ /**/
Karsten Hopp cf6c82
+     258,
Karsten Hopp cf6c82
  /**/
Karsten Hopp cf6c82
Karsten Hopp cf6c82
-- 
Karsten Hopp cf6c82
Never go to the toilet in a paperless office.
Karsten Hopp cf6c82
Karsten Hopp cf6c82
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp cf6c82
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp cf6c82
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp cf6c82
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///