Index: classpath-0.93/configure.ac
===================================================================
--- classpath-0.93.orig/configure.ac	2006-12-08 20:22:50.000000000 +0100
+++ classpath-0.93/configure.ac	2008-08-25 22:07:40.711946598 +0200
@@ -41,6 +41,11 @@
 AC_CONFIG_HEADERS([include/config.h])
 AC_PREFIX_DEFAULT(/usr/local/classpath)
 
+AC_CONFIG_MACRO_DIR([m4])
+
+
+AM_ICONV_LINK
+
 dnl -----------------------------------------------------------
 dnl Enable collections.jar (disabled by default)
 dnl -----------------------------------------------------------
@@ -312,6 +317,7 @@
 dnl AC_PROG_AWK
 AC_PROG_CC
 AC_PROG_CPP
+AM_PROG_CC_C_O
 
 # Handle -Werror default case.
 if test "$ENABLE_WERROR" = default; then
Index: classpath-0.93/Makefile.am
===================================================================
--- classpath-0.93.orig/Makefile.am	2006-02-08 08:35:30.000000000 +0100
+++ classpath-0.93/Makefile.am	2008-08-24 21:45:42.405241264 +0200
@@ -4,7 +4,7 @@
 SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR)
 DIST_SUBDIRS = lib doc external include native resource scripts tools examples
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 --install
 
 native: lib