Browse Source

Ticket #2560: get rid of autoconf obsolete macros.

Use AS_HELP_STRING instead of AC_HELP_STRING.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Andrew Borodin 14 years ago
parent
commit
4358a4e898

+ 2 - 2
configure.ac

@@ -53,7 +53,7 @@ dnl PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
 AC_CHECK_GLIB
 
 AC_ARG_ENABLE([mclib],
-        [AS_HELP_STRING([--enable-mclib],[ Compile shared library libmc.so [no]])],
+        [AS_HELP_STRING([--enable-mclib], [Compile shared library libmc.so @<:@no@:>@])],
         [
             if test "x$enableval" = "xno" ; then
                 enable_mclib=no
@@ -459,7 +459,7 @@ fi
 
 AC_ARG_ENABLE(
     [werror],
-    AC_HELP_STRING([--enable-werror], [Handle all compiler warnings as errors] )
+    AS_HELP_STRING([--enable-werror], [Handle all compiler warnings as errors])
 )
 
 if test "x$enable_werror" = xyes; then

+ 1 - 1
m4.include/ac-glib.m4

@@ -86,7 +86,7 @@ AC_DEFUN([AC_CHECK_GLIB], [
     dnl
 
     AC_ARG_WITH([glib_static],
-        AC_HELP_STRING([--with-glib-static],[Link glib statically [[no]]]))
+        AS_HELP_STRING([--with-glib-static], [Link glib statically @<:@no@:>@]))
 
     glib_found=no
     PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.8], [glib_found=yes], [:])

+ 1 - 1
m4.include/ax_path_lib_pcre.m4

@@ -17,7 +17,7 @@ dnl @license GPLWithACException
 AC_DEFUN([AX_PATH_LIB_PCRE],[dnl
 AC_MSG_CHECKING([lib pcre])
 AC_ARG_WITH([pcre],
-            AC_HELP_STRING([--with-pcre[[=prefix]]], [compile pcre part (via libpcre check)]),
+            AS_HELP_STRING([--with-pcre@<:@=prefix@:>@], [Compile pcre part (via libpcre check)]),
             ,
             [with_pcre="yes"]
 )

+ 2 - 2
m4.include/mc-check-search-type.m4

@@ -32,8 +32,8 @@ AC_DEFUN([MC_CHECK_SEARCH_TYPE_GLIB],[
 AC_DEFUN([MC_CHECK_SEARCH_TYPE],[
 
     AC_ARG_WITH([search-engine],
-        AC_HELP_STRING([--with-search-engine=type],
-        [Select low-level search engine (since glib >= 2.14). [[glib|pcre]]])
+        AS_HELP_STRING([--with-search-engine=type],
+        [Select low-level search engine (since glib >= 2.14) @<:@glib|pcre@:>@])
       )
     case x$with_search_engine in
     xglib)

+ 1 - 1
m4.include/mc-tests.m4

@@ -11,7 +11,7 @@ AC_DEFUN([MC_UNIT_TESTS],[
 
     AC_ARG_ENABLE(
         [tests],
-        AC_HELP_STRING([--enable-tests], [Enable unit tests (see http://check.sourceforge.net/)] )
+        AS_HELP_STRING([--enable-tests], [Enable unit tests (see http://check.sourceforge.net/)])
     )
 
     if test x$enable_tests != xno; then

+ 1 - 1
m4.include/mc-vfs.m4

@@ -50,7 +50,7 @@ AC_DEFUN([AC_MC_VFS_CHECKS],
     vfs_type="normal"
 
     AC_ARG_ENABLE([vfs],
-	AC_HELP_STRING([--disable-vfs], [Disable VFS]),
+	AS_HELP_STRING([--disable-vfs], [Disable VFS]),
 	[
 	    if test "x$enableval" = "xno"; then
 		enable_vfs=no

+ 2 - 2
m4.include/mc-with-screen-ncurses.m4

@@ -74,7 +74,7 @@ AC_DEFUN([MC_WITH_NCURSES], [
 
     dnl get the user supplied include path
     AC_ARG_WITH([ncurses-includes],
-        AC_HELP_STRING([--with-ncurses-includes=@<:@DIR@:>@],
+        AS_HELP_STRING([--with-ncurses-includes=@<:@DIR@:>@],
             [set path to ncurses includes @<:@default=/usr/include@:>@; make sense only if --with-screen=ncurses; for /usr/local/include/ncurses specify /usr/local/include]
         ),
         [ac_ncurses_inc_path="$withval"],
@@ -83,7 +83,7 @@ AC_DEFUN([MC_WITH_NCURSES], [
 
     dnl get the user supplied lib path
     AC_ARG_WITH([ncurses-libs],
-        AC_HELP_STRING([--with-ncurses-libs=@<:@DIR@:>@],
+        AS_HELP_STRING([--with-ncurses-libs=@<:@DIR@:>@],
             [set path to ncurses library @<:@default=/usr/lib@:>@; make sense only if --with-screen=ncurses]
         ),
         [ac_ncurses_lib_path="$withval"],

+ 2 - 2
m4.include/mc-with-screen-slang.m4

@@ -177,7 +177,7 @@ AC_DEFUN([MC_WITH_SLANG], [
     error_msg_slang=""
 
     AC_ARG_WITH([slang-includes],
-        AC_HELP_STRING([--with-slang-includes=@<:@DIR@:>@],
+        AS_HELP_STRING([--with-slang-includes=@<:@DIR@:>@],
             [set path to SLANG includes @<:@default=/usr/include@:>@; make sense only if --with-screen=slang]
         ),
         [ac_slang_inc_path="$withval"],
@@ -185,7 +185,7 @@ AC_DEFUN([MC_WITH_SLANG], [
     )
 
     AC_ARG_WITH([slang-libs],
-        AC_HELP_STRING([--with-slang-libs=@<:@DIR@:>@],
+        AS_HELP_STRING([--with-slang-libs=@<:@DIR@:>@],
             [set path to SLANG library @<:@default=/usr/lib@:>@; make sense only if --with-screen=slang]
         ),
         [ac_slang_lib_path="$withval"],

+ 1 - 1
m4.include/vfs/mc-vfs-cpiofs.m4

@@ -2,7 +2,7 @@ dnl CPIO filesystem support
 AC_DEFUN([AC_MC_VFS_CPIOFS],
 [
     AC_ARG_ENABLE([vfs-cpio],
-		    AC_HELP_STRING([--enable-vfs-cpio], [Support for cpio filesystem [[yes]]]))
+		    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])

+ 1 - 1
m4.include/vfs/mc-vfs-extfs.m4

@@ -23,7 +23,7 @@ dnl Enable Extfs (classic)
 AC_DEFUN([AC_MC_VFS_EXTFS],
 [
     AC_ARG_ENABLE([vfs-extfs],
-		    AC_HELP_STRING([--enable-vfs-extfs], [Support for extfs filesystem [[yes]]]))
+		    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
 	enable_vfs_extfs="yes"

Some files were not shown because too many files changed in this diff