Fix compile and link issue found in pkgs environment

Makefile.in

@@ -166,7 +166,7 @@ PKG_CFLAGS	= @PKG_CFLAGS@
 # you do not compile with a similar machine setup as the Tcl core was
 # compiled with.
 #DEFS		= $(TCL_DEFS) @DEFS@ $(PKG_CFLAGS)
-DEFS		= @DEFS@ $(PKG_CFLAGS) -DITCL_LIBRARY="$(pkglibdir)"
+DEFS		= @DEFS@ $(PKG_CFLAGS) $(SHLIB_CFLAGS) -DITCL_LIBRARY="$(pkglibdir)"
 
 # Move pkgIndex.tcl to 'BINARIES' var if it is generated in the Makefile
 CONFIG_CLEAN_FILES = @CONFIG_CLEAN_FILES@ Makefile itclConfig.sh pkgIndex.tcl

configure

@@ -5538,7 +5538,7 @@ printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
 
 
-    vars="-I. -I\"`${CYGPATH} ${srcdir}/generic`\""
+    vars="-I. -I\"`${CYGPATH} ${srcdir}/generic`\" -I\"`${CYGPATH} ${srcdir}`\""
     for i in $vars; do
 	PKG_INCLUDES="$PKG_INCLUDES $i"
     done
@@ -9246,7 +9246,7 @@ eval itcl_SRC_DIR="$srcdir"
 itcl_SRC_DIR=`cd "${itcl_SRC_DIR}"; pwd`
 
 
-eval itcl_INCLUDE_SPEC="-I${itcl_SRC_DIR}/generic"
+eval itcl_INCLUDE_SPEC="-I${itcl_SRC_DIR}/generic -I${itcl_SRC_DIR}"
 
 
 #--------------------------------------------------------------------

configure.ac

@@ -137,7 +137,7 @@ TEA_ADD_HEADERS([generic/itcl.h
                 generic/itcl2TclOO.h
                 generic/itclIntDecls.h
 		])
-TEA_ADD_INCLUDES([-I. -I\"`${CYGPATH} ${srcdir}/generic`\"])
+TEA_ADD_INCLUDES([-I. -I\"`${CYGPATH} ${srcdir}/generic`\" -I\"`${CYGPATH} ${srcdir}`\"])
 TEA_ADD_LIBS([])
 TEA_ADD_CFLAGS([])
 TEA_ADD_STUB_SOURCES(itclStubLib.c)
@@ -263,7 +263,7 @@ eval itcl_SRC_DIR="$srcdir"
 itcl_SRC_DIR=`cd "${itcl_SRC_DIR}"; pwd`
 AC_SUBST(itcl_SRC_DIR)
 
-eval itcl_INCLUDE_SPEC="-I${itcl_SRC_DIR}/generic"
+eval itcl_INCLUDE_SPEC="-I${itcl_SRC_DIR}/generic -I${itcl_SRC_DIR}"
 AC_SUBST(itcl_INCLUDE_SPEC)
 
 #--------------------------------------------------------------------