--- simulavrxx_patched/configure.ac	2005-02-09 01:13:05.000000000 +0200
+++ simulavrxx_patched_new/configure.ac	2005-02-09 01:19:42.000000000 +0200
@@ -85,6 +85,7 @@
     AC_MSG_WARN([Failed to find tclConfig.sh... tcl dependent code may fail to build...ask package maintainer to update configure process])
 fi
 
+AC_SUBST([TCL_INCLUDE_SPEC])
 AC_SUBST([TCL_LIB_SPEC])
 AC_SUBST([MYTCL_LIB_SPEC])
 
@@ -199,6 +200,12 @@
 AC_OUTPUT
 
 
+if test "x${swig_path}" == "x"; then
+AC_MSG_WARN([
+*** WARNING ***
+swig not found, so it is not possible to build simulavr.so and tcl examples will not run. Though simulavrxx itself may be built without it.
+])
+fi
 
 echo "swig_path         = " ${swig_path}
 echo "libbfd.a location = " ${bfd_a_location}

--- simulavrxx_patched/src/Makefile.am	2005-02-09 00:49:06.000000000 +0200
+++ simulavrxx_patched_new/src/Makefile.am	2005-02-09 00:16:02.000000000 +0200
@@ -4,6 +4,7 @@
 swig_path = @swig_path@
 CCACHE = @CCACHE@
 address@hidden@
address@hidden@
 
 MAINTAINERCLEANFILES 	= Makefile.in
 
@@ -147,6 +148,7 @@
 
 simulavr_LDADD = $(top_builddir)/src/libavrsim_pp.la $(bfd_a_location)/libbfd.a $(libiberty_location)/libiberty.a
 
+AM_CPPFLAGS=$(TCL_INCLUDE_SPEC)
 AM_CXXFLAGS=-O2
 
 INCLUDES		= -I$(bfd_h_location) -I$(top_srcdir)/src -I $(top_builddir)/src