| @@ -555,43 +555,6 @@ EXPORT_MACOSX_DEPLOYMENT_TARGET='#' |
|
|
| 555 |
555 |
# when running configure or make. The build should not break if they do. |
| 556 |
556 |
# BASECFLAGS should generally not be messed with, however. |
| 557 |
557 |
|
| 558 |
|
-# XXX shouldn't some/most/all of this code be merged with the stuff later |
| 559 |
|
-# on that fiddles with OPT and BASECFLAGS? |
| 560 |
|
-AC_MSG_CHECKING(for --without-gcc) |
| 561 |
|
-AC_ARG_WITH(gcc, |
| 562 |
|
-AS_HELP_STRING([--without-gcc], [never use gcc]), |
| 563 |
|
-[ |
| 564 |
|
- case $withval in |
| 565 |
|
- no) CC=${CC:-cc} |
| 566 |
|
- without_gcc=yes;; |
| 567 |
|
- yes) CC=gcc |
| 568 |
|
- without_gcc=no;; |
| 569 |
|
- *) CC=$withval |
| 570 |
|
- without_gcc=$withval;; |
| 571 |
|
- esac], [ |
| 572 |
|
- case $ac_sys_system in |
| 573 |
|
- AIX*) CC=${CC:-xlc_r} |
| 574 |
|
- without_gcc=;; |
| 575 |
|
- *) without_gcc=no;; |
| 576 |
|
- esac]) |
| 577 |
|
-AC_MSG_RESULT($without_gcc) |
| 578 |
|
- |
| 579 |
|
-AC_MSG_CHECKING(for --with-icc) |
| 580 |
|
-AC_ARG_WITH(icc, |
| 581 |
|
-AS_HELP_STRING([--with-icc], [build with icc]), |
| 582 |
|
-[ |
| 583 |
|
- case $withval in |
| 584 |
|
- no) CC=${CC:-cc} |
| 585 |
|
- with_icc=no;; |
| 586 |
|
- yes) CC=icc |
| 587 |
|
- CXX=icpc |
| 588 |
|
- with_icc=yes;; |
| 589 |
|
- *) CC=$withval |
| 590 |
|
- with_icc=$withval;; |
| 591 |
|
- esac], [ |
| 592 |
|
- with_icc=no]) |
| 593 |
|
-AC_MSG_RESULT($with_icc) |
| 594 |
|
- |
| 595 |
558 |
# If the user switches compilers, we can't believe the cache |
| 596 |
559 |
if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC" |
| 597 |
560 |
then |
| @@ -1749,7 +1712,6 @@ yes) |
|
|
| 1749 |
1712 |
BASECFLAGS="$BASECFLAGS -m486 -DSCO5" |
| 1750 |
1713 |
;; |
| 1751 |
1714 |
|
| 1752 |
|
-# is there any other compiler on Darwin besides gcc? |
| 1753 |
1715 |
Darwin*) |
| 1754 |
1716 |
# -Wno-long-double, -no-cpp-precomp, and -mno-fused-madd |
| 1755 |
1717 |
# used to be here, but non-Apple gcc doesn't accept them. |