home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 6.1.084 < prev    next >
Encoding:
Internet Message Format  |  2002-05-31  |  4.3 KB
  1. To: vim-dev@vim.org
  2. Subject: Patch 6.1.084
  3. Fcc: outbox
  4. From: Bram Moolenaar <Bram@moolenaar.net>
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=ISO-8859-1
  7. Content-Transfer-Encoding: 8bit
  8. ------------
  9.  
  10. Patch 6.1.084 (depends on 6.1.080)
  11. Problem:    "include" and "lib" are mixed up when checking the directories gcc
  12.         already searches.
  13. Solution:   Swap the variable names. (SunHo Kim)
  14. Files:        src/auto/configure, src/configure.in
  15.  
  16.  
  17. *** ../vim61.083/src/auto/configure    Mon May 20 21:33:19 2002
  18. --- src/auto/configure    Sat Jun  1 21:56:56 2002
  19. ***************
  20. *** 1159,1175 ****
  21.   have_local_lib=''
  22.   if test "$GCC" = yes; then
  23.     echo 'void f(){}' > conftest.c
  24. !   have_local_include=`$CC -c -v conftest.c 2>&1 | grep '/usr/local/include'`
  25.     have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep '/usr/local/lib'`
  26.     rm -f conftest.c conftest.o
  27.   fi
  28. ! if test -z "$have_local_include" -a -d /usr/local/lib; then
  29.     tt=`echo "$LDFLAGS" | sed -e 's+-L/usr/local/lib ++g' -e 's+-L/usr/local/lib$++g'`
  30.     if test "$tt" = "$LDFLAGS"; then
  31.       LDFLAGS="$LDFLAGS -L/usr/local/lib"
  32.     fi
  33.   fi
  34. ! if test -z "$have_local_lib" -a -d /usr/local/include; then
  35.     tt=`echo "$CPPFLAGS" | sed -e 's+-I/usr/local/include ++g' -e 's+-I/usr/local/include$++g'`
  36.     if test "$tt" = "$CPPFLAGS"; then
  37.       CPPFLAGS="$CPPFLAGS -I/usr/local/include"
  38. --- 1159,1175 ----
  39.   have_local_lib=''
  40.   if test "$GCC" = yes; then
  41.     echo 'void f(){}' > conftest.c
  42. !   have_local_include=`${CC-cc} -c -v conftest.c 2>&1 | grep '/usr/local/include'`
  43.     have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep '/usr/local/lib'`
  44.     rm -f conftest.c conftest.o
  45.   fi
  46. ! if test -z "$have_local_lib" -a -d /usr/local/lib; then
  47.     tt=`echo "$LDFLAGS" | sed -e 's+-L/usr/local/lib ++g' -e 's+-L/usr/local/lib$++g'`
  48.     if test "$tt" = "$LDFLAGS"; then
  49.       LDFLAGS="$LDFLAGS -L/usr/local/lib"
  50.     fi
  51.   fi
  52. ! if test -z "$have_local_include" -a -d /usr/local/include; then
  53.     tt=`echo "$CPPFLAGS" | sed -e 's+-I/usr/local/include ++g' -e 's+-I/usr/local/include$++g'`
  54.     if test "$tt" = "$CPPFLAGS"; then
  55.       CPPFLAGS="$CPPFLAGS -I/usr/local/include"
  56. *** ../vim61.083/src/configure.in    Mon May 20 21:33:19 2002
  57. --- src/configure.in    Sat Jun  1 21:56:53 2002
  58. ***************
  59. *** 79,95 ****
  60.   have_local_lib=''
  61.   if test "$GCC" = yes; then
  62.     echo 'void f(){}' > conftest.c
  63. !   have_local_include=`$CC -c -v conftest.c 2>&1 | grep '/usr/local/include'`
  64.     have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep '/usr/local/lib'`
  65.     rm -f conftest.c conftest.o
  66.   fi
  67. ! if test -z "$have_local_include" -a -d /usr/local/lib; then
  68.     tt=`echo "$LDFLAGS" | sed -e 's+-L/usr/local/lib ++g' -e 's+-L/usr/local/lib$++g'`
  69.     if test "$tt" = "$LDFLAGS"; then
  70.       LDFLAGS="$LDFLAGS -L/usr/local/lib"
  71.     fi
  72.   fi
  73. ! if test -z "$have_local_lib" -a -d /usr/local/include; then
  74.     tt=`echo "$CPPFLAGS" | sed -e 's+-I/usr/local/include ++g' -e 's+-I/usr/local/include$++g'`
  75.     if test "$tt" = "$CPPFLAGS"; then
  76.       CPPFLAGS="$CPPFLAGS -I/usr/local/include"
  77. --- 79,95 ----
  78.   have_local_lib=''
  79.   if test "$GCC" = yes; then
  80.     echo 'void f(){}' > conftest.c
  81. !   have_local_include=`${CC-cc} -c -v conftest.c 2>&1 | grep '/usr/local/include'`
  82.     have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep '/usr/local/lib'`
  83.     rm -f conftest.c conftest.o
  84.   fi
  85. ! if test -z "$have_local_lib" -a -d /usr/local/lib; then
  86.     tt=`echo "$LDFLAGS" | sed -e 's+-L/usr/local/lib ++g' -e 's+-L/usr/local/lib$++g'`
  87.     if test "$tt" = "$LDFLAGS"; then
  88.       LDFLAGS="$LDFLAGS -L/usr/local/lib"
  89.     fi
  90.   fi
  91. ! if test -z "$have_local_include" -a -d /usr/local/include; then
  92.     tt=`echo "$CPPFLAGS" | sed -e 's+-I/usr/local/include ++g' -e 's+-I/usr/local/include$++g'`
  93.     if test "$tt" = "$CPPFLAGS"; then
  94.       CPPFLAGS="$CPPFLAGS -I/usr/local/include"
  95. *** ../vim61.083/src/version.c    Sat Jun  1 19:55:43 2002
  96. --- src/version.c    Sat Jun  1 21:59:21 2002
  97. ***************
  98. *** 608,609 ****
  99. --- 608,611 ----
  100.   {   /* Add new patch number below this line */
  101. + /**/
  102. +     84,
  103.   /**/
  104.  
  105. -- 
  106. From "know your smileys":
  107.  :----}    You lie like Pinocchio
  108.  
  109.  ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
  110. ///   Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim   \\\
  111. \\\           Project leader for A-A-P -- http://www.a-a-p.org           ///
  112.  \\\  Help me helping AIDS orphans in Uganda - http://iccf-holland.org  ///
  113.