Index: xorg-server/m4/dolt.m4
===================================================================
--- xorg-server.orig/m4/dolt.m4	2009-04-14 21:14:56.000000000 +0400
+++ xorg-server/m4/dolt.m4	2009-07-15 12:38:33.796848843 +0400
@@ -147,7 +147,7 @@
     cat <<__DOLTLIBTOOL__EOF__ > doltlibtool
 #!$DOLT_BASH
 __DOLTLIBTOOL__EOF__
-    cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool
+    cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool
 top_builddir_slash="${0%%doltlibtool}"
 : ${top_builddir_slash:=./}
 args=()
@@ -163,7 +163,7 @@
 if $modeok && $tagok ; then
     . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
 else
-    exec ${top_builddir_slash}libtool "$[]@"
+    exec ${top_builddir_slash}@host_alias@-libtool "$[]@"
 fi
 __DOLTLIBTOOL__EOF__