2 files changed, 6 insertions, 7 deletions

diff --git a/m4/efl.m4 b/m4/efl.m4
index a8ca42775e..4b896eda88 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -427,7 +427,7 @@ m4_defn([UP])_LIBS=" ${m4_defn([UP])_LDFLAGS} ${EFLALL_COV_LIBS} ${EFLALL_LIBS}
 m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}"
 USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la"
 USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la"
-m4_defn([UP])_CFLAGS="${EFLALL_COV_CFLAGS} ${EFLALL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} -I\$(top_srcdir)/src/bindings/cxx/${libdirname} -I\$(top_builddir)/src/bindings/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_eflall} -DEFL_[]m4_defn([UP])_BUILD=1"
+m4_defn([UP])_CFLAGS="${EFL_WINDOWS_VERSION_CFLAGS} ${EFLALL_COV_CFLAGS} ${EFLALL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} -I\$(top_srcdir)/src/bindings/cxx/${libdirname} -I\$(top_builddir)/src/bindings/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_eflall} -DEFL_[]m4_defn([UP])_BUILD=1"
 requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_eflall}"
 requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_eflall}"
 
diff --git a/m4/evil_windows.m4 b/m4/evil_windows.m4
index c59e95dfd3..8876d6c629 100644
--- a/m4/evil_windows.m4
+++ b/m4/evil_windows.m4
@@ -12,15 +12,15 @@ AC_DEFUN([EFL_SELECT_WINDOWS_VERSION],
 dnl configure option
 
 AC_ARG_WITH([windows-version],
-   [AC_HELP_STRING([--with-windows-version], [select the target Windows version (xp, vista or win7) @<:@default=win7@:>@])],
+   [AC_HELP_STRING([--with-windows-version], [select the target Windows version (vista or win7) @<:@default=win7@:>@])],
    [
     if test "x${with_windows_version}" = "xvista" ; then
        _winver="vista"
     else
-       if test "x${with_windows_version}" = "xxp" ; then
-          _winver="xp"
-       else
+       if test "x${with_windows_version}" = "xwin7" ; then
           _winver="win7"
+       else
+          _winver="error"
        fi
     fi
    ],
@@ -39,8 +39,7 @@ case "${_winver}" in
      _efl_windows_version="Windows 7"
      ;;
   *)
-     EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0501"
-     _efl_windows_version="Windows XP"
+     AC_MSG_ERROR([Wrong Windows version passed to configure. Run ./configure --help])
      ;;
 esac