Removed bundled slang

ChangeLog

@@ -158,6 +158,10 @@
 	Changed message type codes on calls to message(), query_dialog(),
 	close_error_pipe() from numeric IDs to symbols D_ERROR, D_NORMAL
 
+2009-01-07  Enrico Weigelt, metux ITS <weigelt@metux.de>
+
+	* removed bundled slang
+
 2008-12-18  Roland Illig  <roland.illig@gmx.de>
 
 	* doc/mcedit.1: Documented the newly added filename:lineno

INSTALL

@@ -169,19 +169,11 @@ included one, but you can override this by using the following flag
 (please note that since S-Lang is default, it is tested better than
 ncurses):
 
-`--with-screen={slang|mcslang|ncurses}'
+`--with-screen={slang|ncurses}'
      Choose the library used to manage interaction with the terminal.
      `slang' means S-Lang library already installed on the system,
-     `mcslang' means S-Lang library included with the sources of
-     GNU Midnight Commander, `ncurses' means ncurses library already
-     installed on the system.  The installed S-Lang library is used
-     by default if found, otherwise the included S-Lang library is
-     used.
-
-`--with-termcap'
-     If the included S-Lang library is used, this option forces it to
-     use the termcap database, as opposed to the default terminfo
-     database.
+     `ncurses' means ncurses library already installed on the system.  
+     The installed S-Lang library is used by default if found.
 
 On systems that require unusual options for compilation or linking that
 the package's `configure' script does not know about, you can give

INSTALL.FAST

@@ -24,14 +24,11 @@ The most often needed options to configure are following:
 	You can specify an installation prefix other than default by
 	giving `configure' the option `--prefix=PATH'.
 
-`--with-screen={slang|mcslang|ncurses}'
+`--with-screen={slang|ncurses}'
 	Choose the library used to manage interaction with the terminal.
 	`slang' means S-Lang library already installed on the system,
-	`mcslang' means S-Lang library included with the sources of
-	GNU Midnight Commander, `ncurses' means ncurses library already
-	installed on the system.  The installed S-Lang library is used
-	by default if found, otherwise the included S-Lang library is
-	used.
+	`ncurses' means ncurses library already installed on the system.  
+	The installed S-Lang library is used by default if found.
 
 You may also want to specify CFLAGS for the compiler, even if it finds
 itself some defaults by typing e.g.

Makefile.am

@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = 1.5
 
-SUBDIRS = intl po m4 vfs slang edit src lib doc syntax
+SUBDIRS = intl po m4 vfs edit src lib doc syntax
 
 EXTRA_DIST = FAQ HACKING INSTALL.FAST MAINTAINERS README.QNX TODO pkginfo.in prototype.in mc.qpg mc.spec
 

acinclude.m4

@@ -362,7 +362,7 @@ AC_DEFUN([MC_SLANG_TERMCAP], [
 ])
 
 dnl
-dnl Common code for MC_WITH_SLANG and MC_WITH_MCSLANG
+dnl Common code for MC_WITH_SLANG
 dnl
 AC_DEFUN([_MC_WITH_XSLANG], [
     screen_type=slang
@@ -373,7 +373,7 @@ AC_DEFUN([_MC_WITH_XSLANG], [
 
 dnl
 dnl Check if the system S-Lang library can be used.
-dnl If not, and $1 is "strict", exit, otherwise fall back to mcslang.
+dnl If not, and $1 is "strict", exit.
 dnl
 AC_DEFUN([MC_WITH_SLANG], [
     with_screen=slang
@@ -383,7 +383,7 @@ AC_DEFUN([MC_WITH_SLANG], [
     AC_CHECK_HEADERS([slang.h slang/slang.h],
 		     [slang_h_found=yes; break])
     if test -z "$slang_h_found"; then
-	with_screen=mcslang
+	AC_MSG_ERROR([Slang header not found])
     fi
 
     dnl Check if termcap is needed.
@@ -395,78 +395,23 @@ AC_DEFUN([MC_WITH_SLANG], [
     dnl Check the library
     if test x$with_screen = xslang; then
 	AC_CHECK_LIB([slang], [SLang_init_tty], [MCLIBS="$MCLIBS -lslang"],
-		     [with_screen=mcslang], ["$MCLIBS"])
+		     AC_MSG_ERROR([Slang library not found]), ["$MCLIBS"])
     fi
 
     dnl Unless external S-Lang was requested, reject S-Lang with UTF-8 hacks
     if test x$with_screen = xslang; then
-	:
-	m4_if([$1], strict, ,
-	      [AC_CHECK_LIB([slang], [SLsmg_write_nwchars],
-	    		    [AC_MSG_WARN([Rejecting S-Lang with UTF-8 support, \
-it's not fully supported yet])
-	      with_screen=mcslang])])
+	AC_CHECK_LIB(
+	    [slang],
+	    [SLsmg_write_nwchars],
+	    [AC_MSG_ERROR([Rejecting S-Lang with UTF-8 support, it's not fully supported yet])])
     fi
 
     if test x$with_screen = xslang; then
-	AC_DEFINE(HAVE_SYSTEM_SLANG, 1,
-		  [Define to use S-Lang library installed on the system])
 	MC_SLANG_PRIVATE
 	screen_type=slang
 	screen_msg="S-Lang library (installed on the system)"
     else
-	m4_if([$1], strict,
-	    [if test $with_screen != slang; then
-		AC_MSG_ERROR([S-Lang library not found])
-	    fi],
-	    [MC_WITH_MCSLANG]
-	)
-    fi
-
-    _MC_WITH_XSLANG
-])
-
-
-dnl
-dnl Use the included S-Lang library.
-dnl
-AC_DEFUN([MC_WITH_MCSLANG], [
-    screen_type=mcslang
-    screen_msg="Included S-Lang library (mcslang)"
-
-    dnl Type checks from S-Lang sources
-    AC_CHECK_SIZEOF(short, 2)
-    AC_CHECK_SIZEOF(int, 4)
-    AC_CHECK_SIZEOF(long, 4)
-    AC_CHECK_SIZEOF(float, 4)
-    AC_CHECK_SIZEOF(double, 8)
-    AC_TYPE_OFF_T
-    AC_CHECK_SIZEOF(off_t)
-    AC_CHECK_TYPES(long long)
-    AC_CHECK_SIZEOF(long long)
-    AC_CHECK_FUNCS(atexit on_exit)
-
-    # Search for terminfo database.
-    use_terminfo=
-    if test x"$with_termcap" != xyes; then
-	if test x"$with_termcap" = xno; then
-	    use_terminfo=yes
-	fi
-	if test -n "$TERMINFO" && test -r "$TERMINFO/v/vt100"; then
-	    use_terminfo=yes
-	fi
-	for dir in "/usr/share/terminfo" "/usr/lib/terminfo" \
-		   "/usr/share/lib/terminfo" "/etc/terminfo" \
-		   "/usr/local/lib/terminfo" "$HOME/.terminfo"; do
-	    if test -r "$dir/v/vt100"; then
-		use_terminfo=yes
-	    fi
-	done
-    fi
-
-    # If there is no terminfo, use termcap
-    if test -z "$use_terminfo"; then
-	MC_USE_TERMCAP
+	AC_MSG_ERROR([S-Lang library not found])
     fi
 
     _MC_WITH_XSLANG

configure.ac

@@ -182,12 +182,6 @@ AC_CHECK_FUNCS([\
 	tcgetattr tcsetattr truncate \
 ])
 
-dnl S-Lang needs all four functions to be defined to use POSIX signal API
-AC_CHECK_FUNCS([sigaction sigemptyset sigprocmask sigaddset], , [slang_signals=no])
-if test x$slang_signals != xno; then
-    AC_DEFINE(SLANG_POSIX_SIGNALS, 1, [Define to use POSIX signal API in S-Lang])
-fi
-
 dnl
 dnl getpt is a GNU Extension (glibc 2.1.x)
 dnl
@@ -452,19 +446,16 @@ subshell="$result"
 
 
 dnl
-dnl Select the screen library.  mcslang is the included S-Lang library.
+dnl Select the screen library.
 dnl
 AC_ARG_WITH(screen,
-	[  --with-screen=LIB        Compile with screen library: slang, mcslang or
-                           ncurses [[slang if found, else mcslang]]])
+	[  --with-screen=LIB        Compile with screen library: slang or
+                           ncurses [[slang if found]]])
 
 case x$with_screen in
 xslang)
 	MC_WITH_SLANG(strict)
 	;;
-xmcslang)
-	MC_WITH_MCSLANG
-	;;
 xncurses)
 	MC_WITH_NCURSES
 	;;
@@ -477,18 +468,6 @@ x)
 esac
 
 
-dnl
-dnl Force using termcap.  This option is processed in MC_WITH_MCSLANG.
-dnl Report an error if this option is not applicable.
-dnl
-AC_ARG_WITH(termcap,
-	[  --with-termcap           Try using termcap database [[only if no terminfo]]],
-	[if test x$with_screen != xmcslang; then
-		AC_MSG_ERROR([Option `--with-termcap' only works with `--with-screen=mcslang'])
-	fi
-])
-
-
 dnl
 dnl Internal editor support.
 dnl
@@ -572,7 +551,6 @@ AM_CONDITIONAL(USE_VFS_NET, [test x"$use_net_code" = xtrue])
 AM_CONDITIONAL(USE_UNDEL_FS, [test -n "$use_undelfs"])
 AM_CONDITIONAL(USE_SAMBA_FS, [test -n "$use_smbfs"])
 AM_CONDITIONAL(USE_MCFS, [test -n "$use_mcfs"])
-AM_CONDITIONAL(INCLUDED_SLANG, [test "x$with_screen" = xmcslang])
 AM_CONDITIONAL(CHARSET, [test -n "$have_charset"])
 AM_CONDITIONAL(CONS_SAVER, [test -n "$cons_saver"])
 
@@ -587,7 +565,6 @@ vfs/Makefile
 vfs/extfs/Makefile
 lib/Makefile
 src/Makefile
-slang/Makefile 
 edit/Makefile 
 syntax/Makefile
 m4/Makefile

maint/mc-test

@@ -49,7 +49,7 @@ mc_cflags=""
 mc_ldflags=""
 
 mc_tests="plain glib12 charset no_charset vfs no_vfs mcfs no_mcfs samba "\
-"no_samba ext2undel no_ext2undel slang mcslang ncurses maintainer "\
+"no_samba ext2undel no_ext2undel slang ncurses maintainer "\
 "no_maintainer i18n no_i18n no_features all_features"
 
 do_clean_basedir=no
@@ -443,12 +443,6 @@ test_slang() {
 	confbuild
 }
 
-test_mcslang() {
-	testname="mcslang"
-	configure_args="--with-screen=mcslang"
-	confbuild
-}
-
 test_ncurses() {
 	testname="ncurses"
 	configure_args="--with-screen=ncurses"

maint/mc-test-example.conf

@@ -48,7 +48,7 @@
 
 # The list of tests that will be run.
 #mc_tests="plain glib12 charset no_charset vfs no_vfs mcfs no_mcfs samba "\
-#"no_samba ext2undel no_ext2undel slang mcslang ncurses maintainer "\
+#"no_samba ext2undel no_ext2undel slang ncurses maintainer "\
 #"no_maintainer i18n no_i18n no_features all_features"
 
 # This cleans mc_basedir and all its subdirectories. Any directories outside

maint/mcsnap

@@ -78,7 +78,7 @@ mkdir "$RPM_SRC_DIR/RPMS"
 mkdir "$RPM_SRC_DIR/RPMS/i386"
 mkdir "$RPM_SRC_DIR/SPECS"
 $RPMBUILD -tb --define="_topdir $RPM_SRC_DIR" \
-  --define="_with_included_slang 1" "$MCTARBALL"
+  "$MCTARBALL"
 MC_RPM_VERSION=`echo $MCVERSION | sed s/-//g`
 MC_RPM=$RPM_SRC_DIR/RPMS/i386/mc-$MC_RPM_VERSION-1.i386.rpm
 if test ! -f $MC_RPM; then

maint/mctest

@@ -40,7 +40,7 @@ echo "Checking the default configuration"
 distcheck 1
 
 echo "Checking the configuration with maximal code coverage"
-distcheck 2 with_screen=mcslang enable_charset=yes with_samba=yes \
+distcheck 2 enable_charset=yes with_samba=yes \
      with_mcfs=yes with_included_gettext=yes with_glib12=yes
 
 echo "Checking the configuration with minimal code coverage"
@@ -54,7 +54,7 @@ distcheck 4 enable_largefile=no enable_nls=no with_vfs=no \
      with_screen=ncurses
 
 echo "Checking the configuration with experimental and rarely used options"
-distcheck 5 with_screen=mcslang with_termcap=yes \
+distcheck 5 with_termcap=yes \
      with_mmap=no with_subshell=optional enable_netcode=no
 
 RPMBUILD=/usr/bin/rpmbuild