mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Configure summary omits "S-Lang" when used as screen library. 

When using slang, 'configure' prints blank in the "Screen library" name:

    ...
    File system:                Midnight Commander Virtual Filesystem
                                cpio, extfs, fish, ftp, sfs, sftp, smb, tar
    Screen library:
    Mouse support:              gpm and xterm
    X11 events support:         yes
    ...

This occurs when slang is found using pkg-config (as opposed to explicit path
search). The patch fixes this by moving the 'screen_msg' assignment one level
up, to the controlling function (mc_WITH_SLANG) so that it's effective for
however method the library was found.

The problem was mentioned on our mailing list:

    https://mail.gnome.org/archives/mc-devel/2016-March/msg00021.html

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Mooffie 2016-03-16 18:47:22 +02:00 committed by Andrew Borodin
parent 284a19aff1
commit 17706ad9f3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
m4.include/mc-with-screen-slang.m4
View File

@ -137,9 +137,6 @@ int main (void)
fi
if test x"$found_slang" = x"yes"; then
screen_type=slang
screen_msg="S-Lang library"
MCLIBS="$ac_slang_lib_path -lslang $MCLIBS"
dnl do not reset CPPFLAGS
dnl if CPPFLAGS are reset then cpp does not find the specified header
@ -206,6 +203,8 @@ AC_DEFUN([mc_WITH_SLANG], [
fi
fi
screen_type=slang
screen_msg="S-Lang library"
AC_DEFINE(HAVE_SLANG, 1, [Define to use S-Lang library for screen management])
mc_CHECK_SLANG_HEADER