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_INIT([GNU Midnight Commander], [], [mc-devel@gnome.org])
AC_PREREQ(2.60) AC_PREREQ(2.60)
m4_pattern_forbid(MC_) m4_pattern_forbid(MC_)
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/main.c) AC_CONFIG_SRCDIR(src/main.c)
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR(config)
MC_VERSION MC_VERSION

View File

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

View File

@ -2,11 +2,11 @@ dnl CPIO filesystem support
AC_DEFUN([AC_MC_VFS_CPIOFS], AC_DEFUN([AC_MC_VFS_CPIOFS],
[ [
AC_ARG_ENABLE([vfs-cpio], 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 if test x"$enable_vfs_cpio" != x"no"; then
enable_vfs_cpio="yes"
AC_DEFINE([ENABLE_VFS_CPIO], [1], [Support for cpio filesystem]) AC_DEFINE([ENABLE_VFS_CPIO], [1], [Support for cpio filesystem])
AC_MC_VFS_ADDNAME([cpio]) AC_MC_VFS_ADDNAME([cpio])
enable_vfs_cpio="yes"
fi fi
AM_CONDITIONAL(ENABLE_VFS_CPIO, [test x"$enable_vfs_cpio" = x"yes"]) 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_DEFUN([AC_MC_VFS_EXTFS],
[ [
AC_ARG_ENABLE([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 if test x"$enable_vfs_extfs" != x"no"; then
AC_MC_EXTFS_CHECKS AC_MC_EXTFS_CHECKS
enable_vfs_extfs="yes" enable_vfs_extfs="yes"

View File

@ -2,7 +2,7 @@ dnl Enable FISH protocol (classic)
AC_DEFUN([AC_MC_VFS_FISH], AC_DEFUN([AC_MC_VFS_FISH],
[ [
AC_ARG_ENABLE([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 if test "x$enable_vfs_fish" != xno; then
enable_vfs_fish="yes" enable_vfs_fish="yes"
AC_MC_VFS_ADDNAME([fish]) AC_MC_VFS_ADDNAME([fish])

View File

@ -2,7 +2,7 @@ dnl Enable FTP filesystem (classic)
AC_DEFUN([AC_MC_VFS_FTP], AC_DEFUN([AC_MC_VFS_FTP],
[ [
AC_ARG_ENABLE([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 if test x"$enable_vfs_ftp" != x"no"; then
enable_vfs_ftp="yes" enable_vfs_ftp="yes"
AC_MC_VFS_ADDNAME([ftp]) AC_MC_VFS_ADDNAME([ftp])

View File

@ -2,7 +2,7 @@ dnl SFS support
AC_DEFUN([AC_MC_VFS_SFS], AC_DEFUN([AC_MC_VFS_SFS],
[ [
AC_ARG_ENABLE([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 if test x"$enable_vfs_sfs" != x"no"; then
enable_vfs_sfs="yes" enable_vfs_sfs="yes"
AC_MC_VFS_ADDNAME([sfs]) AC_MC_VFS_ADDNAME([sfs])

View File

@ -2,7 +2,7 @@ dnl TAR filesystem support
AC_DEFUN([AC_MC_VFS_TARFS], AC_DEFUN([AC_MC_VFS_TARFS],
[ [
AC_ARG_ENABLE([vfs-tar], 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 if test x"$enable_vfs_tar" != x"no"; then
enable_vfs_tar="yes" enable_vfs_tar="yes"
AC_MC_VFS_ADDNAME([tar]) AC_MC_VFS_ADDNAME([tar])