[commits] r5011 - in /fsf/trunk/libc: ChangeLog configure configure.in

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Jan 25 00:06:13 2008
New Revision: 5011

Log:
Import glibc-mainline for 2008-01-25

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/configure
    fsf/trunk/libc/configure.in

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Jan 25 00:06:13 2008
@@ -1,3 +1,8 @@
+2008-01-24  Roland McGrath  <roland@xxxxxxxxxx>
+
+	* configure.in: Let configure fragments set base_os.
+	* configure: Regenerated.
+
 2008-01-22  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* po/ko.po: Update from translation team.

Modified: fsf/trunk/libc/configure
==============================================================================
--- fsf/trunk/libc/configure (original)
+++ fsf/trunk/libc/configure Fri Jan 25 00:06:13 2008
@@ -2299,6 +2299,7 @@
 machine=$config_machine
 vendor=$config_vendor
 os=$config_os
+base_os=''
 
 # config.guess on some IBM machines says `rs6000' instead of `powerpc'.
 # Unify this here.
@@ -2554,7 +2555,7 @@
 # Make sco3.2v4 become sco3.2.4 and sunos4.1.1_U1 become sunos4.1.1.U1.
 os="`echo $os | sed 's/\([0-9A-Z]\)[v_]\([0-9A-Z]\)/\1.\2/g'`"
 
-case "$os" in
+test "x$base_os" != x || case "$os" in
 gnu*)
   base_os=mach/hurd ;;
 netbsd* | 386bsd* | freebsd* | bsdi*)
@@ -2573,8 +2574,6 @@
   base_os=unix/sysv/aix/aix4.3 ;;
 none)
   base_os=standalone ;;
-*)
-  base_os='' ;;
 esac
 
 # For sunos4.1.1, try sunos4.1.1, then sunos4.1, then sunos4, then sunos.

Modified: fsf/trunk/libc/configure.in
==============================================================================
--- fsf/trunk/libc/configure.in (original)
+++ fsf/trunk/libc/configure.in Fri Jan 25 00:06:13 2008
@@ -300,6 +300,7 @@
 machine=$config_machine
 vendor=$config_vendor
 os=$config_os
+base_os=''
 
 # config.guess on some IBM machines says `rs6000' instead of `powerpc'.
 # Unify this here.
@@ -535,7 +536,7 @@
 # Make sco3.2v4 become sco3.2.4 and sunos4.1.1_U1 become sunos4.1.1.U1.
 os="`echo $os | sed 's/\([0-9A-Z]\)[v_]\([0-9A-Z]\)/\1.\2/g'`"
 
-case "$os" in
+test "x$base_os" != x || case "$os" in
 gnu*)
   base_os=mach/hurd ;;
 netbsd* | 386bsd* | freebsd* | bsdi*)
@@ -554,8 +555,6 @@
   base_os=unix/sysv/aix/aix4.3 ;;
 none)
   base_os=standalone ;;
-*)
-  base_os='' ;;
 esac
 
 # For sunos4.1.1, try sunos4.1.1, then sunos4.1, then sunos4, then sunos.