--- config/mkcommon.inc.in.orig	2010-10-18 11:28:33.000000000 +0200
+++ config/mkcommon.inc.in	2010-10-18 11:29:11.000000000 +0200
@@ -64,8 +64,8 @@
 RPATH              = @RPATH@
 
 LIBTOOL            = $(top_builddir)/libtool --silent
-LIBTOOL_CC         = $(LIBTOOL) --mode=compile
-LIBTOOL_LD         = $(LIBTOOL) --mode=link
+LIBTOOL_CC         = $(LIBTOOL) --mode=compile --tag=CC
+LIBTOOL_LD         = $(LIBTOOL) --mode=link --tag=CC
 LIBTOOL_EXE        = $(LIBTOOL) --mode=execute -dlopen $(LIBNAME)
 
 # Java
--- config/mkmainlib.inc.in.orig	2010-04-29 08:50:03.000000000 -0500
+++ config/mkmainlib.inc.in	2011-02-04 16:07:55.000000000 -0600
@@ -29,7 +29,7 @@
 	@-if test "$(WITH_SHARED)" = "no"; then	\
 	    cp .libs/$(MAINLIBNAME) .libs/$(MAINLIBNAME)i;\
 	fi
-	$(LIBTOOL) $(INSTALL_DATA) $(MAINLIBNAME) $(DESTDIR)$(libdir);
+	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(MAINLIBNAME) $(DESTDIR)$(libdir);
 	@-if test "$(WITH_SHARED)" = "yes"; then	\
 	    $(LIBTOOL) -n --finish $(DESTDIR)$(libdir);\
 	else\