--- /usr/origsrc/evas-0.9.9.050/./configure.in	2008-09-25 04:20:51.000000000 +0200
+++ ./configure.in	2008-12-10 18:35:17.438601900 +0100
@@ -21,6 +21,7 @@
 AC_LIBTOOL_WIN32_DLL
 define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
 AC_PROG_LIBTOOL
+AC_DEFINE_UNQUOTED(SHARED_LIB_SUFFIX, "$shrext_cmds", [Suffix for shared objects])
 
 VMAJ=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $1);}'`
 VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'`
@@ -53,6 +54,10 @@
                 fi
                 lt_no_undefined="-no-undefined"
                 ;;
+	cygwin)
+		AC_DEFINE(EFL_EVAS_BUILD, 1, [Define to mention that evas is built])
+		lt_no_undefined="-no-undefined"
+		;;
 esac
 AC_SUBST(WIN32_CFLAGS)
 AC_SUBST(lt_no_undefined)
@@ -273,7 +278,11 @@
 
 #######################################
 ## Check if we should build the 16bit software_wince engine
-want_evas_software_16_wince="auto";
+if test "$host_os" = "cygwin" ; then
+    want_evas_software_16_wince="no";
+else
+    want_evas_software_16_wince="auto";
+fi
 have_evas_software_16_wince="no";
 
 AC_MSG_CHECKING(whether 16 bit software WinCE backend is to be built)
--- /usr/origsrc/evas-0.9.9.050/./src/lib/file/evas_module.c	2008-08-17 09:42:56.000000000 +0200
+++ ./src/lib/file/evas_module.c	2008-12-10 18:36:57.941174700 +0100
@@ -248,10 +248,8 @@
      default:
         snprintf(buf, sizeof(buf), "%s/%s/%s/object_%s.dll", em->path, em->name, MODULE_ARCH, em->name);
    }
-#elif _WIN32
-   snprintf(buf, sizeof(buf), "%s/%s/%s/module.dll", em->path, em->name, MODULE_ARCH);
-#else
-   snprintf(buf, sizeof(buf), "%s/%s/%s/module.so", em->path, em->name, MODULE_ARCH);
+#else 
+   snprintf(buf, sizeof(buf), "%s/%s/%s/module" SHARED_LIB_SUFFIX, em->path, em->name, MODULE_ARCH);
 #endif
    if (!evas_file_path_exists(buf))
      {
--- /usr/origsrc/evas-0.9.9.050/./src/modules/engines/glitz_x11/Makefile.am	2008-08-17 09:42:56.000000000 +0200
+++ ./src/modules/engines/glitz_x11/Makefile.am	2008-12-11 16:31:06.706217900 +0100
@@ -25,7 +25,7 @@
 evas_engine_gradient.c
 
 module_la_LIBADD = @x_libs@ @GLITZ_LIBS@ $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -module -avoid-version
+module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 
--- /usr/origsrc/evas-0.9.9.050/./src/modules/engines/gl_x11/Makefile.am	2008-08-17 09:42:56.000000000 +0200
+++ ./src/modules/engines/gl_x11/Makefile.am	2008-12-11 16:32:10.348472100 +0100
@@ -22,7 +22,7 @@
 evas_x_main.c
 
 module_la_LIBADD = @gl_libs@ @x_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -module -avoid-version
+module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 
--- /usr/origsrc/evas-0.9.9.050/./src/modules/engines/software_x11/Makefile.am	2008-08-17 09:42:56.000000000 +0200
+++ ./src/modules/engines/software_x11/Makefile.am	2008-12-11 16:34:09.492147100 +0100
@@ -24,7 +24,7 @@
 evas_x_main.c
 
 module_la_LIBADD = @x_libs@ $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -module -avoid-version
+module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 
--- /usr/origsrc/evas-0.9.9.050/./src/modules/engines/software_xcb/Makefile.am	2008-08-17 09:42:56.000000000 +0200
+++ ./src/modules/engines/software_xcb/Makefile.am	2008-12-11 16:34:33.742767900 +0100
@@ -24,7 +24,7 @@
 evas_xcb_main.c
 
 module_la_LIBADD = @XCB_LIBS@ $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -module -avoid-version
+module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 
--- /usr/origsrc/evas-0.9.9.050/./src/modules/engines/xrender_x11/Makefile.am	2008-08-17 09:42:56.000000000 +0200
+++ ./src/modules/engines/xrender_x11/Makefile.am	2008-12-11 16:35:56.198003700 +0100
@@ -25,7 +25,7 @@
 evas_engine_gradient.c
 
 module_la_LIBADD = @x_libs@ -lXrender $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -module -avoid-version
+module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 
--- /usr/origsrc/evas-0.9.9.050/./src/modules/engines/xrender_xcb/Makefile.am	2008-08-17 09:42:56.000000000 +0200
+++ ./src/modules/engines/xrender_xcb/Makefile.am	2008-12-11 16:36:37.199053300 +0100
@@ -25,7 +25,7 @@
 evas_engine_gradient.c
 
 module_la_LIBADD = @XCBRENDER_LIBS@ $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -module -avoid-version
+module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static
 module_la_DEPENDENCIES = $(top_builddir)/config.h