From: Bruno Haible Date: Mon, 8 Jan 2007 18:50:15 +0000 (+0000) Subject: Simplify the sorting command. X-Git-Tag: v0.17~517 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e6574707463abca6b7436a635a308096bdf1ce8;p=thirdparty%2Fgettext.git Simplify the sorting command. --- diff --git a/autoconf-lib-link/m4/ChangeLog b/autoconf-lib-link/m4/ChangeLog index a3d3e4856..5354ef060 100644 --- a/autoconf-lib-link/m4/ChangeLog +++ b/autoconf-lib-link/m4/ChangeLog @@ -1,3 +1,7 @@ +2007-01-08 Bruno Haible + + * lib-link.m4 (AC_LIB_LINKFLAGS_BODY): Simplify the sorting command. + 2006-12-24 Bruno Haible Improve support for OpenBSD. diff --git a/autoconf-lib-link/m4/lib-link.m4 b/autoconf-lib-link/m4/lib-link.m4 index 76503fef4..4a77e6875 100644 --- a/autoconf-lib-link/m4/lib-link.m4 +++ b/autoconf-lib-link/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"