mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* configure.in: use GCC, not without_gcc. remove without_gcc.
* ext/curses/extconf.rb: check for curses.h. * ext/dbm/extconf.rb: check if $CFLAGS includes DBM_HDR. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1873 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
bec6d909e7
commit
dd17e103f4
4 changed files with 18 additions and 12 deletions
|
@ -1,3 +1,11 @@
|
|||
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.
|
||||
|
||||
* ext/dbm/extconf.rb: check if $CFLAGS includes DBM_HDR.
|
||||
|
||||
Fri Nov 30 17:02:55 2001 WATANABE Hirofumi <eban@ruby-lang.org>
|
||||
|
||||
* configure.in: set target_cpu to i386 on cygwin and mingw32.
|
||||
|
|
18
configure.in
18
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
|
||||
|
@ -259,10 +257,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";;
|
||||
|
@ -951,7 +949,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
|
||||
|
|
|
@ -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") and have_library("curses", "initscr")
|
||||
make=true
|
||||
end
|
||||
end
|
||||
|
|
|
@ -50,7 +50,7 @@ end
|
|||
|
||||
have_header("cdefs.h")
|
||||
have_header("sys/cdefs.h")
|
||||
if have_func(db_prefix("dbm_open"))
|
||||
if /DBM_HDR/ =~ $CFLAGS and have_func(db_prefix("dbm_open"))
|
||||
have_func(db_prefix("dbm_clearerr")) unless $dbm_conf_have_gdbm
|
||||
create_makefile("dbm")
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue