diff --git a/legacy/evil/ChangeLog b/legacy/evil/ChangeLog
index fb12ba307c..d06f6180e3 100644
--- a/legacy/evil/ChangeLog
+++ b/legacy/evil/ChangeLog
@@ -1,3 +1,19 @@
+2008-04-23  Vincent Torri  <doursse at users dot sf dot net>
+
+	* configure.ac:
+	* src/bin/Makefile.am:
+	* src/lib/Makefile.am:
+	* src/lib/dlfcn/Makefile.am:
+	* src/lib/mman/Makefile.am:
+	use -Wl,--enable-auto-import with cegcc
+	fix warning with newest autoconf
+
+	* src/lib/dlfcn/dlfcn.c: (string_to_wchar):
+	include wchar.h and fix warnings
+
+	* src/lib/mman/mman.c:
+	use relative path to include sys/mman.h
+
 2008-03-28  Vincent Torri  <doursse at users dot sf dot net>
 
 	* src/lib/Evil.h:
diff --git a/legacy/evil/configure.ac b/legacy/evil/configure.ac
index 27393195ca..dcaf907b82 100644
--- a/legacy/evil/configure.ac
+++ b/legacy/evil/configure.ac
@@ -10,6 +10,7 @@ dnl otherwise, we set the correct flags
 dnl for each platform.
 win32_libs=""
 win32_cflags=""
+lt_enable_auto_import=""
 case "$host_os" in
   mingw|mingw32)
     win32_libs="-lole32 -luuid -lws2_32"
@@ -17,6 +18,7 @@ case "$host_os" in
   cegcc)
     win32_cflags="-mwin32"
     win32_libs="-lws2"
+    lt_enable_auto_import="-Wl,--enable-auto-import"
     ;;
   mingw32ce)
     win32_libs="-lws2"
@@ -27,6 +29,7 @@ case "$host_os" in
 esac
 AC_SUBST(win32_cflags)
 AC_SUBST(win32_libs)
+AC_SUBST(lt_enable_auto_import)
 
 dnl needed for correct definition of EAPI
 AC_DEFINE(EFL_EVIL_BUILD, 1, [Define to mention that evil is built])
@@ -51,19 +54,19 @@ AC_PROG_CC
 AC_C_CONST
 
 AC_MSG_CHECKING([for __attribute__])
-AC_CACHE_VAL(have___attribute__,
+AC_CACHE_VAL(_cv_have___attribute__,
   [
     AC_TRY_COMPILE([#include <stdlib.h>],
       [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }],
-      [have___attribute__="yes"],
-      [have___attribute__="no"])
+      [_cv_have___attribute__="yes"],
+      [_cv_have___attribute__="no"])
   ]
 )
 
-if test "x${have___attribute__}" = "xyes" ; then
+if test "x${_cv_have___attribute__}" = "xyes" ; then
    AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if your compiler has __attribute__])
 fi
-AC_MSG_RESULT(${have___attribute__})
+AC_MSG_RESULT(${_cv_have___attribute__})
 
 
 AC_CONFIG_FILES([
diff --git a/legacy/evil/src/bin/Makefile.am b/legacy/evil/src/bin/Makefile.am
index fbfe0f11ea..eafa679347 100644
--- a/legacy/evil/src/bin/Makefile.am
+++ b/legacy/evil/src/bin/Makefile.am
@@ -13,12 +13,15 @@ bin_PROGRAMS = test_dlfcn test_pipe test_evil
 
 test_dlfcn_SOURCES = test_dlfcn.c
 test_dlfcn_LDADD = $(top_builddir)/src/lib/libevil.la $(top_builddir)/src/lib/dlfcn/libdl.la
+test_dlfcn_LDFLAGS = @lt_enable_auto_import@
 test_dlfcn_DEPENDENCIES = $(top_builddir)/src/lib/libevil.la $(top_builddir)/src/lib/dlfcn/libdl.la
 
 test_pipe_SOURCES = test_pipe.c
 test_pipe_LDADD = $(top_builddir)/src/lib/libevil.la
+test_pipe_LDFLAGS = @lt_enable_auto_import@
 test_pipe_DEPENDENCIES = $(top_builddir)/src/lib/libevil.la
 
 test_evil_SOURCES = test_evil.c
 test_evil_LDADD = $(top_builddir)/src/lib/libevil.la
+test_evil_LDFLAGS = @lt_enable_auto_import@
 test_evil_DEPENDENCIES = $(top_builddir)/src/lib/libevil.la
diff --git a/legacy/evil/src/lib/Makefile.am b/legacy/evil/src/lib/Makefile.am
index 5dd2484884..72ee5e34fb 100644
--- a/legacy/evil/src/lib/Makefile.am
+++ b/legacy/evil/src/lib/Makefile.am
@@ -10,5 +10,5 @@ libevil_la_SOURCES = evil.c
 
 libevil_la_CFLAGS = @win32_cflags@
 libevil_la_LIBADD = @win32_libs@
-libevil_la_LDFLAGS = -no-undefined -version-info @version_info@
+libevil_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
 
diff --git a/legacy/evil/src/lib/dlfcn/Makefile.am b/legacy/evil/src/lib/dlfcn/Makefile.am
index 3f25c6e272..0fb577cad7 100644
--- a/legacy/evil/src/lib/dlfcn/Makefile.am
+++ b/legacy/evil/src/lib/dlfcn/Makefile.am
@@ -6,4 +6,4 @@ lib_LTLIBRARIES = libdl.la
 include_HEADERS = dlfcn.h
 libdl_la_SOURCES = dlfcn.c
 
-libdl_la_LDFLAGS = -no-undefined -version-info @version_info@
+libdl_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
diff --git a/legacy/evil/src/lib/dlfcn/dlfcn.c b/legacy/evil/src/lib/dlfcn/dlfcn.c
index 933d06d2af..43419688c6 100644
--- a/legacy/evil/src/lib/dlfcn/dlfcn.c
+++ b/legacy/evil/src/lib/dlfcn/dlfcn.c
@@ -5,6 +5,7 @@
 #undef WIN32_LEAN_AND_MEAN
 
 #if defined(__CEGCC__) || defined(__MINGW32CE__)
+# include <wchar.h>
 # include <limits.h>
 #endif /* __MINGW32CE__ */
 
@@ -31,7 +32,8 @@ string_to_wchar(const char *text)
    int      wsize;
 
    wsize = MultiByteToWideChar(CP_ACP, 0, text, strlen(text) + 1, NULL, 0);
-   if (wsize == 0 || wsize > ULONG_MAX/sizeof(wchar_t))
+   if ((wsize == 0) ||
+       (wsize > (int)(ULONG_MAX/sizeof(wchar_t))))
      return NULL;
 
    wtext = malloc(wsize * sizeof(wchar_t));
diff --git a/legacy/evil/src/lib/mman/Makefile.am b/legacy/evil/src/lib/mman/Makefile.am
index 1b9b9beb0b..76498d31f6 100644
--- a/legacy/evil/src/lib/mman/Makefile.am
+++ b/legacy/evil/src/lib/mman/Makefile.am
@@ -6,4 +6,4 @@ lib_LTLIBRARIES = libmman.la
 nobase_include_HEADERS = sys/mman.h
 libmman_la_SOURCES = mman.c
 
-libmman_la_LDFLAGS = -no-undefined -version-info @version_info@
+libmman_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
diff --git a/legacy/evil/src/lib/mman/mman.c b/legacy/evil/src/lib/mman/mman.c
index c1c0bcc0dd..28f728724c 100644
--- a/legacy/evil/src/lib/mman/mman.c
+++ b/legacy/evil/src/lib/mman/mman.c
@@ -8,7 +8,7 @@
 # include <io.h>
 #endif /* ! __CEGCC__ */
 
-#include <sys/mman.h>
+#include "sys/mman.h"
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"