Index: configure.in
===================================================================
diff -u -ra82b93b0eb26ab0e3e815ffc229bd61b7d5ef2cc -r56203e2407067a525919ac3f5b7d0869eb711a3d
--- configure.in	(.../configure.in)	(revision a82b93b0eb26ab0e3e815ffc229bd61b7d5ef2cc)
+++ configure.in	(.../configure.in)	(revision 56203e2407067a525919ac3f5b7d0869eb711a3d)
@@ -148,8 +148,19 @@
 	FORCE_NO_STUBS=0
 fi
 
+# set the default aol_prefix
 aol_prefix="/usr/local/aolserver"
-if test -d "${prefix}/modules/tcl" ; then aol_prefix="${prefix}" ; fi
+# if we have under ${prefix} either modules/tcl/init.tcl (aolserver
+# style) or modules/tcl/init.tcl (naviserver style), then use
+# ${prefix} as aol_prefix (path for the installation of
+# aolserver/naviserver specific tcl files).
+if test -f "${prefix}/modules/tcl/init.tcl" ; then 
+   aol_prefix="${prefix}"
+else
+   if test -f "${prefix}/tcl/init.tcl" ; then 
+      aol_prefix="${prefix}"
+   fi
+fi
 AC_SUBST(aol_prefix)
 
 #--------------------------------------------------------------------