ports/mc
ports/mc
1
1
Fork 0
Code Releases 2 Activity

--with-edit: rename to --with-internal-edit.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2013-06-15 12:55:16 +04:00 committed by Slava Zanko
parent 6a83ddacd3
commit 45d8b20ad9
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
acinclude.m4
View File

@ -11,7 +11,7 @@ m4_include([m4.include/mc-get-fs-info.m4])
m4_include([m4.include/mc-with-x.m4])
m4_include([m4.include/mc-use-termcap.m4])
m4_include([m4.include/mc-with-screen.m4])
m4_include([m4.include/mc-with-edit.m4])
m4_include([m4.include/mc-with-internal-edit.m4])
m4_include([m4.include/mc-subshell.m4])
m4_include([m4.include/mc-background.m4])
m4_include([m4.include/ac-glib.m4])

4
configure.ac
View File

@ -383,7 +383,7 @@ dnl ############################################################################
dnl MC options
dnl ############################################################################
MC_WITH_EDIT
MC_WITH_INTERNAL_EDIT
dnl Diff viewer support.
AC_ARG_WITH([diff_viewer],
@ -478,7 +478,7 @@ AC_SUBST(LIBS)
AM_CONDITIONAL(USE_NLS, [test x"$USE_NLS" = xyes])
AM_CONDITIONAL(USE_MAINTAINER_MODE, [test x"$USE_MAINTAINER_MODE" = xyes])
AM_CONDITIONAL(USE_SCREEN_SLANG, [test x"$with_screen" = xslang])
AM_CONDITIONAL(USE_EDIT, [test x"$use_edit" = xyes ])
AM_CONDITIONAL(USE_INTERNAL_EDIT, [test x"$use_internal_edit" = xyes ])
AM_CONDITIONAL(USE_ASPELL, [test x"$enable_aspell" = xyes ])
AM_CONDITIONAL(USE_DIFF, [test -n "$use_diff"])
AM_CONDITIONAL(CHARSET, [test -n "$have_charset"])

16
m4.include/mc-with-edit.m4 → m4.include/mc-with-internal-edit.m4
View File

@ -1,16 +1,18 @@
dnl
dnl Internal editor support.
dnl
AC_DEFUN([MC_WITH_EDIT], [
AC_DEFUN([MC_WITH_INTERNAL_EDIT], [
AC_ARG_WITH([edit], AS_HELP_STRING([--with-edit], [Enable internal editor @<:@yes@:>@]))
AC_ARG_WITH([internal_edit],
AS_HELP_STRING([--with-internal-edit], [Enable internal editor @<:@yes@:>@]))
if test x$with_edit != xno; then
if test x$with_internal_edit != xno; then
AC_DEFINE(USE_INTERNAL_EDIT, 1, [Define to enable internal editor])
use_edit=yes
use_internal_edit=yes
AC_MSG_NOTICE([using internal editor])
edit_msg="yes"
else
use_edit=no
use_internal_edit=no
edit_msg="no"
fi
@ -27,7 +29,7 @@ AC_DEFUN([MC_WITH_EDIT], [
[enable_aspell=no]
)
if test x$with_edit != xno -a x$enable_aspell != xno; then
if test x$with_internal_edit != xno -a x$enable_aspell != xno; then
AC_CHECK_HEADERS([aspell.h], [], [
AC_ERROR([Could not find aspell development headers])
], [])
@ -40,7 +42,5 @@ AC_DEFUN([MC_WITH_EDIT], [
enable_aspell=no
AC_MSG_NOTICE([aspell support is disabled because gmodule support is not available])
fi
else
edit_msg="yes"
fi
])

2
misc/syntax/Makefile.am
View File

@ -79,7 +79,7 @@ SYNTAXFILES = \
yum-repo.syntax \
yxx.syntax
if USE_EDIT
if USE_INTERNAL_EDIT
syntaxdir = $(pkgdatadir)/syntax
syntax_DATA = $(SYNTAX_OUT) \
$(SYNTAXFILES)

8
src/Makefile.am
View File

@ -1,6 +1,6 @@
SUBDIRS = filemanager man2hlp vfs viewer
if USE_EDIT
if USE_INTERNAL_EDIT
SUBDIRS += editor
endif
@ -29,7 +29,7 @@ pkglibexecdir = $(libexecdir)/@PACKAGE@
bin_PROGRAMS = mc
if USE_EDIT
if USE_INTERNAL_EDIT
EDITLIB = editor/libedit.la
endif
@ -90,7 +90,7 @@ EXTRA_DIST = $(SRC_maintainer) $(SRC_charset)
install-exec-hook:
$(MAKE) install_mcview
if USE_EDIT
if USE_INTERNAL_EDIT
$(MAKE) install_mcedit
endif
if USE_DIFF
@ -111,7 +111,7 @@ install_mcdiff:
uninstall-hook:
rm -f $(DESTDIR)$(bindir)/$(binprefix)/mcview
if USE_EDIT
if USE_INTERNAL_EDIT
rm -f $(DESTDIR)$(bindir)/$(binprefix)/mcedit
endif
if USE_DIFF

2
src/editor/Makefile.am
View File

@ -1,6 +1,6 @@
EXTRA_DIST =
if USE_EDIT
if USE_INTERNAL_EDIT
noinst_LTLIBRARIES = libedit.la
else
noinst_LTLIBRARIES =

2
tests/src/Makefile.am
View File

@ -1,6 +1,6 @@
SUBDIRS = . filemanager
if USE_EDIT
if USE_INTERNAL_EDIT
SUBDIRS += editor
endif