From 14e831dd21a7b50e385bdceaa1a3b70012f3d790 Mon Sep 17 00:00:00 2001
From: eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 2 Dec 2001 14:09:44 +0000
Subject: [PATCH] * configure.in: use GCC, not without_gcc. remove without_gcc.
 * ext/curses/extconf.rb: check for curses.h.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog             |  6 ++++++
 configure.in          | 18 ++++++++----------
 ext/curses/extconf.rb |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6dd796ae97..e76c97599a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Dec  2 22:01:52 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: use GCC, not without_gcc. remove without_gcc.
+
+	* ext/curses/extconf.rb: check for curses.h.
+
 Fri Nov 30 00:30:00 2001  Usaku Nakamura  <usa@ruby-lang.org>
 
 	* README.EXT: Appendix B is duplicated.
diff --git a/configure.in b/configure.in
index 4dc1a979df..c3cf25d7bb 100644
--- a/configure.in
+++ b/configure.in
@@ -12,14 +12,12 @@ dnl checks for alternative programs
 AC_ARG_WITH(gcc, [--without-gcc             never use gcc], [
 	case $withval in
 	no)	: ${CC=cc}
-		without_gcc=yes;;
+		;;
 	yes)	: ${CC=gcc}
-		without_gcc=no;;
+		;;
 	*)	CC=$withval
-		without_gcc=$withval;;
-	esac], [
-	  : ${CC=gcc}
-	  without_gcc=no])
+		;;
+	esac])
 dnl If the user switches compilers, we can't believe the cache
 if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
 then
@@ -242,10 +240,10 @@ linux*)		LIBS="-lm $LIBS"
 		    CFLAGS="-mieee $CFLAGS" ;;
 		esac ;;
 osf*)		LIBS="-lm $LIBS"
-		case "$target_cpu"::"$without_gcc" in
-		alpha*::no)
-		    CFLAGS="-mieee $CFLAGS" ;;
+		case "$target_cpu"::"$GCC" in
 		alpha*::yes)
+		    CFLAGS="-mieee $CFLAGS" ;;
+		alpha*::no|alpha*::)
 		    CFLAGS="-ieee $CFLAGS" ;;
 		esac ;;
 *) LIBS="-lm $LIBS";;
@@ -892,7 +890,7 @@ case "$target_os" in
     	CFLAGS="$CFLAGS -DOS2"
 	;;
     osf*)
-	if test "$without_gcc" = "yes" ; then
+	if test "$GCC" != "yes" ; then
 	  # compile something small: taint.c is fine for this.
 	  # the main point is the '-v' flag of 'cc'.
 	  case "`cc -v -I. -c main.c -o /tmp/main.o 2>&1`" in
diff --git a/ext/curses/extconf.rb b/ext/curses/extconf.rb
index c16ab00f28..67e455070c 100644
--- a/ext/curses/extconf.rb
+++ b/ext/curses/extconf.rb
@@ -14,7 +14,7 @@ elsif have_header("curses_colr/curses.h") and have_library("cur_colr", "initscr"
   make=true
 else
   have_library("termcap", "tgetent") 
-  if have_library("curses", "initscr")
+  if have_header("curses.h") and have_library("curses", "initscr")
     make=true
   end
 end