To: vim-dev@vim.org
Subject: Patch 6.1.080
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1.080
Problem:    When using gcc with /usr/local already in the search path, adding
	    it again causes problems.
Solution:   Adjust configure.in to avoid adding /usr/local/include and
	    /usr/local/lib when using GCC and they are already used. (Johannes
	    Zellner)
Files:	    src/auto/configure, src/configure.in


*** ../vim61.079/src/auto/configure	Sun May 19 11:56:55 2002
--- src/auto/configure	Mon May 20 21:16:03 2002
***************
*** 1155,1167 ****
  
  
  
! if test -d /usr/local/lib; then
    tt=`echo "$LDFLAGS" | sed -e 's+-L/usr/local/lib ++g' -e 's+-L/usr/local/lib$++g'`
    if test "$tt" = "$LDFLAGS"; then
      LDFLAGS="$LDFLAGS -L/usr/local/lib"
    fi
  fi
! if test -d /usr/local/include; then
    tt=`echo "$CPPFLAGS" | sed -e 's+-I/usr/local/include ++g' -e 's+-I/usr/local/include$++g'`
    if test "$tt" = "$CPPFLAGS"; then
      CPPFLAGS="$CPPFLAGS -I/usr/local/include"
--- 1155,1175 ----
  
  
  
! have_local_include=''
! have_local_lib=''
! if test "$GCC" = yes; then
!   echo 'void f(){}' > conftest.c
!   have_local_include=`$CC -c -v conftest.c 2>&1 | grep '/usr/local/include'`
!   have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep '/usr/local/lib'`
!   rm -f conftest.c conftest.o
! fi
! if test -z "$have_local_include" -a -d /usr/local/lib; then
    tt=`echo "$LDFLAGS" | sed -e 's+-L/usr/local/lib ++g' -e 's+-L/usr/local/lib$++g'`
    if test "$tt" = "$LDFLAGS"; then
      LDFLAGS="$LDFLAGS -L/usr/local/lib"
    fi
  fi
! if test -z "$have_local_lib" -a -d /usr/local/include; then
    tt=`echo "$CPPFLAGS" | sed -e 's+-I/usr/local/include ++g' -e 's+-I/usr/local/include$++g'`
    if test "$tt" = "$CPPFLAGS"; then
      CPPFLAGS="$CPPFLAGS -I/usr/local/include"
*** ../vim61.079/src/configure.in	Sun May 19 11:56:55 2002
--- src/configure.in	Mon May 20 21:15:59 2002
***************
*** 74,86 ****
  
  dnl Add /usr/local/lib to $LDFLAGS and /usr/local/include to CFLAGS.
  dnl Only when the directory exists and it wasn't there yet.
! if test -d /usr/local/lib; then
    tt=`echo "$LDFLAGS" | sed -e 's+-L/usr/local/lib ++g' -e 's+-L/usr/local/lib$++g'`
    if test "$tt" = "$LDFLAGS"; then
      LDFLAGS="$LDFLAGS -L/usr/local/lib"
    fi
  fi
! if test -d /usr/local/include; then
    tt=`echo "$CPPFLAGS" | sed -e 's+-I/usr/local/include ++g' -e 's+-I/usr/local/include$++g'`
    if test "$tt" = "$CPPFLAGS"; then
      CPPFLAGS="$CPPFLAGS -I/usr/local/include"
--- 74,95 ----
  
  dnl Add /usr/local/lib to $LDFLAGS and /usr/local/include to CFLAGS.
  dnl Only when the directory exists and it wasn't there yet.
! dnl For gcc don't do this when it is already in the default search path.
! have_local_include=''
! have_local_lib=''
! if test "$GCC" = yes; then
!   echo 'void f(){}' > conftest.c
!   have_local_include=`$CC -c -v conftest.c 2>&1 | grep '/usr/local/include'`
!   have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep '/usr/local/lib'`
!   rm -f conftest.c conftest.o
! fi
! if test -z "$have_local_include" -a -d /usr/local/lib; then
    tt=`echo "$LDFLAGS" | sed -e 's+-L/usr/local/lib ++g' -e 's+-L/usr/local/lib$++g'`
    if test "$tt" = "$LDFLAGS"; then
      LDFLAGS="$LDFLAGS -L/usr/local/lib"
    fi
  fi
! if test -z "$have_local_lib" -a -d /usr/local/include; then
    tt=`echo "$CPPFLAGS" | sed -e 's+-I/usr/local/include ++g' -e 's+-I/usr/local/include$++g'`
    if test "$tt" = "$CPPFLAGS"; then
      CPPFLAGS="$CPPFLAGS -I/usr/local/include"
*** ../vim61.079/src/version.c	Sun May 19 21:31:03 2002
--- src/version.c	Mon May 20 21:18:57 2002
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     80,
  /**/

--  
A day without sunshine is like, well, night.

 ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
///   Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim   \\\
\\\           Project leader for A-A-P -- http://www.a-a-p.org           ///
 \\\  Help me helping AIDS orphans in Uganda - http://iccf-holland.org  ///