Ticket #1866: Move edit/ and vfs/ directories into src/

Moved dir $(srcdir)/edit into $(srcdir)/src/editor

Signed-off-by: Slava Zanko <slavazanko@gmail.com>

Makefile.am

@@ -1,7 +1,7 @@
 ## Process this file with automake to create Makefile.in.
 AUTOMAKE_OPTIONS = 1.5
 
-SUBDIRS = intl po vfs edit src doc syntax contrib misc
+SUBDIRS = intl po vfs src doc syntax contrib misc
 
 EXTRA_DIST = 
 

configure.ac

@@ -575,6 +575,7 @@ misc/skins/Makefile
 misc/mc.ext
 
 src/Makefile
+src/editor/Makefile
 src/filehighlight/Makefile
 src/mcconfig/Makefile
 src/search/Makefile
@@ -582,7 +583,6 @@ src/skin/Makefile
 src/tty/Makefile
 src/viewer/Makefile
 
-edit/Makefile
 syntax/Makefile
 
 vfs/Makefile

src/Makefile.am

@@ -1,5 +1,9 @@
 SUBDIRS = mcconfig search tty viewer filehighlight skin
 
+if USE_EDIT
+SUBDIRS += editor
+endif
+
 AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS)
 
 localedir = $(datadir)/locale
@@ -29,7 +33,7 @@ cons_saver_SOURCES = cons.saver.c
 man2hlp_SOURCES = man2hlp.c glibcompat.c
 
 if USE_EDIT
-EDITLIB = ../edit/libedit.a
+EDITLIB = editor/libedit.a
 endif
 
 if ENABLE_VFS