To: vim-dev@vim.org Subject: Patch 6.1.084 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.084 (depends on 6.1.080) Problem: "include" and "lib" are mixed up when checking the directories gcc already searches. Solution: Swap the variable names. (SunHo Kim) Files: src/auto/configure, src/configure.in *** ../vim61.083/src/auto/configure Mon May 20 21:33:19 2002 --- src/auto/configure Sat Jun 1 21:56:56 2002 *************** *** 1159,1175 **** 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" --- 1159,1175 ---- have_local_lib='' if test "$GCC" = yes; then echo 'void f(){}' > conftest.c ! have_local_include=`${CC-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_lib" -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_include" -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.083/src/configure.in Mon May 20 21:33:19 2002 --- src/configure.in Sat Jun 1 21:56:53 2002 *************** *** 79,95 **** 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" --- 79,95 ---- have_local_lib='' if test "$GCC" = yes; then echo 'void f(){}' > conftest.c ! have_local_include=`${CC-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_lib" -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_include" -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.083/src/version.c Sat Jun 1 19:55:43 2002 --- src/version.c Sat Jun 1 21:59:21 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 84, /**/ -- From "know your smileys": :----} You lie like Pinocchio /// 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 ///