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

Unify m4 macro names. 

Macros get from other projects keep their original names:
gl_FSTYPENAME, AX_PATH_LIB_PCRE, etc.

Macros initially writtem for MC have original names with prefix mc_:
mc_VERSION, mc_CHECK_GLIB, etc

Macros get from other projects and modified for MC keep their
original names with prefix mc_:
mc_cu_PREREQ_STAT_PROG, mc_AC_GET_FS_INFO.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2016-01-04 21:43:19 +03:00
parent cc34f778ed
commit 0eae2cb8dc
25 changed files with 141 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
configure.ac
View File

@ -9,7 +9,7 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_SRCDIR(src/main.c)
AC_CONFIG_HEADERS(config.h)
MC_VERSION
mc_VERSION
AM_INIT_AUTOMAKE(mc, ${VERSION} )
dnl Enable silent rules by default (if yes)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@ -28,7 +28,7 @@ dnl ############################################################################
AC_PROG_CC_STDC
AM_PROG_CC_C_O
MC_CHECK_CFLAGS
mc_CHECK_CFLAGS
CFLAGS_OPTS=""
if test "x$CFLAGS" = "x"; then
@ -42,7 +42,7 @@ fi
AC_ARG_ENABLE([werror],
AS_HELP_STRING([--enable-werror], [Handle all compiler warnings as errors]))
if test "x$enable_werror" = xyes; then
MC_CHECK_ONE_CFLAG([-Werror])
mc_CHECK_ONE_CFLAG([-Werror])
fi
AC_PROG_LIBTOOL
@ -137,19 +137,19 @@ dnl Check for other tools
dnl ############################################################################
AC_CHECK_TOOL(AR, ar, ar)
MC_UNIT_TESTS
mc_UNIT_TESTS
dnl ############################################################################
dnl Check for main libraies
dnl ############################################################################
AC_CHECK_GLIB
AC_G_MODULE_SUPPORTED
MC_WITH_SCREEN
MC_CHECK_SEARCH_TYPE
mc_CHECK_GLIB
mc_G_MODULE_SUPPORTED
mc_WITH_SCREEN
mc_CHECK_SEARCH_TYPE
dnl X11 support. Used to read keyboard modifiers when running under X11.
MC_WITH_X
mc_WITH_X
dnl ############################################################################
@ -266,7 +266,7 @@ dnl ############################################################################
AM_GNU_GETTEXT(no-libtool, need-ngettext)
AM_GNU_GETTEXT_VERSION(0.14.3)
MC_I18N
mc_I18N
dnl ############################################################################
dnl OS specific flags
@ -384,7 +384,7 @@ dnl ############################################################################
dnl MC options
dnl ############################################################################
MC_WITH_INTERNAL_EDIT
mc_WITH_INTERNAL_EDIT
dnl Diff viewer support.
AC_ARG_WITH([diff_viewer],
@ -399,9 +399,9 @@ else
diff_msg="no"
fi
MC_SUBSHELL
MC_BACKGROUND
AC_MC_VFS_CHECKS
mc_SUBSHELL
mc_BACKGROUND
mc_VFS_CHECKS
dnl ############################################################################
dnl Directories

6
m4.include/mc-background.m4
View File

@ -2,15 +2,15 @@ dnl
dnl Support for background operations
dnl
AC_DEFUN([MC_BACKGROUND],
AC_DEFUN([mc_BACKGROUND],
[
AC_ARG_ENABLE([background],
AS_HELP_STRING([--enable-background], [Support for background file operations [yes]]),
[
if test "x$enableval" = xno; then
enable_background=no
enable_background=no
else
enable_background=yes
enable_background=yes
fi
],
[enable_background=yes])

96
m4.include/mc-cflags.m4
View File

@ -1,4 +1,4 @@
dnl @synopsis MC_CHECK_CFLAGS
dnl @synopsis mc_CHECK_CFLAGS
dnl
dnl Check flags supported by C compiler
dnl
@ -7,7 +7,7 @@ dnl @version 2013-01-16
dnl @license GPL
dnl @copyright Free Software Foundation, Inc.
AC_DEFUN([MC_CHECK_ONE_CFLAG],[
AC_DEFUN([mc_CHECK_ONE_CFLAG],[
AC_MSG_CHECKING([whether ${CC} accepts $1])
@ -35,7 +35,7 @@ AC_DEFUN([MC_CHECK_ONE_CFLAG],[
fi
])
AC_DEFUN([MC_CHECK_CFLAGS],[
AC_DEFUN([mc_CHECK_CFLAGS],[
AC_LANG_PUSH(C)
mc_configured_cflags=""
@ -44,57 +44,57 @@ dnl Sorted -f options:
dnl AC_MSG_CHECKING([CC is $CC])
case "$CC" in
gcc*)
MC_CHECK_ONE_CFLAG([-fdiagnostics-show-option])
dnl MC_CHECK_ONE_CFLAG([-fno-stack-protector])
mc_CHECK_ONE_CFLAG([-fdiagnostics-show-option])
dnl mc_CHECK_ONE_CFLAG([-fno-stack-protector])
;;
*)
;;
esac
dnl Sorted -W options:
MC_CHECK_ONE_CFLAG([-Wbad-function-cast])
MC_CHECK_ONE_CFLAG([-Wcomment])
MC_CHECK_ONE_CFLAG([-Wdeclaration-after-statement])
MC_CHECK_ONE_CFLAG([-Wfloat-equal])
MC_CHECK_ONE_CFLAG([-Wformat])
MC_CHECK_ONE_CFLAG([-Wformat-security])
MC_CHECK_ONE_CFLAG([-Wimplicit])
MC_CHECK_ONE_CFLAG([-Wignored-qualifiers])
MC_CHECK_ONE_CFLAG([-Wmaybe-uninitialized])
MC_CHECK_ONE_CFLAG([-Wmissing-braces])
MC_CHECK_ONE_CFLAG([-Wmissing-declarations])
MC_CHECK_ONE_CFLAG([-Wmissing-field-initializers])
MC_CHECK_ONE_CFLAG([-Wmissing-format-attribute])
MC_CHECK_ONE_CFLAG([-Wmissing-parameter-type])
MC_CHECK_ONE_CFLAG([-Wmissing-prototypes])
MC_CHECK_ONE_CFLAG([-Wmissing-variable-declarations])
MC_CHECK_ONE_CFLAG([-Wnested-externs])
MC_CHECK_ONE_CFLAG([-Wno-long-long])
MC_CHECK_ONE_CFLAG([-Wno-unreachable-code])
MC_CHECK_ONE_CFLAG([-Wparentheses])
MC_CHECK_ONE_CFLAG([-Wpointer-arith])
MC_CHECK_ONE_CFLAG([-Wpointer-sign])
MC_CHECK_ONE_CFLAG([-Wredundant-decls])
MC_CHECK_ONE_CFLAG([-Wreturn-type])
MC_CHECK_ONE_CFLAG([-Wsequence-point])
MC_CHECK_ONE_CFLAG([-Wshadow])
MC_CHECK_ONE_CFLAG([-Wsign-compare])
dnl MC_CHECK_ONE_CFLAG([-Wstrict-aliasing])
MC_CHECK_ONE_CFLAG([-Wstrict-prototypes])
MC_CHECK_ONE_CFLAG([-Wswitch])
MC_CHECK_ONE_CFLAG([-Wswitch-default])
MC_CHECK_ONE_CFLAG([-Wtype-limits])
MC_CHECK_ONE_CFLAG([-Wundef])
MC_CHECK_ONE_CFLAG([-Wuninitialized])
MC_CHECK_ONE_CFLAG([-Wunreachable-code])
MC_CHECK_ONE_CFLAG([-Wunused-but-set-variable])
MC_CHECK_ONE_CFLAG([-Wunused-function])
MC_CHECK_ONE_CFLAG([-Wunused-label])
MC_CHECK_ONE_CFLAG([-Wunused-parameter])
MC_CHECK_ONE_CFLAG([-Wunused-result])
MC_CHECK_ONE_CFLAG([-Wunused-value])
MC_CHECK_ONE_CFLAG([-Wunused-variable])
MC_CHECK_ONE_CFLAG([-Wwrite-strings])
mc_CHECK_ONE_CFLAG([-Wbad-function-cast])
mc_CHECK_ONE_CFLAG([-Wcomment])
mc_CHECK_ONE_CFLAG([-Wdeclaration-after-statement])
mc_CHECK_ONE_CFLAG([-Wfloat-equal])
mc_CHECK_ONE_CFLAG([-Wformat])
mc_CHECK_ONE_CFLAG([-Wformat-security])
mc_CHECK_ONE_CFLAG([-Wimplicit])
mc_CHECK_ONE_CFLAG([-Wignored-qualifiers])
mc_CHECK_ONE_CFLAG([-Wmaybe-uninitialized])
mc_CHECK_ONE_CFLAG([-Wmissing-braces])
mc_CHECK_ONE_CFLAG([-Wmissing-declarations])
mc_CHECK_ONE_CFLAG([-Wmissing-field-initializers])
mc_CHECK_ONE_CFLAG([-Wmissing-format-attribute])
mc_CHECK_ONE_CFLAG([-Wmissing-parameter-type])
mc_CHECK_ONE_CFLAG([-Wmissing-prototypes])
mc_CHECK_ONE_CFLAG([-Wmissing-variable-declarations])
mc_CHECK_ONE_CFLAG([-Wnested-externs])
mc_CHECK_ONE_CFLAG([-Wno-long-long])
mc_CHECK_ONE_CFLAG([-Wno-unreachable-code])
mc_CHECK_ONE_CFLAG([-Wparentheses])
mc_CHECK_ONE_CFLAG([-Wpointer-arith])
mc_CHECK_ONE_CFLAG([-Wpointer-sign])
mc_CHECK_ONE_CFLAG([-Wredundant-decls])
mc_CHECK_ONE_CFLAG([-Wreturn-type])
mc_CHECK_ONE_CFLAG([-Wsequence-point])
mc_CHECK_ONE_CFLAG([-Wshadow])
mc_CHECK_ONE_CFLAG([-Wsign-compare])
dnl mc_CHECK_ONE_CFLAG([-Wstrict-aliasing])
mc_CHECK_ONE_CFLAG([-Wstrict-prototypes])
mc_CHECK_ONE_CFLAG([-Wswitch])
mc_CHECK_ONE_CFLAG([-Wswitch-default])
mc_CHECK_ONE_CFLAG([-Wtype-limits])
mc_CHECK_ONE_CFLAG([-Wundef])
mc_CHECK_ONE_CFLAG([-Wuninitialized])
mc_CHECK_ONE_CFLAG([-Wunreachable-code])
mc_CHECK_ONE_CFLAG([-Wunused-but-set-variable])
mc_CHECK_ONE_CFLAG([-Wunused-function])
mc_CHECK_ONE_CFLAG([-Wunused-label])
mc_CHECK_ONE_CFLAG([-Wunused-parameter])
mc_CHECK_ONE_CFLAG([-Wunused-result])
mc_CHECK_ONE_CFLAG([-Wunused-value])
mc_CHECK_ONE_CFLAG([-Wunused-variable])
mc_CHECK_ONE_CFLAG([-Wwrite-strings])
AC_LANG_POP()
])

14
m4.include/mc-check-search-type.m4
View File

@ -1,4 +1,4 @@
dnl @synopsis MC_VERSION
dnl @synopsis mc_CHECK_SEARCH_TYPE
dnl
dnl Check search type in mc. Currently used glib-regexp or pcre
dnl
@ -7,7 +7,7 @@ dnl @version 2009-06-19
dnl @license GPL
dnl @copyright Free Software Foundation, Inc.
AC_DEFUN([MC_CHECK_SEARCH_TYPE_PCRE],[
AC_DEFUN([mc_CHECK_SEARCH_TYPE_PCRE],[
AX_PATH_LIB_PCRE
if test x"${PCRE_LIBS}" = x; then
AC_MSG_ERROR([Your system don't have pcre library (or pcre devel stuff)])
@ -18,18 +18,18 @@ AC_DEFUN([MC_CHECK_SEARCH_TYPE_PCRE],[
])
AC_DEFUN([MC_CHECK_SEARCH_TYPE_GLIB],[
AC_DEFUN([mc_CHECK_SEARCH_TYPE_GLIB],[
$PKG_CONFIG --max-version 2.14 glib-2.0
if test $? -eq 0; then
AC_MSG_RESULT([[Selected 'glib' search engine, but you don't have glib >= 2.14. Trying to use 'pcre' engine], (WARNING)])
MC_CHECK_SEARCH_TYPE_PCRE
mc_CHECK_SEARCH_TYPE_PCRE
else
AC_DEFINE(SEARCH_TYPE_GLIB, 1, [Define to select 'glib-regexp' search type])
fi
])
AC_DEFUN([MC_CHECK_SEARCH_TYPE],[
AC_DEFUN([mc_CHECK_SEARCH_TYPE],[
AC_ARG_WITH([search-engine],
AS_HELP_STRING([--with-search-engine=type],
@ -40,7 +40,7 @@ AC_DEFUN([MC_CHECK_SEARCH_TYPE],[
SEARCH_TYPE="glib-regexp"
;;
xpcre)
MC_CHECK_SEARCH_TYPE_PCRE
mc_CHECK_SEARCH_TYPE_PCRE
;;
x)
SEARCH_TYPE="glib-regexp"
@ -51,6 +51,6 @@ AC_DEFUN([MC_CHECK_SEARCH_TYPE],[
esac
if test x"$SEARCH_TYPE" = x"glib-regexp"; then
MC_CHECK_SEARCH_TYPE_GLIB
mc_CHECK_SEARCH_TYPE_GLIB
fi
])

4
m4.include/mc-glib.m4
View File

@ -3,7 +3,7 @@ dnl Check whether the g_module_* family of functions works
dnl on this system. We need to know that at the compile time to
dnl decide whether to link with X11.
dnl
AC_DEFUN([AC_G_MODULE_SUPPORTED], [
AC_DEFUN([mc_G_MODULE_SUPPORTED], [
g_module_supported=""
@ -67,7 +67,7 @@ AC_DEFUN([AC_G_MODULE_SUPPORTED], [
])
AC_DEFUN([AC_CHECK_GLIB], [
AC_DEFUN([mc_CHECK_GLIB], [
dnl
dnl First try glib 2.x.
dnl Keep this check close to the beginning, so that the users

4
m4.include/mc-i18n.m4
View File

@ -1,4 +1,4 @@
dnl @synopsis MC_DOC_LINGUAS
dnl @synopsis mc_I18N
dnl
dnl Check if environment is ready for get translations of docs from transifex
dnl
@ -7,7 +7,7 @@ dnl @version 2011-02-10
dnl @license GPL
dnl @copyright Free Software Foundation, Inc.
AC_DEFUN([MC_I18N],[
AC_DEFUN([mc_I18N],[
if test "x$USE_INCLUDED_LIBINTL" = xyes; then
CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/intl -I\$(top_srcdir)/intl"

2
m4.include/mc-subshell.m4
View File

@ -1,7 +1,7 @@
dnl
dnl Subshell support.
dnl
AC_DEFUN([MC_SUBSHELL], [
AC_DEFUN([mc_SUBSHELL], [
AC_MSG_CHECKING([for subshell support])
AC_ARG_WITH(subshell,

4
m4.include/mc-tests.m4
View File

@ -1,4 +1,4 @@
dnl @synopsis MC_UNIT_TESTS
dnl @synopsis mc_UNIT_TESTS
dnl
dnl Check if unit tests enabled
dnl
@ -7,7 +7,7 @@ dnl @version 2011-02-10
dnl @license GPL
dnl @copyright Free Software Foundation, Inc.
AC_DEFUN([MC_UNIT_TESTS],[
AC_DEFUN([mc_UNIT_TESTS],[
AC_ARG_ENABLE(
[tests],

6
m4.include/mc-use-termcap.m4
View File

@ -1,7 +1,7 @@
dnl
dnl Try using termcap database and link with libtermcap if possible.
dnl
AC_DEFUN([MC_USE_TERMCAP], [
AC_DEFUN([mc_USE_TERMCAP], [
screen_msg="$screen_msg with termcap database"
AC_MSG_NOTICE([using S-Lang screen library with termcap])
AC_DEFINE(USE_TERMCAP, 1, [Define to use termcap database])
@ -11,7 +11,7 @@ AC_DEFUN([MC_USE_TERMCAP], [
dnl
dnl Check if the installed S-Lang library uses termcap
dnl
AC_DEFUN([MC_SLANG_TERMCAP], [
AC_DEFUN([mc_SLANG_TERMCAP], [
unset ac_cv_lib_termcap_tgoto
AC_CACHE_CHECK([if S-Lang uses termcap], [mc_cv_slang_termcap], [
@ -31,6 +31,6 @@ AC_DEFUN([MC_SLANG_TERMCAP], [
])
if test x"$mc_cv_slang_termcap" = xyes; then
MC_USE_TERMCAP
mc_USE_TERMCAP
fi
])

4
m4.include/mc-version.m4
View File

@ -1,4 +1,4 @@
dnl @synopsis MC_VERSION
dnl @synopsis mc_VERSION
dnl
dnl Get current version of Midnight Commander from git tags
dnl
@ -7,7 +7,7 @@ dnl @version 2009-12-30
dnl @license GPL
dnl @copyright Free Software Foundation, Inc.
AC_DEFUN([MC_VERSION],[
AC_DEFUN([mc_VERSION],[
if test ! -f ${srcdir}/version.h; then
${srcdir}/maint/utils/version.sh ${srcdir}
fi

28
m4.include/mc-vfs.m4
View File

@ -1,4 +1,4 @@
AC_DEFUN([AC_MC_VFS_ADDNAME],
AC_DEFUN([mc_VFS_ADDNAME],
[
if test x"$vfs_flags" = "x" ; then
vfs_flags="$1"
@ -19,7 +19,7 @@ m4_include([m4.include/vfs/mc-vfs-tarfs.m4])
m4_include([m4.include/vfs/mc-vfs-cpiofs.m4])
m4_include([m4.include/vfs/mc-vfs-samba.m4])
dnl MC_VFS_CHECKS
dnl mc_VFS_CHECKS
dnl Check for various functions needed by libvfs.
dnl This has various effects:
dnl Sets MC_VFS_LIBS to libraries required
@ -28,7 +28,7 @@ dnl Sets shell variable enable_vfs to yes (default, --with-vfs) or
dnl "no" (--without-vfs).
dnl Private define
AC_DEFUN([MC_ENABLE_VFS_NET],
AC_DEFUN([mc_ENABLE_VFS_NET],
[
dnl FIXME: network checks should probably be in their own macro.
AC_REQUIRE_SOCKET
@ -48,7 +48,7 @@ AC_DEFUN([MC_ENABLE_VFS_NET],
fi
])
AC_DEFUN([AC_MC_VFS_CHECKS],
AC_DEFUN([mc_VFS_CHECKS],
[
vfs_type="normal"
@ -69,20 +69,20 @@ AC_DEFUN([AC_MC_VFS_CHECKS],
AC_DEFINE(ENABLE_VFS, [1], [Define to enable VFS support])
fi
AC_MC_VFS_CPIOFS
AC_MC_VFS_TARFS
AC_MC_VFS_SFS
AC_MC_VFS_EXTFS
AC_MC_VFS_UNDELFS
AC_MC_VFS_FTP
AC_MC_VFS_SFTP
AC_MC_VFS_FISH
AC_MC_VFS_SMB
mc_VFS_CPIOFS
mc_VFS_EXTFS
mc_VFS_FISH
mc_VFS_FTP
mc_VFS_SFS
mc_VFS_SFTP
mc_VFS_SMB
mc_VFS_TARFS
mc_VFS_UNDELFS
AM_CONDITIONAL(ENABLE_VFS, [test x"$enable_vfs" = x"yes"])
if test x"$enable_vfs_ftp" = x"yes" -o x"$enable_vfs_fish" = x"yes" -o x"$enable_vfs_smb" = x"yes"; then
MC_ENABLE_VFS_NET
mc_ENABLE_VFS_NET
fi
AM_CONDITIONAL([ENABLE_VFS_NET], [test x"$enable_vfs_net" = x"yes"])

2
m4.include/mc-with-internal-edit.m4
View File

@ -1,7 +1,7 @@
dnl
dnl Internal editor support.
dnl
AC_DEFUN([MC_WITH_INTERNAL_EDIT], [
AC_DEFUN([mc_WITH_INTERNAL_EDIT], [
AC_ARG_WITH([internal_edit],
AS_HELP_STRING([--with-internal-edit], [Enable internal editor @<:@yes@:>@]))

8
m4.include/mc-with-screen-ncurses.m4
View File

@ -1,5 +1,5 @@
dnl check for ncurses in user supplied path
AC_DEFUN([MC_CHECK_NCURSES_BY_PATH], [
AC_DEFUN([mc_CHECK_NCURSES_BY_PATH], [
ac_ncurses_inc_path=[$1]
ac_ncurses_lib_path=[$2]
@ -70,7 +70,7 @@ dnl
dnl If ncurses exports the ESCDELAY variable it should be set to 0
dnl or you'll have to press Esc three times to dismiss a dialog box.
dnl
AC_DEFUN([MC_WITH_NCURSES], [
AC_DEFUN([mc_WITH_NCURSES], [
dnl has_colors() is specific to ncurses, it's not in the old curses
save_LIBS="$LIBS"
ncursesw_found=
@ -96,7 +96,7 @@ AC_DEFUN([MC_WITH_NCURSES], [
dnl we need at least the inc path, the lib may be in a std location
if test x"$ac_ncurses_inc_path" != x; then
dnl check the user supplied location
MC_CHECK_NCURSES_BY_PATH([$ac_ncurses_inc_path],[$ac_ncurses_lib_path])
mc_CHECK_NCURSES_BY_PATH([$ac_ncurses_inc_path],[$ac_ncurses_lib_path])
LIBS=
AC_SEARCH_LIBS([has_colors], [ncurses], [MCLIBS="$MCLIBS $LIBS"],
@ -160,7 +160,7 @@ dnl If ncursesw exports the ESCDELAY variable it should be set to 0
dnl or you'll have to press Esc three times to dismiss a dialog box.
dnl
AC_DEFUN([MC_WITH_NCURSESW], [
AC_DEFUN([mc_WITH_NCURSESW], [
dnl has_colors() is specific to ncurses, it's not in the old curses
save_LIBS="$LIBS"
LIBS=

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

@ -1,6 +1,6 @@
dnl Check the header
AC_DEFUN([MC_CHECK_SLANG_HEADER], [
AC_DEFUN([mc_CHECK_SLANG_HEADER], [
AC_MSG_CHECKING([for slang/slang.h])
AC_PREPROC_IFELSE(
[
@ -21,7 +21,7 @@ dnl
dnl Check if the system S-Lang library can be used.
dnl If not, and $1 is "strict", exit.
dnl
AC_DEFUN([MC_CHECK_SLANG_BY_PATH], [
AC_DEFUN([mc_CHECK_SLANG_BY_PATH], [
param_slang_inc_path=[$1]
param_slang_lib_path=[$2]
@ -60,7 +60,7 @@ AC_DEFUN([MC_CHECK_SLANG_BY_PATH], [
[
AC_MSG_RESULT(no)
MC_CHECK_SLANG_HEADER
mc_CHECK_SLANG_HEADER
if test x"$found_slang" = xno; then
error_msg_slang="S-Lang header not found"
else
@ -117,7 +117,7 @@ int main (void)
dnl Check if termcap is needed.
dnl This check must be done before anything is linked against S-Lang.
if test x"$found_slang" = x"yes"; then
MC_SLANG_TERMCAP
mc_SLANG_TERMCAP
if test x"$mc_cv_slang_termcap" = x"yes"; then
saved_CPPFLAGS="$saved_CPPFLAGS "
saved_LDFLAGS="-ltermcap $saved_LDFLAGS"
@ -154,7 +154,7 @@ int main (void)
dnl
dnl Use the slang library.
dnl
AC_DEFUN([MC_WITH_SLANG], [
AC_DEFUN([mc_WITH_SLANG], [
with_screen=slang
found_slang=yes
error_msg_slang=""
@ -176,7 +176,7 @@ AC_DEFUN([MC_WITH_SLANG], [
)
if test x"$ac_slang_lib_path" != x -o x"$ac_slang_inc_path" != x; then
echo 'checking S-Lang headers in specified place ...'
MC_CHECK_SLANG_BY_PATH([$ac_slang_inc_path],[$ac_slang_lib_path])
mc_CHECK_SLANG_BY_PATH([$ac_slang_inc_path],[$ac_slang_lib_path])
else
found_slang=no
PKG_CHECK_MODULES(SLANG, [slang >= 2.0], [found_slang=yes], [:])
@ -192,14 +192,14 @@ AC_DEFUN([MC_WITH_SLANG], [
ac_slang_lib_path="/usr/lib"
echo 'checking S-Lang headers in /usr ...'
MC_CHECK_SLANG_BY_PATH([$ac_slang_inc_path],[$ac_slang_lib_path])
mc_CHECK_SLANG_BY_PATH([$ac_slang_inc_path],[$ac_slang_lib_path])
if test x"$found_slang" = "xno"; then
found_slang=yes
ac_slang_inc_path="/usr/local/include"
ac_slang_lib_path="/usr/local/lib"
echo 'checking S-Lang headers in /usr/local ...'
MC_CHECK_SLANG_BY_PATH( $ac_slang_inc_path , $ac_slang_lib_path )
mc_CHECK_SLANG_BY_PATH( $ac_slang_inc_path , $ac_slang_lib_path )
if test x"$found_slang" = "xno"; then
AC_MSG_ERROR([$error_msg_slang])
fi
@ -208,5 +208,5 @@ AC_DEFUN([MC_WITH_SLANG], [
AC_DEFINE(HAVE_SLANG, 1, [Define to use S-Lang library for screen management])
MC_CHECK_SLANG_HEADER
mc_CHECK_SLANG_HEADER
])

8
m4.include/mc-with-screen.m4
View File

@ -5,7 +5,7 @@ dnl
dnl Select the screen library.
dnl
AC_DEFUN([MC_WITH_SCREEN], [
AC_DEFUN([mc_WITH_SCREEN], [
AC_ARG_WITH([screen],
AS_HELP_STRING([--with-screen=@<:@LIB@:>@],
@ -13,13 +13,13 @@ AC_DEFUN([MC_WITH_SCREEN], [
case x$with_screen in
x | xslang)
MC_WITH_SLANG
mc_WITH_SLANG
;;
xncurses)
MC_WITH_NCURSES
mc_WITH_NCURSES
;;
xncursesw)
MC_WITH_NCURSESW
mc_WITH_NCURSESW
;;
*)
AC_MSG_ERROR([Value of the screen library is incorrect])

2
m4.include/mc-with-x.m4
View File

@ -1,7 +1,7 @@
dnl X11 support.
dnl Used to read keyboard modifiers when running under X11.
AC_DEFUN([MC_WITH_X], [
AC_DEFUN([mc_WITH_X], [
AC_PATH_XTRA

4
m4.include/vfs/mc-vfs-cpiofs.m4
View File

@ -1,12 +1,12 @@
dnl CPIO filesystem support
AC_DEFUN([AC_MC_VFS_CPIOFS],
AC_DEFUN([mc_VFS_CPIOFS],
[
AC_ARG_ENABLE([vfs-cpio],
AS_HELP_STRING([--enable-vfs-cpio], [Support for cpio filesystem @<:@yes@:>@]))
if test "$enable_vfs" = "yes" -a x"$enable_vfs_cpio" != x"no"; then
enable_vfs_cpio="yes"
AC_DEFINE([ENABLE_VFS_CPIO], [1], [Support for cpio filesystem])
AC_MC_VFS_ADDNAME([cpio])
mc_VFS_ADDNAME([cpio])
fi
AM_CONDITIONAL(ENABLE_VFS_CPIO, [test "$enable_vfs" = "yes" -a x"$enable_vfs_cpio" = x"yes"])
])

10
m4.include/vfs/mc-vfs-extfs.m4
View File

@ -1,8 +1,8 @@
dnl AC_MC_EXTFS_CHECKS
dnl mc_EXTFS_CHECKS
dnl Check for tools used in extfs scripts.
dnl FIXME: make this configurable
AC_DEFUN([AC_MC_EXTFS_CHECKS], [
AC_DEFUN([mc_EXTFS_CHECKS], [
AC_PATH_PROG([ZIP], [zip], [/usr/bin/zip])
AC_PATH_PROG([UNZIP], [unzip], [/usr/bin/unzip])
AC_CACHE_CHECK([for zipinfo code in unzip], [mc_cv_have_zipinfo],
@ -20,14 +20,14 @@ AC_DEFUN([AC_MC_EXTFS_CHECKS], [
dnl Enable Extfs (classic)
AC_DEFUN([AC_MC_VFS_EXTFS],
AC_DEFUN([mc_VFS_EXTFS],
[
AC_ARG_ENABLE([vfs-extfs],
AS_HELP_STRING([--enable-vfs-extfs], [Support for extfs filesystem @<:@yes@:>@]))
if test "$enable_vfs" = "yes" -a x"$enable_vfs_extfs" != x"no"; then
AC_MC_EXTFS_CHECKS
mc_EXTFS_CHECKS
enable_vfs_extfs="yes"
AC_MC_VFS_ADDNAME([extfs])
mc_VFS_ADDNAME([extfs])
AC_DEFINE([ENABLE_VFS_EXTFS], [1], [Support for extfs])
fi
AM_CONDITIONAL(ENABLE_VFS_EXTFS, [test "$enable_vfs" = "yes" -a x"$enable_vfs_extfs" = x"yes"])

4
m4.include/vfs/mc-vfs-fish.m4
View File

@ -1,11 +1,11 @@
dnl Enable FISH protocol (classic)
AC_DEFUN([AC_MC_VFS_FISH],
AC_DEFUN([mc_VFS_FISH],
[
AC_ARG_ENABLE([vfs-fish],
AS_HELP_STRING([--enable-vfs-fish], [Support for FISH filesystem @<:@yes@:>@]))
if test "$enable_vfs" = "yes" -a "x$enable_vfs_fish" != xno; then
enable_vfs_fish="yes"
AC_MC_VFS_ADDNAME([fish])
mc_VFS_ADDNAME([fish])
AC_DEFINE([ENABLE_VFS_FISH], [1], [Support for FISH vfs])
fi
AM_CONDITIONAL(ENABLE_VFS_FISH, [test "$enable_vfs" = "yes" -a x"$enable_vfs_fish" = x"yes"])

4
m4.include/vfs/mc-vfs-ftp.m4
View File

@ -1,11 +1,11 @@
dnl Enable FTP filesystem (classic)
AC_DEFUN([AC_MC_VFS_FTP],
AC_DEFUN([mc_VFS_FTP],
[
AC_ARG_ENABLE([vfs-ftp],
AS_HELP_STRING([--enable-vfs-ftp], [Support for FTP filesystem @<:@yes@:>@]))
if test "$enable_vfs" != "no" -a x"$enable_vfs_ftp" != x"no"; then
enable_vfs_ftp="yes"
AC_MC_VFS_ADDNAME([ftp])
mc_VFS_ADDNAME([ftp])
AC_DEFINE([ENABLE_VFS_FTP], [1], [Support for FTP (classic)])
fi
AM_CONDITIONAL([ENABLE_VFS_FTP], [test "$enable_vfs" = "yes" -a x"$enable_vfs_ftp" = x"yes"])

4
m4.include/vfs/mc-vfs-samba.m4
View File

@ -1,5 +1,5 @@
dnl Samba support
AC_DEFUN([AC_MC_VFS_SMB],
AC_DEFUN([mc_VFS_SMB],
[
AC_ARG_ENABLE([vfs-smb],
AS_HELP_STRING([--enable-vfs-smb], [Support for SMB filesystem @<:@no@:>@]),
@ -14,7 +14,7 @@ AC_DEFUN([AC_MC_VFS_SMB],
if test "$enable_vfs" = "yes" -a x"$enable_vfs_smb" != x"no"; then
enable_vfs_smb="yes"
AC_MC_VFS_ADDNAME([smb])
mc_VFS_ADDNAME([smb])
AC_DEFINE([ENABLE_VFS_SMB], [1], [Define to enable VFS over SMB])
fi

4
m4.include/vfs/mc-vfs-sfs.m4
View File

@ -1,11 +1,11 @@
dnl SFS support
AC_DEFUN([AC_MC_VFS_SFS],
AC_DEFUN([mc_VFS_SFS],
[
AC_ARG_ENABLE([vfs-sfs],
AS_HELP_STRING([--enable-vfs-sfs], [Support for sfs filesystem @<:@yes@:>@]))
if test "$enable_vfs" = "yes" -a x"$enable_vfs_sfs" != x"no"; then
enable_vfs_sfs="yes"
AC_MC_VFS_ADDNAME([sfs])
mc_VFS_ADDNAME([sfs])
AC_DEFINE([ENABLE_VFS_SFS], [1], [Support for sfs])
fi
AM_CONDITIONAL(ENABLE_VFS_SFS, [test "$enable_vfs" = "yes" -a x"$enable_vfs_sfs" = x"yes"])

4
m4.include/vfs/mc-vfs-sftp.m4
View File

@ -1,12 +1,12 @@
dnl Enable SFTP filesystem
AC_DEFUN([AC_MC_VFS_SFTP],
AC_DEFUN([mc_VFS_SFTP],
[
AC_ARG_ENABLE([vfs-sftp],
AS_HELP_STRING([--enable-vfs-sftp], [Support for SFTP filesystem [auto]]))
if test "$enable_vfs" != "no" -a x"$enable_vfs_sftp" != x"no"; then
PKG_CHECK_MODULES(LIBSSH, [libssh2 >= 1.2.5], [found_libssh=yes], [:])
if test x"$found_libssh" = "xyes"; then
AC_MC_VFS_ADDNAME([sftp])
mc_VFS_ADDNAME([sftp])
AC_DEFINE([ENABLE_VFS_SFTP], [1], [Support for SFTP filesystem])
MCLIBS="$MCLIBS $LIBSSH_LIBS"
enable_vfs_sftp="yes"

4
m4.include/vfs/mc-vfs-tarfs.m4
View File

@ -1,11 +1,11 @@
dnl TAR filesystem support
AC_DEFUN([AC_MC_VFS_TARFS],
AC_DEFUN([mc_VFS_TARFS],
[
AC_ARG_ENABLE([vfs-tar],
AS_HELP_STRING([--enable-vfs-tar], [Support for tar filesystem @<:@yes@:>@]))
if test "$enable_vfs" = "yes" -a x"$enable_vfs_tar" != x"no"; then
enable_vfs_tar="yes"
AC_MC_VFS_ADDNAME([tar])
mc_VFS_ADDNAME([tar])
AC_DEFINE([ENABLE_VFS_TAR], [1], [Support for tar filesystem])
fi
AM_CONDITIONAL(ENABLE_VFS_TAR, [test "$enable_vfs" = "yes" -a x"$enable_vfs_tar" = x"yes"])

10
m4.include/vfs/mc-vfs-undelfs.m4
View File

@ -1,10 +1,10 @@
dnl MC_UNDELFS_CHECKS
dnl mc_UNDELFS_CHECKS
dnl Check for ext2fs undel support.
dnl Set shell variable ext2fs_undel to "yes" if we have it,
dnl "no" otherwise. May define ENABLE_VFS_UNDELFS for cpp.
dnl Will set EXT2FS_UNDEL_LIBS to required libraries.
AC_DEFUN([MC_UNDELFS_CHECKS], [
AC_DEFUN([mc_UNDELFS_CHECKS], [
ext2fs_undel=no
EXT2FS_UNDEL_LIBS=
AC_CHECK_HEADERS([ext2fs/ext2_fs.h linux/ext2_fs.h], [ext2_fs_h=yes; break])
@ -45,7 +45,7 @@ AC_DEFUN([MC_UNDELFS_CHECKS], [
dnl
dnl Ext2fs undelete support
dnl
AC_DEFUN([AC_MC_VFS_UNDELFS],
AC_DEFUN([mc_VFS_UNDELFS],
[
AC_ARG_ENABLE([vfs-undelfs],
AS_HELP_STRING([--enable-vfs-undelfs], [Support for ext2 undelete filesystem @<:@no@:>@]),
@ -59,11 +59,11 @@ AC_DEFUN([AC_MC_VFS_UNDELFS],
[enable_vfs_undelfs="no"])
if test x"$enable_vfs" = x"yes" -a x"$enable_vfs_undelfs" != x"no"; then
MC_UNDELFS_CHECKS
mc_UNDELFS_CHECKS
if test x"$ext2fs_undel" = x"yes"; then
enable_vfs_undelfs="yes"
AC_MC_VFS_ADDNAME([undelfs])
mc_VFS_ADDNAME([undelfs])
AC_DEFINE(ENABLE_VFS_UNDELFS, [1], [Support for ext2 undelfs])
AC_MSG_NOTICE([using ext2fs file recovery code])
MCLIBS="$MCLIBS $EXT2FS_UNDEL_LIBS"