2005-06-28 Stepan Kasal * 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. Index: clcommit.m4sh =================================================================== RCS file: /cvsroot/libtool/libtool/clcommit.m4sh,v retrieving revision 1.9 diff -u -r1.9 clcommit.m4sh --- clcommit.m4sh 22 Apr 2005 10:10:29 -0000 1.9 +++ clcommit.m4sh 28 Jun 2005 10:51:12 -0000 @@ -409,7 +409,7 @@ 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 Index: m4/libtool.m4 =================================================================== RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v retrieving revision 1.197 diff -u -r1.197 libtool.m4 --- m4/libtool.m4 18 Jun 2005 16:49:52 -0000 1.197 +++ m4/libtool.m4 28 Jun 2005 10:51:13 -0000 @@ -406,7 +406,7 @@ # 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]) Index: m4/lt~obsolete.m4 =================================================================== RCS file: /cvsroot/libtool/libtool/m4/lt~obsolete.m4,v retrieving revision 1.8 diff -u -r1.8 lt~obsolete.m4 --- m4/lt~obsolete.m4 8 Jan 2005 21:17:57 -0000 1.8 +++ m4/lt~obsolete.m4 28 Jun 2005 10:51:13 -0000 @@ -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])])