Merge branch 'master' into loadkeys

Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
Conflicts:
	.gitignore
	src/Makefile.am
	src/loadkeys.analyze.l
	src/loadkeys.c

diff --cc .gitignore
Simple merge

diff --cc configure.ac
index 15fa07d,f1e50f8..22c3022
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -89,14 -85,9 +89,14 @@@ AC_ARG_ENABLE(optional-progs
        [OPTIONAL_PROGS=$enableval],[OPTIONAL_PROGS=no])
  AM_CONDITIONAL(OPTIONAL_PROGS, test "$OPTIONAL_PROGS" = "yes")
  
 +AC_ARG_ENABLE(libkeymap,
 +      AS_HELP_STRING(--enable-libkeymap, [Build and install a libkeymap]),
 +      [BUILD_LIBKEYMAP=$enableval],[BUILD_LIBKEYMAP=no])
 +AM_CONDITIONAL(BUILD_LIBKEYMAP, test "$BUILD_LIBKEYMAP" = "yes")
 +
  AC_ARG_ENABLE(vlock,
-       AS_HELP_STRING(--enable-vlock, [Locks virtual console]),
-       [VLOCK_PROG=$enableval],[VLOCK_PROG=no])
+       AS_HELP_STRING(--disable-vlock, [do not build vlock]),
+       [VLOCK_PROG=no],[VLOCK_PROG=yes])
  AM_CONDITIONAL(VLOCK, test "$VLOCK_PROG" = "yes")
  
  if test "$VLOCK_PROG" = "yes"; then

diff --cc src/Makefile.am
index 1bc5595,4b5012b..75b19ab
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -27,49 -27,43 +27,49 @@@ dist_bin_SCRIPTS = unicode_start unicod
  bin_PROGRAMS = $(OLDPROGS) $(PROGS)
  
  EXTRA_DIST = \
-       loadkeys.analyze.c loadkeys.analyze.l wctomb.c totextmode.c \
-       README.cad README.init README.openvt \
 -      loadkeys.analyze.c loadkeys.analyze.h loadkeys.analyze.l wctomb.c \
++      wctomb.c \
+       totextmode.c README.cad README.init README.openvt \
        cad
  
 -ALL_S   = modifiers.h nls.h paths.h version.h kbd.h
 -FIND_S  = findfile.c findfile.h
 -GETFD_S = getfd.c getfd.h
 -KDMA_S  = kdmapop.c kdmapop.h
 -KSYMS_S = ksyms.c ksyms.h cp1250.syms.h ethiopic.syms.h koi8.syms.h sami.syms.h thai.syms.h
 -PSF_S   = psf.h psffontop.c psffontop.h
 -UNIM_S  = loadunimap.c loadunimap.h
 -UTF8_S  = utf8.c utf8.h
 -XMAL_S  = xmalloc.c xmalloc.h
 -
 -chvt_SOURCES            = $(ALL_S) chvt.c $(GETFD_S)
 -clrunimap_SOURCES       = $(ALL_S) clrunimap.c $(GETFD_S) $(KDMA_S)
 -deallocvt_SOURCES       = $(ALL_S) deallocvt.c $(GETFD_S)
 -dumpkeys_SOURCES        = $(ALL_S) dumpkeys.c $(GETFD_S) $(KSYMS_S) $(XMAL_S)
 -fgconsole_SOURCES       = $(ALL_S) fgconsole.c $(GETFD_S)
 -getkeycodes_SOURCES     = $(ALL_S) getkeycodes.c $(GETFD_S)
 -getunimap_SOURCES       = $(ALL_S) getunimap.c $(GETFD_S) $(KDMA_S)
 -kbd_mode_SOURCES        = $(ALL_S) kbd_mode.c $(GETFD_S)
 -loadunimap_SOURCES      = $(ALL_S) loadunimap.c $(FIND_S) $(PSF_S) $(UTF8_S) $(XMAL_S) $(GETFD_S) $(KDMA_S)
 -mapscrn_SOURCES         = $(ALL_S) mapscrn.c $(FIND_S) $(UTF8_S) $(XMAL_S) $(GETFD_S) $(KDMA_S)
 -openvt_SOURCES          = $(ALL_S) openvt.c $(GETFD_S) $(XMAL_S)
 -psfxtable_SOURCES       = $(ALL_S) psfxtable.c $(PSF_S) $(XMAL_S) $(UTF8_S) $(GETFD_S)
 -resizecons_SOURCES      = $(ALL_S) resizecons.c $(GETFD_S) $(FIND_S) $(XMAL_S)
 -screendump_SOURCES      = $(ALL_S) screendump.c $(XMAL_S)
 -setfont_SOURCES         = $(ALL_S) setfont.c $(FIND_S) $(XMAL_S) $(GETFD_S) mapscrn.c $(KDMA_S) $(PSF_S) $(UTF8_S) kdfontop.c kdfontop.h $(UNIM_S)
 -setkeycodes_SOURCES     = $(ALL_S) setkeycodes.c $(GETFD_S)
 -setvtrgb_SOURCES        = $(ALL_S) setvtrgb.c $(GETFD_S)
 -setlogcons_SOURCES      = $(ALL_S) setlogcons.c $(GETFD_S)
 -setpalette_SOURCES      = $(ALL_S) setpalette.c $(GETFD_S)
 -setvesablank_SOURCES    = $(ALL_S) setvesablank.c $(GETFD_S)
 -showconsolefont_SOURCES = $(ALL_S) showconsolefont.c $(GETFD_S) $(XMAL_S) $(KDMA_S) kdfontop.c kdfontop.h
 -showkey_SOURCES         = $(ALL_S) showkey.c $(GETFD_S)
 -kbdinfo_SOURCES         = $(ALL_S) kbdinfo.c $(GETFD_S)
 +
 +libcommon_a_SOURCES = \
 +      getfd.c getfd.h \
 +      xmalloc.c xmalloc.h
 +
 +libfont_a_SOURCES   = \
 +      psf.h psffontop.c psffontop.h \
 +      utf8.c utf8.h \
 +      kdmapop.c kdmapop.h \
 +      loadunimap.c loadunimap.h \
 +      kdfontop.c kdfontop.h
 +
 +ALL_S   = nls.h paths.h version.h kbd.h
 +
 +chvt_SOURCES            = $(ALL_S) chvt.c
 +clrunimap_SOURCES       = $(ALL_S) clrunimap.c
 +deallocvt_SOURCES       = $(ALL_S) deallocvt.c
 +fgconsole_SOURCES       = $(ALL_S) fgconsole.c
 +getkeycodes_SOURCES     = $(ALL_S) getkeycodes.c
 +getunimap_SOURCES       = $(ALL_S) getunimap.c
 +kbd_mode_SOURCES        = $(ALL_S) kbd_mode.c
 +loadunimap_SOURCES      = $(ALL_S) loadunimap.c
 +mapscrn_SOURCES         = $(ALL_S) mapscrn.c
 +openvt_SOURCES          = $(ALL_S) openvt.c
 +psfxtable_SOURCES       = $(ALL_S) psfxtable.c
 +resizecons_SOURCES      = $(ALL_S) resizecons.c
 +screendump_SOURCES      = $(ALL_S) screendump.c
 +setfont_SOURCES         = $(ALL_S) setfont.c mapscrn.c
 +setkeycodes_SOURCES     = $(ALL_S) setkeycodes.c
 +setvtrgb_SOURCES        = $(ALL_S) setvtrgb.c
 +setlogcons_SOURCES      = $(ALL_S) setlogcons.c
 +setpalette_SOURCES      = $(ALL_S) setpalette.c
 +setvesablank_SOURCES    = $(ALL_S) setvesablank.c
 +showconsolefont_SOURCES = $(ALL_S) showconsolefont.c
 +showkey_SOURCES         = $(ALL_S) showkey.c
 +kbdinfo_SOURCES         = $(ALL_S) kbdinfo.c
 +
 +dumpkeys_SOURCES        = $(ALL_S) dumpkeys.c
 +loadkeys_SOURCES        = $(ALL_S) loadkeys.c
  
  mapscrn_CFLAGS = -DMAIN
  loadunimap_CFLAGS = -DMAIN