diff --git a/configure.ac b/configure.ac
index 60b57cd3a..7850a4bb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -435,30 +435,7 @@ AC_MSG_RESULT([$result])
 subshell="$result"
 
 
-dnl
-dnl Select the screen library.
-dnl
-AC_ARG_WITH(screen,
-	[  --with-screen=LIB        Compile with screen library: slang or
-                           ncurses [[slang if found]]])
-
-case x$with_screen in
-xslang)
-	MC_WITH_SLANG(strict)
-	;;
-xncurses)
-	MC_WITH_NCURSES
-	;;
-xncursesw)
-	MC_WITH_NCURSESW
-	;;
-x)
-	MC_WITH_SLANG
-	;;
-*)
-	AC_MSG_ERROR([Value of the screen library is incorrect])
-	;;
-esac
+MC_WITH_SCREEN
 
 
 dnl
diff --git a/m4.include/mc-with-screen-ncurses.m4 b/m4.include/mc-with-screen-ncurses.m4
new file mode 100644
index 000000000..195235422
--- /dev/null
+++ b/m4.include/mc-with-screen-ncurses.m4
@@ -0,0 +1,197 @@
+dnl check for ncurses in user supplied path
+AC_DEFUN([MC_CHECK_NCURSES_BY_PATH], [
+
+    ac_ncurses_inc_path=[$1]
+    ac_ncurses_lib_path=[$2]
+
+    if test x"$ac_ncurses_inc_path" != x; then
+        ac_ncurses_inc_path="-I"$ac_ncurses_inc_path
+    fi
+
+    if test x"$ac_ncurses_lib_path" != x; then
+        ac_ncurses_lib_path="-L"$ac_ncurses_lib_path
+    fi
+
+    saved_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $ac_ncurses_inc_path"
+
+    dnl Check for the headers
+    dnl Both headers should be in the same directory
+    dnl AIX term.h is unusable for mc
+    AC_MSG_CHECKING([for ncurses/ncurses.h and ncurses/term.h])
+    AC_PREPROC_IFELSE(
+        [
+            AC_LANG_PROGRAM([[#include <ncurses/ncurses.h>
+                              #include <ncurses/term.h>
+                            ]],[[return 0;]])
+        ],
+        [
+            AC_MSG_RESULT(yes)
+            if test x"$ac_ncurses_inc_path" = x; then
+                ac_ncurses_inc_path="-I/usr/include"
+            fi
+            if test x"$ac_ncurses_lib_path" = x; then
+              ac_ncurses_lib_path="-L/usr/lib"
+            fi
+            found_ncurses=yes
+            AC_DEFINE(HAVE_NCURSES_NCURSES_H, 1,
+                      [Define to 1 if you have the <ncurses/ncurses.h> header file.])
+            AC_DEFINE(HAVE_NCURSES_TERM_H, 1,
+                      [Define to 1 if you have the <ncurses/term.h> header file.])
+        ],
+        [
+            AC_MSG_RESULT(no)
+            found_ncurses=no
+            error_msg_ncurses="ncurses header not found"
+        ],
+    )
+
+    if test x"$found_ncurses" = x"yes"; then
+        screen_type=ncurses
+        screen_msg="ncurses library (installed on the system)"
+
+        AC_DEFINE(HAVE_NCURSES, 1,
+                  [Define to use ncurses library for screen management])
+
+        MCLIBS="$MCLIBS $ac_ncurses_lib_path"
+    else
+        CPPFLAGS="$saved_CPPFLAGS"
+        AC_MSG_ERROR([$error_msg_ncurses])
+    fi
+])
+
+dnl
+dnl Use the ncurses library.  It can only be requested explicitly,
+dnl so just fail if anything goes wrong.
+dnl
+dnl If ncurses exports the ESCDELAY variable it should be set to 0
+dnl or you'll have to press Esc three times to dismiss a dialog box.
+dnl
+AC_DEFUN([MC_WITH_NCURSES], [
+    dnl has_colors() is specific to ncurses, it's not in the old curses
+    save_LIBS="$LIBS"
+    ncursesw_found=
+
+    dnl get the user supplied include path
+    AC_ARG_WITH([ncurses-includes],
+        AC_HELP_STRING([--with-ncurses-includes=@<:@DIR@:>@],
+            [set path to ncurses includes @<:@default=/usr/include@:>@; make sense only if --with-screen=ncurses; for /usr/local/include/ncurses specify /usr/local/include]
+        ),
+        [ac_ncurses_inc_path="$withval"],
+        [ac_ncurses_inc_path=""]
+    )
+
+    dnl get the user supplied lib path
+    AC_ARG_WITH([ncurses-libs],
+        AC_HELP_STRING([--with-ncurses-libs=@<:@DIR@:>@],
+            [set path to ncurses library @<:@default=/usr/lib@:>@; make sense only if --with-screen=ncurses]
+        ),
+        [ac_ncurses_lib_path="$withval"],
+        [ac_ncurses_lib_path=""]
+    )
+
+    dnl we need at least the inc path, the lib may be in a std location
+    if test x"$ac_ncurses_inc_path" != x; then
+        dnl check the user supplied location
+        MC_CHECK_NCURSES_BY_PATH([$ac_ncurses_inc_path],[$ac_ncurses_lib_path])
+
+        LIBS=
+        AC_SEARCH_LIBS([has_colors], [ncurses], [MCLIBS="$MCLIBS $LIBS"], 
+                       [AC_MSG_ERROR([Cannot find ncurses library])])
+
+        screen_type=ncurses
+        screen_msg="ncurses library"
+        AC_DEFINE(USE_NCURSES, 1, 
+                  [Define to use ncurses for screen management])
+    else
+        LIBS=
+        AC_SEARCH_LIBS([addwstr], [ncursesw ncurses curses], [MCLIBS="$MCLIBS $LIBS";ncursesw_found=yes],
+                       [AC_MSG_WARN([Cannot find ncurses library, that support wide characters])])
+
+        if test x"$ncursesw_found" = "x"; then
+            LIBS=
+            AC_SEARCH_LIBS([has_colors], [ncurses curses], [MCLIBS="$MCLIBS $LIBS"], 
+                           [AC_MSG_ERROR([Cannot find ncurses library])])
+        fi
+
+        dnl Check the header
+        ncurses_h_found=
+        AC_CHECK_HEADERS([ncursesw/curses.h ncurses/curses.h ncurses.h curses.h], 
+                         [ncurses_h_found=yes; break])
+
+        if test x"$ncurses_h_found" = "x"; then
+            AC_MSG_ERROR([Cannot find ncurses header file])
+        fi
+
+        screen_type=ncurses
+        screen_msg="ncurses library"
+        AC_DEFINE(USE_NCURSES, 1, 
+                  [Define to use ncurses for screen management])
+    fi
+
+    dnl check for ESCDELAY
+    AC_CACHE_CHECK([for ESCDELAY variable],
+                   [mc_cv_ncurses_escdelay],
+                   [AC_TRY_LINK([], [
+                        extern int ESCDELAY;
+                        ESCDELAY = 0;
+                        ],
+                        [mc_cv_ncurses_escdelay=yes],
+                        [mc_cv_ncurses_escdelay=no])
+    ])
+    if test x"$mc_cv_ncurses_escdelay" = xyes; then
+        AC_DEFINE(HAVE_ESCDELAY, 1, 
+                  [Define if ncurses has ESCDELAY variable])
+    fi
+
+    dnl check for resizeterm
+    AC_CHECK_FUNCS(resizeterm)
+    LIBS="$save_LIBS"
+])
+
+dnl
+dnl Use the ncursesw library.  It can only be requested explicitly,
+dnl so just fail if anything goes wrong.
+dnl
+dnl If ncursesw exports the ESCDELAY variable it should be set to 0
+dnl or you'll have to press Esc three times to dismiss a dialog box.
+dnl
+
+AC_DEFUN([MC_WITH_NCURSESW], [
+    dnl has_colors() is specific to ncurses, it's not in the old curses
+    save_LIBS="$LIBS"
+    LIBS=
+    AC_SEARCH_LIBS([has_colors], [ncursesw], [MCLIBS="$MCLIBS $LIBS"],
+		   [AC_MSG_ERROR([Cannot find ncursesw library])])
+
+    dnl Check the header
+    ncurses_h_found=
+    AC_CHECK_HEADERS([ncursesw/curses.h],
+		     [ncursesw_h_found=yes; break])
+
+    if test  x"$ncursesw_h_found" = "x"; then
+	AC_MSG_ERROR([Cannot find ncursesw header file])
+    fi
+
+    screen_type=ncursesw
+    screen_msg="ncursesw library"
+    AC_DEFINE(USE_NCURSESW, 1,
+	      [Define to use ncursesw for screen management])
+
+    AC_CACHE_CHECK([for ESCDELAY variable],
+		   [mc_cv_ncursesw_escdelay],
+		   [AC_TRY_LINK([], [
+			extern int ESCDELAY;
+			ESCDELAY = 0;
+			],
+			[mc_cv_ncursesw_escdelay=yes],
+			[mc_cv_ncursesw_escdelay=no])
+    ])
+    if test x"$mc_cv_ncursesw_escdelay" = xyes; then
+	AC_DEFINE(HAVE_ESCDELAY, 1,
+		  [Define if ncursesw has ESCDELAY variable])
+    fi
+
+    AC_CHECK_FUNCS(resizeterm)
+    LIBS="$save_LIBS"
+])
diff --git a/m4.include/mc-with-screen-slang.m4 b/m4.include/mc-with-screen-slang.m4
new file mode 100644
index 000000000..0a13b9c0e
--- /dev/null
+++ b/m4.include/mc-with-screen-slang.m4
@@ -0,0 +1,223 @@
+dnl
+dnl Check if the system S-Lang library can be used.
+dnl If not, and $1 is "strict", exit.
+dnl
+
+AC_DEFUN([MC_CHECK_SLANG_BY_PATH], [
+
+    param_slang_inc_path=[$1]
+    param_slang_lib_path=[$2]
+
+    if test x"$param_slang_inc_path" != x; then
+        ac_slang_inc_path="-I"$param_slang_inc_path
+    fi
+
+    if test x"$param_slang_lib_path" != x; then
+        ac_slang_lib_path="-L"$param_slang_lib_path
+    fi
+
+    saved_CFLAGS="$CFLAGS"
+    saved_CPPFLAGS="$CPPFLAGS"
+    saved_LDFLAGS="$LDFLAGS"
+
+    CFLAGS="$CFLAGS $ac_slang_inc_path $ac_slang_lib_path"
+    CPPFLAGS="$saved_CPPFLAGS $ac_slang_inc_path $ac_slang_lib_path"
+
+    dnl Check the header
+    AC_MSG_CHECKING([for slang.h])
+    AC_PREPROC_IFELSE(
+	[
+	    AC_LANG_PROGRAM([#include <slang.h>],[return 0;])
+	],
+	[
+	    AC_MSG_RESULT(yes)
+	    if test x"$ac_slang_inc_path" = x; then
+		ac_slang_inc_path="-I/usr/include"
+	    fi
+	    if test x"$ac_slang_lib_path" = x; then
+		ac_slang_lib_path="-L/usr/lib"
+	    fi
+	    found_slang=yes
+	    AC_DEFINE(HAVE_SLANG_H, 1,[Define to use slang.h])
+
+	],
+	[
+	    AC_MSG_RESULT(no)
+	    AC_MSG_CHECKING([for slang/slang.h])
+	    AC_PREPROC_IFELSE(
+		[
+		    AC_LANG_PROGRAM([#include <slang/slang.h>],[return 0;])
+		],
+		[
+		    AC_MSG_RESULT(yes)
+		    if test x"$ac_slang_inc_path" = x; then
+			ac_slang_inc_path="-I/usr/include"
+		    fi
+		    if test x"$ac_slang_lib_path" = x; then
+			ac_slang_lib_path="-L/usr/lib"
+		    fi
+		    found_slang=yes
+		    AC_DEFINE(HAVE_SLANG_SLANG_H, 1,[Define to use slang.h])
+		    CFLAGS="-DHAVE_SLANG_SLANG_H $CFLAGS"
+		],
+		[
+		    AC_MSG_RESULT(no)
+		    found_slang=no
+		    error_msg_slang="Slang header not found"
+		]
+	    )
+	],
+    )
+    dnl check if S-Lang have version 2.0 or newer
+    if test x"$found_slang" = x"yes"; then
+        AC_MSG_CHECKING([for S-Lang version 2.0 or newer])
+        AC_RUN_IFELSE([
+#ifdef HAVE_SLANG_SLANG_H
+#include <slang/slang.h>
+#else
+#include <slang.h>
+#endif
+int main (void)
+{
+#if SLANG_VERSION >= 20000
+    return 0;
+#else
+    return 1;
+#endif
+}
+],
+	    [mc_slang_is_valid_version=yes],
+	    [mc_slang_is_valid_version=no],
+	    [
+	    if test -f "$param_slang_inc_path/slang/slang.h" ; then
+	        hdr_file="$param_slang_inc_path/slang/slang.h"
+	    else
+	        hdr_file="$param_slang_inc_path/slang.h"
+	    fi
+	    mc_slang_is_valid_version=`grep '^#define SLANG_VERSION[[:space:]]' "$hdr_file"| sed s'/^#define SLANG_VERSION[[:space:]]*//'`
+	    if test "$mc_slang_is_valid_version" -ge "20000"; then
+		mc_slang_is_valid_version=yes
+	    else
+		mc_slang_is_valid_version=no
+	    fi
+	    ]
+	)
+	if test x$mc_slang_is_valid_version = xno; then
+            found_slang=no
+            error_msg_slang="S-Lang library version 2.0 or newer not found"
+	fi
+	AC_MSG_RESULT($mc_slang_is_valid_version)
+    fi
+
+    dnl Check if termcap is needed.
+    dnl This check must be done before anything is linked against S-Lang.
+    if test x"$found_slang" = x"yes"; then
+        MC_SLANG_TERMCAP
+        if test x"$mc_cv_slang_termcap"  = x"yes"; then
+	    saved_CPPFLAGS="-ltermcap $saved_CPPFLAGS "
+	    saved_LDFLAGS="-ltermcap $saved_LDFLAGS"
+        fi
+
+
+        dnl Check the library
+	unset ac_cv_lib_slang_SLang_init_tty
+        AC_CHECK_LIB(
+            [slang],
+            [SLang_init_tty],
+            [:],
+            [
+                found_slang=no
+                error_msg_slang="S-lang library not found"
+            ]
+        )
+    fi
+
+    dnl Unless external S-Lang was requested, reject S-Lang with UTF-8 hacks
+    if test x"$found_slang" = x"yes"; then
+	unset ac_cv_lib_slang_SLsmg_write_nwchars
+        AC_CHECK_LIB(
+            [slang],
+            [SLsmg_write_nwchars],
+            [
+                found_slang=no
+                error_msg_slang="Rejecting S-Lang with UTF-8 support, it's not fully supported yet"
+            ],
+            [:]
+        )
+    fi
+
+    if test x"$found_slang" = x"yes"; then
+        screen_type=slang
+        screen_msg="S-Lang library (installed on the system)"
+
+        AC_DEFINE(HAVE_SLANG, 1,
+            [Define to use S-Lang library for screen management])
+
+        MCLIBS="$ac_slang_lib_path -lslang $MCLIBS"
+        CFLAGS="$ac_slang_inc_path $saved_CFLAGS"
+        dnl do not reset CPPFLAGS
+        dnl - if CPPFLAGS are resetted then cpp does not find the specified header
+        LDFLAGS="$saved_LDFLAGS"
+    else
+        CFLAGS="$saved_CFLAGS"
+        CPPFLAGS="$saved_CPPFLAGS"
+        LDFLAGS="$saved_LDFLAGS"
+    fi
+])
+
+dnl
+dnl Use the slang library.
+dnl
+AC_DEFUN([MC_WITH_SLANG], [
+    with_screen=slang
+    found_slang=yes
+    error_msg_slang=""
+
+    AC_ARG_WITH([slang-includes],
+        AC_HELP_STRING([--with-slang-includes=@<:@DIR@:>@],
+            [set path to SLANG includes @<:@default=/usr/include@:>@; make sense only if --with-screen=slang]
+        ),
+        [ac_slang_inc_path="$withval"],
+        [ac_slang_inc_path=""]
+    )
+
+    AC_ARG_WITH([slang-libs],
+        AC_HELP_STRING([--with-slang-libs=@<:@DIR@:>@],
+            [set path to SLANG library @<:@default=/usr/lib@:>@; make sense only if --with-screen=slang]
+        ),
+        [ac_slang_lib_path="$withval"],
+        [ac_slang_lib_path=""]
+    )
+    if test x"$ac_slang_lib_path" != x -o x"$ac_slang_inc_path" != x; then
+        echo 'checking SLANG-headers in specified place ...'
+        MC_CHECK_SLANG_BY_PATH([$ac_slang_inc_path],[$ac_slang_lib_path])
+    else
+        found_slang=no
+        PKG_CHECK_MODULES(SLANG, [slang >= 2.0], [found_slang=yes], [:])
+        if test x"$found_slang" = "xyes"; then
+            MCLIBS="$SLANG_LIBS $MCLIBS"
+            CFLAGS="$SLANG_CFLAGS $CFLAGS"
+        fi
+    fi
+
+    if test x"$found_slang" = "xno"; then
+        found_slang=yes
+        ac_slang_inc_path="/usr/include"
+        ac_slang_lib_path="/usr/lib"
+
+        echo 'checking SLANG-headers in /usr ...'
+        MC_CHECK_SLANG_BY_PATH([$ac_slang_inc_path],[$ac_slang_lib_path])
+        if test x"$found_slang" = "xno"; then
+            found_slang=yes
+            ac_slang_inc_path="/usr/local/include"
+            ac_slang_lib_path="/usr/local/lib"
+
+            echo 'checking SLANG-headers in /usr/local ...'
+            MC_CHECK_SLANG_BY_PATH( $ac_slang_inc_path , $ac_slang_lib_path )
+            if test x"$found_slang" = "xno"; then
+                AC_MSG_ERROR([$error_msg_slang])
+            fi
+        fi
+    fi
+
+])
diff --git a/m4.include/mc-with-screen.m4 b/m4.include/mc-with-screen.m4
index de6eeaa46..03c5a9dd1 100644
--- a/m4.include/mc-with-screen.m4
+++ b/m4.include/mc-with-screen.m4
@@ -1,420 +1,31 @@
+m4_include([m4.include/mc-with-screen-ncurses.m4])
+m4_include([m4.include/mc-with-screen-slang.m4])
+
 dnl
-dnl Check if the system S-Lang library can be used.
-dnl If not, and $1 is "strict", exit.
+dnl Select the screen library.
 dnl
-AC_DEFUN([MC_CHECK_SLANG_BY_PATH], [
 
-    param_slang_inc_path=[$1]
-    param_slang_lib_path=[$2]
+AC_DEFUN([MC_WITH_SCREEN], [
 
-    if test x"$param_slang_inc_path" != x; then
-        ac_slang_inc_path="-I"$param_slang_inc_path
-    fi
+    AC_ARG_WITH(screen,
+        [  --with-screen=LIB        Compile with screen library: slang or
+                           ncurses [[slang if found]]])
 
-    if test x"$param_slang_lib_path" != x; then
-        ac_slang_lib_path="-L"$param_slang_lib_path
-    fi
-
-    saved_CFLAGS="$CFLAGS"
-    saved_CPPFLAGS="$CPPFLAGS"
-    saved_LDFLAGS="$LDFLAGS"
-
-    CFLAGS="$CFLAGS $ac_slang_inc_path $ac_slang_lib_path"
-    CPPFLAGS="$saved_CPPFLAGS $ac_slang_inc_path $ac_slang_lib_path"
-
-    dnl Check the header
-    AC_MSG_CHECKING([for slang.h])
-    AC_PREPROC_IFELSE(
-	[
-	    AC_LANG_PROGRAM([#include <slang.h>],[return 0;])
-	],
-	[
-	    AC_MSG_RESULT(yes)
-	    if test x"$ac_slang_inc_path" = x; then
-		ac_slang_inc_path="-I/usr/include"
-	    fi
-	    if test x"$ac_slang_lib_path" = x; then
-		ac_slang_lib_path="-L/usr/lib"
-	    fi
-	    found_slang=yes
-	    AC_DEFINE(HAVE_SLANG_H, 1,[Define to use slang.h])
-
-	],
-	[
-	    AC_MSG_RESULT(no)
-	    AC_MSG_CHECKING([for slang/slang.h])
-	    AC_PREPROC_IFELSE(
-		[
-		    AC_LANG_PROGRAM([#include <slang/slang.h>],[return 0;])
-		],
-		[
-		    AC_MSG_RESULT(yes)
-		    if test x"$ac_slang_inc_path" = x; then
-			ac_slang_inc_path="-I/usr/include"
-		    fi
-		    if test x"$ac_slang_lib_path" = x; then
-			ac_slang_lib_path="-L/usr/lib"
-		    fi
-		    found_slang=yes
-		    AC_DEFINE(HAVE_SLANG_SLANG_H, 1,[Define to use slang.h])
-		    CFLAGS="-DHAVE_SLANG_SLANG_H $CFLAGS"
-		],
-		[
-		    AC_MSG_RESULT(no)
-		    found_slang=no
-		    error_msg_slang="Slang header not found"
-		]
-	    )
-	],
-    )
-    dnl check if S-Lang have version 2.0 or newer
-    if test x"$found_slang" = x"yes"; then
-        AC_MSG_CHECKING([for S-Lang version 2.0 or newer])
-        AC_RUN_IFELSE([
-#ifdef HAVE_SLANG_SLANG_H
-#include <slang/slang.h>
-#else
-#include <slang.h>
-#endif
-int main (void)
-{
-#if SLANG_VERSION >= 20000
-    return 0;
-#else
-    return 1;
-#endif
-}
-],
-	    [mc_slang_is_valid_version=yes],
-	    [mc_slang_is_valid_version=no],
-	    [
-	    if test -f "$param_slang_inc_path/slang/slang.h" ; then
-	        hdr_file="$param_slang_inc_path/slang/slang.h"
-	    else
-	        hdr_file="$param_slang_inc_path/slang.h"
-	    fi
-	    mc_slang_is_valid_version=`grep '^#define SLANG_VERSION[[:space:]]' "$hdr_file"| sed s'/^#define SLANG_VERSION[[:space:]]*//'`
-	    if test "$mc_slang_is_valid_version" -ge "20000"; then
-		mc_slang_is_valid_version=yes
-	    else
-		mc_slang_is_valid_version=no
-	    fi
-	    ]
-	)
-	if test x$mc_slang_is_valid_version = xno; then
-            found_slang=no
-            error_msg_slang="S-Lang library version 2.0 or newer not found"
-	fi
-	AC_MSG_RESULT($mc_slang_is_valid_version)
-    fi
-
-    dnl Check if termcap is needed.
-    dnl This check must be done before anything is linked against S-Lang.
-    if test x"$found_slang" = x"yes"; then
-        MC_SLANG_TERMCAP
-        if test x"$mc_cv_slang_termcap"  = x"yes"; then
-	    saved_CPPFLAGS="-ltermcap $saved_CPPFLAGS "
-	    saved_LDFLAGS="-ltermcap $saved_LDFLAGS"
-        fi
-
-
-        dnl Check the library
-	unset ac_cv_lib_slang_SLang_init_tty
-        AC_CHECK_LIB(
-            [slang],
-            [SLang_init_tty],
-            [:],
-            [
-                found_slang=no
-                error_msg_slang="S-lang library not found"
-            ]
-        )
-    fi
-
-    dnl Unless external S-Lang was requested, reject S-Lang with UTF-8 hacks
-    if test x"$found_slang" = x"yes"; then
-	unset ac_cv_lib_slang_SLsmg_write_nwchars
-        AC_CHECK_LIB(
-            [slang],
-            [SLsmg_write_nwchars],
-            [
-                found_slang=no
-                error_msg_slang="Rejecting S-Lang with UTF-8 support, it's not fully supported yet"
-            ],
-            [:]
-        )
-    fi
-
-    if test x"$found_slang" = x"yes"; then
-        screen_type=slang
-        screen_msg="S-Lang library (installed on the system)"
-
-        AC_DEFINE(HAVE_SLANG, 1,
-            [Define to use S-Lang library for screen management])
-
-        MCLIBS="$ac_slang_lib_path -lslang $MCLIBS"
-        CFLAGS="$ac_slang_inc_path $saved_CFLAGS"
-        dnl do not reset CPPFLAGS
-        dnl - if CPPFLAGS are resetted then cpp does not find the specified header
-        LDFLAGS="$saved_LDFLAGS"
-    else
-        CFLAGS="$saved_CFLAGS"
-        CPPFLAGS="$saved_CPPFLAGS"
-        LDFLAGS="$saved_LDFLAGS"
-    fi
-])
-
-dnl
-dnl Use the slang library.
-dnl
-AC_DEFUN([MC_WITH_SLANG], [
-    with_screen=slang
-    found_slang=yes
-    error_msg_slang=""
-
-    AC_ARG_WITH([slang-includes],
-        AC_HELP_STRING([--with-slang-includes=@<:@DIR@:>@],
-            [set path to SLANG includes @<:@default=/usr/include@:>@; make sense only if --with-screen=slang]
-        ),
-        [ac_slang_inc_path="$withval"],
-        [ac_slang_inc_path=""]
-    )
-
-    AC_ARG_WITH([slang-libs],
-        AC_HELP_STRING([--with-slang-libs=@<:@DIR@:>@],
-            [set path to SLANG library @<:@default=/usr/lib@:>@; make sense only if --with-screen=slang]
-        ),
-        [ac_slang_lib_path="$withval"],
-        [ac_slang_lib_path=""]
-    )
-    if test x"$ac_slang_lib_path" != x -o x"$ac_slang_inc_path" != x; then
-        echo 'checking SLANG-headers in specified place ...'
-        MC_CHECK_SLANG_BY_PATH([$ac_slang_inc_path],[$ac_slang_lib_path])
-    else
-        found_slang=no
-        PKG_CHECK_MODULES(SLANG, [slang >= 2.0], [found_slang=yes], [:])
-        if test x"$found_slang" = "xyes"; then
-            MCLIBS="$SLANG_LIBS $MCLIBS"
-            CFLAGS="$SLANG_CFLAGS $CFLAGS"
-        fi
-    fi
-
-    if test x"$found_slang" = "xno"; then
-        found_slang=yes
-        ac_slang_inc_path="/usr/include"
-        ac_slang_lib_path="/usr/lib"
-
-        echo 'checking SLANG-headers in /usr ...'
-        MC_CHECK_SLANG_BY_PATH([$ac_slang_inc_path],[$ac_slang_lib_path])
-        if test x"$found_slang" = "xno"; then
-            found_slang=yes
-            ac_slang_inc_path="/usr/local/include"
-            ac_slang_lib_path="/usr/local/lib"
-
-            echo 'checking SLANG-headers in /usr/local ...'
-            MC_CHECK_SLANG_BY_PATH( $ac_slang_inc_path , $ac_slang_lib_path )
-            if test x"$found_slang" = "xno"; then
-                AC_MSG_ERROR([$error_msg_slang])
-            fi
-        fi
-    fi
-
-])
-
-dnl check for ncurses in user supplied path
-AC_DEFUN([MC_CHECK_NCURSES_BY_PATH], [
-
-    ac_ncurses_inc_path=[$1]
-    ac_ncurses_lib_path=[$2]
-
-    if test x"$ac_ncurses_inc_path" != x; then
-        ac_ncurses_inc_path="-I"$ac_ncurses_inc_path
-    fi
-
-    if test x"$ac_ncurses_lib_path" != x; then
-        ac_ncurses_lib_path="-L"$ac_ncurses_lib_path
-    fi
-
-    saved_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $ac_ncurses_inc_path"
-
-    dnl Check for the headers
-    dnl Both headers should be in the same directory
-    dnl AIX term.h is unusable for mc
-    AC_MSG_CHECKING([for ncurses/ncurses.h and ncurses/term.h])
-    AC_PREPROC_IFELSE(
-        [
-            AC_LANG_PROGRAM([[#include <ncurses/ncurses.h>
-                              #include <ncurses/term.h>
-                            ]],[[return 0;]])
-        ],
-        [
-            AC_MSG_RESULT(yes)
-            if test x"$ac_ncurses_inc_path" = x; then
-                ac_ncurses_inc_path="-I/usr/include"
-            fi
-            if test x"$ac_ncurses_lib_path" = x; then
-              ac_ncurses_lib_path="-L/usr/lib"
-            fi
-            found_ncurses=yes
-            AC_DEFINE(HAVE_NCURSES_NCURSES_H, 1,
-                      [Define to 1 if you have the <ncurses/ncurses.h> header file.])
-            AC_DEFINE(HAVE_NCURSES_TERM_H, 1,
-                      [Define to 1 if you have the <ncurses/term.h> header file.])
-        ],
-        [
-            AC_MSG_RESULT(no)
-            found_ncurses=no
-            error_msg_ncurses="ncurses header not found"
-        ],
-    )
-
-    if test x"$found_ncurses" = x"yes"; then
-        screen_type=ncurses
-        screen_msg="ncurses library (installed on the system)"
-
-        AC_DEFINE(HAVE_NCURSES, 1,
-                  [Define to use ncurses library for screen management])
-
-        MCLIBS="$MCLIBS $ac_ncurses_lib_path"
-    else
-        CPPFLAGS="$saved_CPPFLAGS"
-        AC_MSG_ERROR([$error_msg_ncurses])
-    fi
-])
-
-dnl
-dnl Use the ncurses library.  It can only be requested explicitly,
-dnl so just fail if anything goes wrong.
-dnl
-dnl If ncurses exports the ESCDELAY variable it should be set to 0
-dnl or you'll have to press Esc three times to dismiss a dialog box.
-dnl
-AC_DEFUN([MC_WITH_NCURSES], [
-    dnl has_colors() is specific to ncurses, it's not in the old curses
-    save_LIBS="$LIBS"
-    ncursesw_found=
-
-    dnl get the user supplied include path
-    AC_ARG_WITH([ncurses-includes],
-        AC_HELP_STRING([--with-ncurses-includes=@<:@DIR@:>@],
-            [set path to ncurses includes @<:@default=/usr/include@:>@; make sense only if --with-screen=ncurses; for /usr/local/include/ncurses specify /usr/local/include]
-        ),
-        [ac_ncurses_inc_path="$withval"],
-        [ac_ncurses_inc_path=""]
-    )
-
-    dnl get the user supplied lib path
-    AC_ARG_WITH([ncurses-libs],
-        AC_HELP_STRING([--with-ncurses-libs=@<:@DIR@:>@],
-            [set path to ncurses library @<:@default=/usr/lib@:>@; make sense only if --with-screen=ncurses]
-        ),
-        [ac_ncurses_lib_path="$withval"],
-        [ac_ncurses_lib_path=""]
-    )
-
-    dnl we need at least the inc path, the lib may be in a std location
-    if test x"$ac_ncurses_inc_path" != x; then
-        dnl check the user supplied location
-        MC_CHECK_NCURSES_BY_PATH([$ac_ncurses_inc_path],[$ac_ncurses_lib_path])
-
-        LIBS=
-        AC_SEARCH_LIBS([has_colors], [ncurses], [MCLIBS="$MCLIBS $LIBS"], 
-                       [AC_MSG_ERROR([Cannot find ncurses library])])
-
-        screen_type=ncurses
-        screen_msg="ncurses library"
-        AC_DEFINE(USE_NCURSES, 1, 
-                  [Define to use ncurses for screen management])
-    else
-        LIBS=
-        AC_SEARCH_LIBS([addwstr], [ncursesw ncurses curses], [MCLIBS="$MCLIBS $LIBS";ncursesw_found=yes],
-                       [AC_MSG_WARN([Cannot find ncurses library, that support wide characters])])
-
-        if test x"$ncursesw_found" = "x"; then
-            LIBS=
-            AC_SEARCH_LIBS([has_colors], [ncurses curses], [MCLIBS="$MCLIBS $LIBS"], 
-                           [AC_MSG_ERROR([Cannot find ncurses library])])
-        fi
-
-        dnl Check the header
-        ncurses_h_found=
-        AC_CHECK_HEADERS([ncursesw/curses.h ncurses/curses.h ncurses.h curses.h], 
-                         [ncurses_h_found=yes; break])
-
-        if test x"$ncurses_h_found" = "x"; then
-            AC_MSG_ERROR([Cannot find ncurses header file])
-        fi
-
-        screen_type=ncurses
-        screen_msg="ncurses library"
-        AC_DEFINE(USE_NCURSES, 1, 
-                  [Define to use ncurses for screen management])
-    fi
-
-    dnl check for ESCDELAY
-    AC_CACHE_CHECK([for ESCDELAY variable],
-                   [mc_cv_ncurses_escdelay],
-                   [AC_TRY_LINK([], [
-                        extern int ESCDELAY;
-                        ESCDELAY = 0;
-                        ],
-                        [mc_cv_ncurses_escdelay=yes],
-                        [mc_cv_ncurses_escdelay=no])
-    ])
-    if test x"$mc_cv_ncurses_escdelay" = xyes; then
-        AC_DEFINE(HAVE_ESCDELAY, 1, 
-                  [Define if ncurses has ESCDELAY variable])
-    fi
-
-    dnl check for resizeterm
-    AC_CHECK_FUNCS(resizeterm)
-    LIBS="$save_LIBS"
-])
-
-dnl
-dnl Use the ncursesw library.  It can only be requested explicitly,
-dnl so just fail if anything goes wrong.
-dnl
-dnl If ncursesw exports the ESCDELAY variable it should be set to 0
-dnl or you'll have to press Esc three times to dismiss a dialog box.
-dnl
-
-AC_DEFUN([MC_WITH_NCURSESW], [
-    dnl has_colors() is specific to ncurses, it's not in the old curses
-    save_LIBS="$LIBS"
-    LIBS=
-    AC_SEARCH_LIBS([has_colors], [ncursesw], [MCLIBS="$MCLIBS $LIBS"],
-		   [AC_MSG_ERROR([Cannot find ncursesw library])])
-
-    dnl Check the header
-    ncurses_h_found=
-    AC_CHECK_HEADERS([ncursesw/curses.h],
-		     [ncursesw_h_found=yes; break])
-
-    if test  x"$ncursesw_h_found" = "x"; then
-	AC_MSG_ERROR([Cannot find ncursesw header file])
-    fi
-
-    screen_type=ncursesw
-    screen_msg="ncursesw library"
-    AC_DEFINE(USE_NCURSESW, 1,
-	      [Define to use ncursesw for screen management])
-
-    AC_CACHE_CHECK([for ESCDELAY variable],
-		   [mc_cv_ncursesw_escdelay],
-		   [AC_TRY_LINK([], [
-			extern int ESCDELAY;
-			ESCDELAY = 0;
-			],
-			[mc_cv_ncursesw_escdelay=yes],
-			[mc_cv_ncursesw_escdelay=no])
-    ])
-    if test x"$mc_cv_ncursesw_escdelay" = xyes; then
-	AC_DEFINE(HAVE_ESCDELAY, 1,
-		  [Define if ncursesw has ESCDELAY variable])
-    fi
-
-    AC_CHECK_FUNCS(resizeterm)
-    LIBS="$save_LIBS"
+    case x$with_screen in
+    xslang)
+        MC_WITH_SLANG(strict)
+        ;;
+    xncurses)
+        MC_WITH_NCURSES
+        ;;
+    xncursesw)
+        MC_WITH_NCURSESW
+        ;;
+    x)
+        MC_WITH_SLANG
+        ;;
+    *)
+        AC_MSG_ERROR([Value of the screen library is incorrect])
+        ;;
+    esac
 ])