diff --git a/autogen.sh b/autogen.sh
index 166199d..ddc3b03 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,3 +1,4 @@
+libtoolize --force --copy
 automake -a
 aclocal
 autoconf
diff --git a/configure.in b/configure.in
index 0f8a967..66a4766 100644
--- a/configure.in
+++ b/configure.in
@@ -25,31 +25,37 @@ AC_SUBST(DIACANVAS2_LIBS)
 
 AC_PATH_PROG(MCS, mcs, no)
 if test "x$MCS" = "xno"; then
-	AC_PATH_PROG(MCS, mcs.exe, no)
+	AC_MSG_CHECKING(for mcs.exe)
+	MCS=`which mcs.exe 2> /dev/null`
 	if test "x$MCS" = "xno" ; then
 		AC_MSG_ERROR(['mcs'/'mcs.exe' not found.])
 	fi
-	MCS="$(MONO) $(MCS)"
+	AC_MSG_RESULT($MCS)
+	MCS="$MONO $MCS"
 fi
 AC_SUBST(MCS)
 
 AC_PATH_PROG(GAPI_FIXUP, gapi-fixup, no)
 if test "x$GAPI_FIXUP" = "xno"; then
-	AC_PATH_PROG(GAPI_FIXUP, gapi-fixup.exe, no)
+	AC_MSG_CHECKING(for gapi-fixup.exe)
+	GAPI_FIXUP=`which gapi-fixup.exe 2> /dev/null`
 	if test "x$GAPI_FIXUP" = "xno" ; then
 		AC_MSG_ERROR(['gapi_fixup'/'gapi-fixup.exe' not found.])
 	fi
-	GAPI_FIXUP="$(MONO) $(GAPI_FIXUP)"
+	AC_MSG_RESULT($GAPI_FIXUP)
+	GAPI_FIXUP="$MONO $GAPI_FIXUP"
 fi
 AC_SUBST(GAPI_FIXUP)
 
 AC_PATH_PROG(GAPI_CODEGEN, gapi_codegen, no)
 if test "x$GAPI_CODEGEN" = "xno"; then
-	AC_PATH_PROG(GAPI_CODEGEN, gapi_codegen.exe, no)
+	AC_MSG_CHECKING(for gapi-codegen.exe)
+	GAPI_CODEGEN=`which gapi_codegen.exe 2> /dev/null`
 	if test "x$GAPI_CODEGEN" = "xno" ; then
 		AC_MSG_ERROR(['gapi_codegen'/'gapi_codegen.exe' not found.])
 	fi
-	GAPI_CODEGEN="$(MONO) $(GAPI_CODEGEN)"
+	AC_MSG_RESULT([$GAPI_CODEGEN])
+	GAPI_CODEGEN="$MONO $GAPI_CODEGEN"
 fi
 AC_SUBST(GAPI_CODEGEN)