From 30c61d0f254d8201e9f84ee45f15fb83ee5f4495 Mon Sep 17 00:00:00 2001 From: James Laird Date: Thu, 1 Sep 2005 15:38:18 -0500 Subject: [svn-r11335] Purpose: Bug fix Description: configure used 'uname -o' to detect Cygwin. This command is fine on Cygwin, but causes errors on some other platforms (sol). Fixed this. Solution: Used 'uname' with no -o option to identify Cygwin. Platforms tested: mir, cygwin (on finrod) --- configure | 10 +++++++--- configure.in | 14 +++++++++----- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/configure b/configure index f22654e..eb70eed 100755 --- a/configure +++ b/configure @@ -23213,7 +23213,8 @@ fi done -if test "`uname -o`" = "Cygwin"; then +case "`uname`" in + CYGWIN*) for ac_header in io.h sys/timeb.h @@ -23365,7 +23366,8 @@ fi done -else + ;; + *) @@ -23518,7 +23520,9 @@ fi done -fi + ;; +esac + case "$host" in alpha*-dec*-osf*) diff --git a/configure.in b/configure.in index a4e659e..3b705b1 100644 --- a/configure.in +++ b/configure.in @@ -761,11 +761,15 @@ AC_CHECK_HEADERS([stddef.h setjmp.h features.h]) AC_CHECK_HEADERS([stdint.h], [C9x=yes]) dnl Windows -if test "`uname -o`" = "Cygwin"; then - AC_CHECK_HEADERS([io.h sys/timeb.h]) -else - AC_CHECK_HEADERS([io.h winsock.h sys/timeb.h]) -fi +case "`uname`" in + CYGWIN*) + AC_CHECK_HEADERS([io.h sys/timeb.h]) + ;; + *) + AC_CHECK_HEADERS([io.h winsock.h sys/timeb.h]) + ;; +esac + case "$host" in alpha*-dec*-osf*) dnl The and are needed on the DEC -- cgit v0.12