diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-19 13:09:39 +0100 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-19 13:27:34 +0100 |
commit | 78964087335e66e9ae4ad3899bd545b770e30581 (patch) | |
tree | c7d54a7a97e2bdde966d14fbb3c1c176a341e306 /lib/config.guess | |
parent | 3f9fc60baa2e7f9324e17a26f592e92148b7117c (diff) | |
parent | caba6a20804021ab607b40ccefece4e77ef72a77 (diff) | |
download | automake-78964087335e66e9ae4ad3899bd545b770e30581.tar.gz |
Merge branch 'micro' into minor
* micro:
sync: update third-part files from upstream
Make sure AM_INIT_AUTOMAKE has a trailing newline
dist: adjust warning messages about shar and tarZ deprecation
docs: improve description of ${PACKAGE}, ${VERSION}, and similar variables
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'lib/config.guess')
-rwxr-xr-x | lib/config.guess | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/config.guess b/lib/config.guess index 1f5c50c0d..6c32c8645 100755 --- a/lib/config.guess +++ b/lib/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2014-03-23' +timestamp='2014-11-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@ timestamp='2014-03-23' # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD # -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to <config-patches@gnu.org>. me=`echo "$0" | sed -e 's,.*/,,'` @@ -579,8 +579,9 @@ EOF else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi |