* Include -I in TCLINC

Makefile.in

@@ -40,7 +40,7 @@ DIFF = @DIFF@
 
 #LIBS = @LIBS@ @ZLIB@
 LIBS = @LIBS@
-INCLUDES = -I@TCLINC@
+INCLUDES = @TCL_INCLUDES@
 
 DEBCXXFLAGS = -DDEBUG -fno-inline -g3 -ggdb3 -O0 -Wshadow -Wpointer-arith -Wcast-align @GCC3DEB@ @GCC4DEB@
 CFLGS = @GCC3@ -fno-rtti @SSL_INCLUDES@

autotools/configure.ac

@@ -278,7 +278,7 @@ if [ "$GIT_REQUIRED" = "1" ]; then
 fi
 ]
 
-CXX="$CXX" TCLINC="$TCLINC" SSL_INCLUDES="$SSL_INCLUDES" SED="$SED" src/generate_defs.sh
+CXX="$CXX" TCL_INCLUDES="$TCL_INCLUDES" SSL_INCLUDES="$SSL_INCLUDES" SED="$SED" src/generate_defs.sh
 [
 if [ $? -ne 0 ]; then
   exit 1

autotools/includes/libtcl.m4

@@ -283,11 +283,16 @@ AC_DEFUN([EGG_TCL_CHECK_HEADER],
     fi
   fi
 
+  TCL_INCLUDES=""
+  if ! test "x$TCLINC" = x; then
+    TCL_INCLUDES="-I$TCLINC"
+  fi
+
   if test "x$TCLINCFN" = x; then
     AC_MSG_RESULT([not found])
   fi
 
-  AC_SUBST(TCLINC)
+  AC_SUBST(TCL_INCLUDES)
   AC_SUBST(TCLINCFN)
 ])
 

configure

@@ -614,7 +614,7 @@ TCL_LIBS
 TCL_REQS
 DEFAULT_MAKE
 TCLINCFN
-TCLINC
+TCL_INCLUDES
 TCLLIBFN
 TCLLIB
 SSL_LIBS
@@ -5772,6 +5772,11 @@ $as_echo "found ${tclheaderpath}/${tcllibfns}/${tclheaderfn}" >&6; }
     fi
   fi
 
+  TCL_INCLUDES=""
+  if ! test "x$TCLINC" = x; then
+    TCL_INCLUDES="-I$TCLINC"
+  fi
+
   if test "x$TCLINCFN" = x; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 $as_echo "not found" >&6; }
@@ -9874,7 +9879,7 @@ if [ "$GIT_REQUIRED" = "1" ]; then
 fi
 
 
-CXX="$CXX" TCLINC="$TCLINC" SSL_INCLUDES="$SSL_INCLUDES" SED="$SED" src/generate_defs.sh
+CXX="$CXX" TCL_INCLUDES="$TCL_INCLUDES" SSL_INCLUDES="$SSL_INCLUDES" SED="$SED" src/generate_defs.sh
 
 if [ $? -ne 0 ]; then
   exit 1

src/generate_defs.sh

@@ -5,7 +5,7 @@ if [ -z "$SED" -o -z "$CXX" ]; then
   exit 1
 fi
 echo "Generating lib symbols"
-INCLUDES="-I${TCLINC} ${SSL_INCLUDES}"
+INCLUDES="${TCL_INCLUDES} ${SSL_INCLUDES}"
 
 mkdir -p src/.defs > /dev/null 2>&1
 TMPFILE=$(mktemp "/tmp/pre.XXXXXX")