From 7763e8f8d7ad722ff1e7685d8eebf5f8f9893828 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 8 Jan 2007 18:53:15 +0000 Subject: [PATCH] Simplify the sorting command from the last patch. --- ChangeLog | 5 +++++ m4/lib-link.m4 | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb9da15abb..4947817a7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-01-08 Bruno Haible + + * m4/lib-link.m4 (AC_LIB_LINKFLAGS_BODY): Simplify the sorting + command. + 2007-01-08 Jim Meyering Use a more robust test for a "can't happen" condition. diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 index 76503fef4c..65713f8b85 100644 --- a/m4/lib-link.m4 +++ b/m4/lib-link.m4 @@ -1,5 +1,5 @@ -# lib-link.m4 serial 11 (gettext-0.16.2) -dnl Copyright (C) 2001-2006 Free Software Foundation, Inc. +# lib-link.m4 serial 12 (gettext-0.16.2) +dnl Copyright (C) 2001-2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -232,7 +232,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], ver=`(cd "$dir" && \ for f in "$libname$shrext".*; do echo "$f"; done \ | sed -e "s,^$libname$shrext\\\\.,," \ - | tr '.' ' ' | sort -n -r -k1 -k2 -k3 -k4 -k5 | tr ' ' '.' \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ | sed 1q ) 2>/dev/null` if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then found_dir="$dir" @@ -279,7 +279,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], ver=`(cd "$dir" && \ for f in "$libname$shrext".*; do echo "$f"; done \ | sed -e "s,^$libname$shrext\\\\.,," \ - | tr '.' ' ' | sort -n -r -k1 -k2 -k3 -k4 -k5 | tr ' ' '.' \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ | sed 1q ) 2>/dev/null` if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then found_dir="$dir" -- 2.30.2