From b22d21b3d390caa2a95b802f009e15a530bce7a2 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 24 Jan 2008 20:21:23 +0000 Subject: [PATCH] 2008-01-24 Roland McGrath * configure.in: Let configure fragments set base_os. * configure: Regenerated. --- configure | 5 ++--- configure.in | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 898c364a70..1f2cd4fc53 100755 --- a/configure +++ b/configure @@ -2299,6 +2299,7 @@ esac 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 @@ echo $ECHO_N "checking sysdep dirs... $ECHO_C" >&6; } # 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 @@ aix4.3*) 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. diff --git a/configure.in b/configure.in index c40bae2589..6ea1b26ff3 100644 --- a/configure.in +++ b/configure.in @@ -300,6 +300,7 @@ esac 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 @@ changequote(,)dnl # 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 @@ aix4.3*) 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. -- 2.11.4.GIT