From c5aa4521858510499434d855b153670bce2b2ca2 Mon Sep 17 00:00:00 2001 From: edyfox Date: Thu, 24 Jul 2008 13:38:55 +0000 Subject: [PATCH] Patch 7.2b.011 Problem: Configure for TCL ends up with include file in compiler command. (Richard Hogg) Solution: Delete items from $TCL_DEFS that do not start with a dash. Files: src/auto/configure, src/configure.in git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/branches/vim7.2@1122 2a77ed30-b011-0410-a7ad-c7884a0aa172 --- src/auto/configure | 2 +- src/configure.in | 2 +- src/version.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/auto/configure b/src/auto/configure index ba65612b..1843a9e3 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -5598,7 +5598,7 @@ $as_echo_n "checking for location of tclConfig.sh script... " >&6; } $as_echo "$try/tclConfig.sh" >&6; } . $try/tclConfig.sh TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"` - TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'` + TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^[^-]/d' -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'` break fi done diff --git a/src/configure.in b/src/configure.in index 7c65fab6..49acc196 100644 --- a/src/configure.in +++ b/src/configure.in @@ -866,7 +866,7 @@ if test "$enable_tclinterp" = "yes"; then TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"` dnl Use $TCL_DEFS for -D_THREAD_SAFE et al. But only use the dnl "-D_ABC" items. Watch out for -DFOO=long\ long. - TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^-[[^D]]/d' -e '/-D[[^_]]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'` + TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^[[^-]]/d' -e '/^-[[^D]]/d' -e '/-D[[^_]]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'` break fi done diff --git a/src/version.c b/src/version.c index d44cd658..cd69cfc0 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 11, +/**/ 10, /**/ 9, -- 2.11.4.GIT