kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* configure.in: use GCC, not without_gcc. remove without_gcc.

Browse source 
* 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:
eban 2001-12-02 14:10:27 +00:00
parent bec6d909e7
commit dd17e103f4
4 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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> Fri Nov 30 17:02:55 2001 WATANABE Hirofumi <eban@ruby-lang.org>
* configure.in: set target_cpu to i386 on cygwin and mingw32. * configure.in: set target_cpu to i386 on cygwin and mingw32.

18
configure.in
View file

@ -12,14 +12,12 @@ dnl checks for alternative programs
AC_ARG_WITH(gcc, [--without-gcc never use gcc], [ AC_ARG_WITH(gcc, [--without-gcc never use gcc], [
case $withval in case $withval in
no) : ${CC=cc} no) : ${CC=cc}
without_gcc=yes;; ;;
yes) : ${CC=gcc} yes) : ${CC=gcc}
without_gcc=no;; ;;
*) CC=$withval *) CC=$withval
without_gcc=$withval;; ;;
esac], [ esac])
: ${CC=gcc}
without_gcc=no])
dnl If the user switches compilers, we can't believe the cache 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" if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
then then
@ -259,10 +257,10 @@ linux*) LIBS="-lm $LIBS"
CFLAGS="-mieee $CFLAGS" ;; CFLAGS="-mieee $CFLAGS" ;;
esac ;; esac ;;
osf*) LIBS="-lm $LIBS" osf*) LIBS="-lm $LIBS"
case "$target_cpu"::"$without_gcc" in case "$target_cpu"::"$GCC" in
alpha*::no)
CFLAGS="-mieee $CFLAGS" ;;
alpha*::yes) alpha*::yes)
CFLAGS="-mieee $CFLAGS" ;;
alpha*::no|alpha*::)
CFLAGS="-ieee $CFLAGS" ;; CFLAGS="-ieee $CFLAGS" ;;
esac ;; esac ;;
*) LIBS="-lm $LIBS";; *) LIBS="-lm $LIBS";;
@ -951,7 +949,7 @@ case "$target_os" in
CFLAGS="$CFLAGS -DOS2" CFLAGS="$CFLAGS -DOS2"
;; ;;
osf*) osf*)
if test "$without_gcc" = "yes" ; then if test "$GCC" != "yes" ; then
# compile something small: taint.c is fine for this. # compile something small: taint.c is fine for this.
# the main point is the '-v' flag of 'cc'. # the main point is the '-v' flag of 'cc'.
case "`cc -v -I. -c main.c -o /tmp/main.o 2>&1`" in case "`cc -v -I. -c main.c -o /tmp/main.o 2>&1`" in

2
ext/curses/extconf.rb
View file

@ -14,7 +14,7 @@ elsif have_header("curses_colr/curses.h") and have_library("cur_colr", "initscr"
make=true make=true
else else
have_library("termcap", "tgetent") have_library("termcap", "tgetent")
if have_library("curses", "initscr") if have_header("curses") and have_library("curses", "initscr")
make=true make=true
end end
end end

2
ext/dbm/extconf.rb
View file

@ -50,7 +50,7 @@ end
have_header("cdefs.h") have_header("cdefs.h")
have_header("sys/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 have_func(db_prefix("dbm_clearerr")) unless $dbm_conf_have_gdbm
create_makefile("dbm") create_makefile("dbm")
end end