diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac
index 4834e867e0..6edfe01bf9 100644
--- a/legacy/evas/configure.ac
+++ b/legacy/evas/configure.ac
@@ -11,8 +11,8 @@ AC_ISC_POSIX
 AM_INIT_AUTOMAKE(1.6 dist-bzip2)
 AM_CONFIG_HEADER(config.h)
 
-AC_PROG_CXX([icl g++])
-AC_PROG_CC([icl gcc]
+AC_PROG_CXX
+AC_PROG_CC
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 AC_C_BIGENDIAN
@@ -112,7 +112,6 @@ AC_SUBST(CFLAGS)
 WIN32_CPPFLAGS=""
 WIN32_CFLAGS=""
 lt_enable_auto_import=""
-lt_no_undefined=""
 case "$host_os" in
         mingw*|cegcc*)
 		PKG_CHECK_MODULES(EVIL, evil)
@@ -128,14 +127,10 @@ case "$host_os" in
                         WIN32_CPPFLAGS="-D_WIN32_WCE=0x0420"
                 fi
                 ;;
-	*cygwin*)
-		lt_no_undefined="-no-undefined"
-		;;
 esac
 AC_SUBST(WIN32_CPPFLAGS)
 AC_SUBST(WIN32_CFLAGS)
 AC_SUBST(lt_enable_auto_import)
-AC_SUBST(lt_no_undefined)
 
 
 dnl when used, that option makes configure script fails when
diff --git a/legacy/evas/src/modules/engines/software_16_x11/Makefile.am b/legacy/evas/src/modules/engines/software_16_x11/Makefile.am
index eb093dca67..8a44b65766 100644
--- a/legacy/evas/src/modules/engines/software_16_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_x11/Makefile.am
@@ -22,7 +22,7 @@ evas_engine.c \
 evas_x_buffer.c
 
 module_la_LIBADD = @EINA_LIBS@ @evas_engine_software_16_x11_libs@ $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -module -avoid-version @lt_no_undefined@
+module_la_LDFLAGS = -no-undefined -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static
 
 include_HEADERS = Evas_Engine_Software_16_X11.h
diff --git a/legacy/evas/src/modules/engines/software_x11/Makefile.am b/legacy/evas/src/modules/engines/software_x11/Makefile.am
index efe9fbe001..76a93c4d22 100644
--- a/legacy/evas/src/modules/engines/software_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_x11/Makefile.am
@@ -35,7 +35,7 @@ evas_xcb_main.c
 endif
 
 module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ @evas_engine_software_x11_libs@ @evas_engine_software_xcb_libs@
-module_la_LDFLAGS = -module -avoid-version @lt_no_undefined@
+module_la_LDFLAGS = -no-undefined -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static
 
 include_HEADERS = Evas_Engine_Software_X11.h
diff --git a/legacy/evas/src/modules/engines/xrender_x11/Makefile.am b/legacy/evas/src/modules/engines/xrender_x11/Makefile.am
index 4a55d4e7b1..907401858a 100644
--- a/legacy/evas/src/modules/engines/xrender_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/xrender_x11/Makefile.am
@@ -35,7 +35,7 @@ evas_engine_xcb_ximage.c
 endif
 
 module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ @evas_engine_xrender_xcb_libs@ @evas_engine_xrender_x11_libs@
-module_la_LDFLAGS = -module -avoid-version @lt_no_undefined@
+module_la_LDFLAGS = -no-undefined -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static
 
 include_HEADERS = Evas_Engine_XRender_X11.h