* clcommit.m4sh: "grep|sed" can be replaced by mere "sed".

* m4/libtool.m4 (_LT_LIBTOOL_TAGS): Remove unnnecessary "[]".
* m4/lt~obsolete.m4: Use m4_ifndef.

diff --git a/ChangeLog b/ChangeLog
index eec5aa57d6857722ec608f736a775fdf564f2969..58e04ad133afc1fe4ca23f5a2d806c8eb17a4bb1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-28  Stepan Kasal  <kasal@ucw.cz>
+
+       * clcommit.m4sh: "grep|sed" can be replaced by mere "sed".
+       * m4/libtool.m4 (_LT_LIBTOOL_TAGS): Remove unnnecessary "[]".
+       * m4/lt~obsolete.m4: Use m4_ifndef.
+
 2005-06-27  Stepan Kasal  <kasal@ucw.cz>
 
        * m4/ltsugar.m4 (lt_combine, _lt_combine): Fix default separator.

diff --git a/clcommit.m4sh b/clcommit.m4sh
index 27a081f30e616579a62eef12c509ba5dbb54859c..20223ed47a29fad0e30e83b20d36a3c482990a31 100644 (file)
--- a/clcommit.m4sh
+++ b/clcommit.m4sh
@@ -409,7 +409,7 @@ func_commit ()
 
       sleep 1 # give the user some time for a ^C
 
-      subject=`cvs -nq up 2>/dev/null | grep '^[[MAD]] ' | $SED 's/^. //'`
+      subject=`cvs -nq up 2>/dev/null | $SED -n 's/^[[MAD]] //p'`
       test $# -gt 0 && subject="$@"
     fi
 

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 3e7d009f452bc93cb5e6cdff153d97a706f63068..8ba7fc54f58be846f93abb495813862a9453ca8d 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -405,7 +405,7 @@ m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
 # Output comment and list of tags supported by the script
 m4_defun([_LT_LIBTOOL_TAGS],
 [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="[]_LT_TAGS[]"dnl
+available_tags="_LT_TAGS"dnl
 ])
 
 # _LT_LIBTOOL_DECLARE(VARNAME, [TAG])

diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
index 5519907f6aef9fde640ad8d03d9b4b494e10ff40..5828365f9acfe20aede4a745ca2b5b9ffd353282 100644 (file)
--- a/m4/lt~obsolete.m4
+++ b/m4/lt~obsolete.m4
@@ -29,33 +29,33 @@
 # Anytime we withdraw an AC_DEFUN or AU_DEFUN, but still refer to it,
 # remember to add it here.
 
-m4_ifdef([AC_LIBTOOL_LINKER_OPTION],,  [AU_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifdef([AC_PROG_EGREP],,             [AU_DEFUN([AC_PROG_EGREP])])
-m4_ifdef([_LT_AC_PROG_ECHO_BACKSLASH],,        [AU_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifdef([_LT_AC_SHELL_INIT],,         [AU_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifdef([_LT_AC_SYS_LIBPATH_AIX],,    [AU_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifdef([_LT_PROG_LTMAIN],,           [AU_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifdef([_LT_AC_TAGVAR],,             [AU_DEFUN([_LT_AC_TAGVAR])])
-m4_ifdef([AC_LTDL_ENABLE_INSTALL],,    [AU_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifdef([AC_LTDL_PREOPEN],,           [AU_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifdef([_LT_AC_SYS_COMPILER],,       [AU_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifdef([_LT_AC_LOCK],,               [AU_DEFUN([_LT_AC_LOCK])])
-m4_ifdef([AC_LIBTOOL_SYS_OLD_ARCHIVE],,        [AU_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifdef([_LT_AC_TRY_DLOPEN_SELF],,    [AU_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifdef([AC_LIBTOOL_PROG_CC_C_O],,    [AU_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifdef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],, [AU_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifdef([AC_LIBTOOL_OBJDIR],,         [AU_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifdef([AC_LTDL_OBJDIR],,            [AU_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifdef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],, [AU_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifdef([AC_LIBTOOL_SYS_LIB_STRIP],,  [AU_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifdef([AC_PATH_MAGIC],,             [AU_DEFUN([AC_PATH_MAGIC])])
-m4_ifdef([AC_PROG_LD_GNU],,            [AU_DEFUN([AC_PROG_LD_GNU])])
-m4_ifdef([AC_PROG_LD_RELOAD_FLAG],,    [AU_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifdef([AC_DEPLIBS_CHECK_METHOD],,   [AU_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifdef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],, [AU_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifdef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],, [AU_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifdef([AC_LIBTOOL_PROG_COMPILER_PIC],, [AU_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifdef([AC_LIBTOOL_PROG_LD_SHLIBS],, [AU_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifdef([AC_LIBTOOL_POSTDEP_PREDEP],, [AU_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifdef([LT_AC_PROG_EGREP],,          [AU_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifdef([LT_AC_PROG_SED],,            [AU_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],  [AU_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],             [AU_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],        [AU_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],         [AU_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],    [AU_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],           [AU_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],             [AU_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],    [AU_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],           [AU_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],       [AU_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],               [AU_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],        [AU_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],    [AU_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],    [AU_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AU_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],         [AU_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],            [AU_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AU_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],  [AU_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],             [AU_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],            [AU_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],    [AU_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],   [AU_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AU_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AU_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AU_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AU_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AU_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],          [AU_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],            [AU_DEFUN([LT_AC_PROG_SED])])