diff --git a/configure.ac b/configure.ac
index 5f0157eafa87e6be072ce393a1f250e933860935..78e3ed201228f5d95fd7854b19680a66fc90f4df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,10 +35,25 @@ AM_CONFIG_HEADER([config.h])
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_CC
+dnl
+dnl quick hack for icc
+dnl
+if test "`basename $CC`" = "icc"; then
+    lt_cv_prog_cc_wl='-Wl,'
+fi
+
 AC_PROG_F77
+dnl
+dnl Mmmh. Quite elaborated nowadays
+dnl
+AC_F77_WRAPPERS
+AC_F77_MAIN
+AC_F77_LIBRARY_LDFLAGS
 
 AC_PROG_LIBTOOL
 
+
+
 # change the installation directory. This could surely be done more elegantly...
 AC_PREFIX_DEFAULT([`pwd`])