Fixed error: possibly undefined macro: _m4_text_wrap_word
    Signed-off-by: Slava Zanko <slavazanko@gmail.com>

    Fixed:
    * names of options for cpiofs, extfs, fish, ftp, sfs, tarfs
    * indent for option descriptions
    * option name from --search-engine to --with-search-engine
    Signed-off-by: Stan. S. Krupoderov <pashelper@gmail.com>
This commit is contained in:
Slava Zanko 2009-07-30 16:48:40 +03:00 committed by Ilia Maslakov
parent 5c3f932067
commit 57cb8390dc
13 changed files with 17 additions and 16 deletions

View File

@ -5,6 +5,7 @@ dnl
AC_INIT([GNU Midnight Commander], [], [mc-devel@gnome.org])
AC_PREREQ(2.60)
m4_pattern_forbid(MC_)
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/main.c)
AC_CONFIG_AUX_DIR(config)
MC_VERSION
@ -484,7 +485,7 @@ esac
dnl Support for background operations
AC_ARG_ENABLE([background],
[ --enable-background Support for background file operations [[yes]]])
[ --enable-background Support for background file operations [[yes]]])
if test "x$enable_background" != xno; then
AC_DEFINE(WITH_BACKGROUND, 1, [Define to enable background file operations])
fi
@ -494,7 +495,7 @@ dnl
dnl User visible support for charset conversion.
dnl
AC_ARG_ENABLE([charset],
[ --enable-charset Support for charset selection and conversion [[no]]])
[ --enable-charset Support for charset selection and conversion [[no]]])
have_charset=
charset_msg="no"
if test "x$enable_charset" = xyes; then

View File

@ -10,8 +10,8 @@ dnl @copyright Free Software Foundation, Inc.
AC_DEFUN([MC_CHECK_SEARCH_TYPE],[
AC_ARG_WITH([search-engine],
AC_HELP_STRING([--search-engine=type],
[Select low-level search engine (since glib >= 2.14). [[glib pcre]]])
AC_HELP_STRING([--with-search-engine=type],
[Select low-level search engine (since glib >= 2.14). [[glib|pcre]]])
)
case x$with_search_engine in
xglib)

View File

@ -10,7 +10,7 @@ AC_DEFUN([MC_MCSERVER_CHECKS], [
dnl mcfs support
dnl
AC_ARG_ENABLE([mcserver],
[ --enable-mcserver Support mc-specific networking file system server [[no]]],
[ --enable-mcserver Support mc-specific networking file system server [[no]]],
[if test "x$enableval" != "xno"; then
AC_DEFINE(ENABLE_MCSERVER, 1, [Define to enable mc-specific networking file system server])
AC_MC_VFS_ADDNAME([mcfs])

View File

@ -34,7 +34,7 @@ AC_DEFUN([MC_WITH_VFS],
use_net_code=false
AC_ARG_ENABLE([netcode],
[ --enable-netcode Support for networking [[yes]]])
[ --enable-netcode Support for networking [[yes]]])
if test "x$enable_netcode" != xno; then
dnl FIXME: network checks should probably be in their own macro.

View File

@ -19,7 +19,7 @@ AC_DEFUN([AC_REQUIRE_MVFS],
AC_DEFUN([AC_MVFS_FS], [
AC_PREPARE_MVFS
AC_ARG_ENABLE([mvfs-$1],[ --enable-mvfs-$1 Support for $3 (via libmvfs)])
AC_ARG_ENABLE([mvfs-$1],[ --enable-mvfs-$1 Support for $3 (via libmvfs)])
if test x"$enable_mvfs_$1" = x"yes" ; then
AC_REQUIRE_MVFS
AC_DEFINE(ENABLE_MVFS_$2, 1, [$1 (via libmvfs)])

View File

@ -2,11 +2,11 @@ dnl CPIO filesystem support
AC_DEFUN([AC_MC_VFS_CPIOFS],
[
AC_ARG_ENABLE([vfs-cpio],
[ --disable-vfs-cpio Support for cpio filesystem [[yes]]])
[ --enable-vfs-cpio Support for cpio filesystem [[yes]]])
if test 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])
enable_vfs_cpio="yes"
fi
AM_CONDITIONAL(ENABLE_VFS_CPIO, [test x"$enable_vfs_cpio" = x"yes"])
])

View File

@ -24,7 +24,7 @@ dnl Enable Extfs (classic)
AC_DEFUN([AC_MC_VFS_EXTFS],
[
AC_ARG_ENABLE([vfs-extfs],
[ --disable-vfs-extfs Support for extfs [[yes]]])
[ --enable-vfs-extfs Support for extfs [[yes]]])
if test x"$enable_vfs_extfs" != x"no"; then
AC_MC_EXTFS_CHECKS
enable_vfs_extfs="yes"

View File

@ -2,7 +2,7 @@ dnl Enable FISH protocol (classic)
AC_DEFUN([AC_MC_VFS_FISH],
[
AC_ARG_ENABLE([vfs-fish],
[ --disable-vfs-fish Support for FISH vfs [[yes]]])
[ --enable-vfs-fish Support for FISH vfs [[yes]]])
if test "x$enable_vfs_fish" != xno; then
enable_vfs_fish="yes"
AC_MC_VFS_ADDNAME([fish])

View File

@ -2,7 +2,7 @@ dnl Enable FTP filesystem (classic)
AC_DEFUN([AC_MC_VFS_FTP],
[
AC_ARG_ENABLE([vfs-ftp],
[ --disable-vfs-ftp Support for FTP vfs [[yes]]])
[ --enable-vfs-ftp Support for FTP vfs [[yes]]])
if test x"$enable_vfs_ftp" != x"no"; then
enable_vfs_ftp="yes"
AC_MC_VFS_ADDNAME([ftp])

View File

@ -10,7 +10,7 @@ AC_DEFUN([AC_MC_VFS_MCFS_SET],
AC_DEFUN([AC_MC_VFS_MCFS],
[
AC_ARG_ENABLE([vfs-mcfs],
[ --enable-vfs-mcfs Enable Support MCFS (mc's network filesystem)])
[ --enable-vfs-mcfs Enable Support MCFS (mc's network filesystem)])
if test x"$enable_vfs_mcfs" = x"yes" ; then
AC_MC_VFS_MCFS_SET
fi

View File

@ -2,7 +2,7 @@ dnl SFS support
AC_DEFUN([AC_MC_VFS_SFS],
[
AC_ARG_ENABLE([sfs],
[ --disable-vfs-sfs Support for sfs [[yes]]])
[ --enable-vfs-sfs Support for sfs [[yes]]])
if test x"$enable_vfs_sfs" != x"no"; then
enable_vfs_sfs="yes"
AC_MC_VFS_ADDNAME([sfs])

View File

@ -2,7 +2,7 @@ dnl TAR filesystem support
AC_DEFUN([AC_MC_VFS_TARFS],
[
AC_ARG_ENABLE([vfs-tar],
[ --disable-vfs-tar Support for tar filesystem [[yes]]])
[ --enable-vfs-tar Support for tar filesystem [[yes]]])
if test x"$enable_vfs_tar" != x"no"; then
enable_vfs_tar="yes"
AC_MC_VFS_ADDNAME([tar])

View File

@ -50,7 +50,7 @@ dnl
AC_DEFUN([AC_MC_VFS_UNDELFS],
[
AC_ARG_ENABLE([undelfs],
[ --enable-vfs-undelfs Support for ext2 undelete filesystem])
[ --enable-vfs-undelfs Support for ext2 undelete filesystem])
if test x"$enable_vfs_undelfs" = x"yes" ; then