Mercurial > octave-nkf

comparison configure.in @ 6102:ef9569e10d8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-10-26 20:50:04 by jwe]
author jwe
date Thu, 26 Oct 2006 20:50:04 +0000
parents 8137e2bbd1dd
children a2fdc87184cf
comparison
equal deleted inserted replaced
6101:9e70afeb2ebf 6102:ef9569e10d8b
27 27
28 EXTERN_CFLAGS="$CFLAGS" 28 EXTERN_CFLAGS="$CFLAGS"
29 EXTERN_CXXFLAGS="$CXXFLAGS" 29 EXTERN_CXXFLAGS="$CXXFLAGS"
30 30
31 AC_INIT 31 AC_INIT
32 AC_REVISION($Revision: 1.536 $) 32 AC_REVISION($Revision: 1.537 $)
33 AC_PREREQ(2.57) 33 AC_PREREQ(2.57)
34 AC_CONFIG_SRCDIR([src/octave.cc]) 34 AC_CONFIG_SRCDIR([src/octave.cc])
35 AC_CONFIG_HEADER(config.h) 35 AC_CONFIG_HEADER(config.h)
36 36
37 OCTAVE_HOST_TYPE 37 OCTAVE_HOST_TYPE
290 ### 290 ###
291 ### On Alpha/OSF systems, we need -mieee. 291 ### On Alpha/OSF systems, we need -mieee.
292 292
293 ieee_fp_flag= 293 ieee_fp_flag=
294 case "$canonical_host_type" in 294 case "$canonical_host_type" in
295 ## Keep this pattern first, so that it is preferred over the
296 ## following pattern for x86.
297 *-*-msdosmsvc)
298 CXXFLAGS="$CXXFLAGS -EHs -MD"
299 CFLAGS="$CFLAGS -MD"
300 ;;
295 i[[3456789]]86-*-*) 301 i[[3456789]]86-*-*)
296 if test "$GCC" = yes; then 302 if test "$GCC" = yes; then
297 OCTAVE_CC_FLAG(-mieee-fp, [ 303 OCTAVE_CC_FLAG(-mieee-fp, [
298 ieee_fp_flag=-mieee-fp 304 ieee_fp_flag=-mieee-fp
299 XTRA_CFLAGS="$XTRA_CFLAGS -mieee-fp" 305 XTRA_CFLAGS="$XTRA_CFLAGS -mieee-fp"
344 OCTAVE_CC_FLAG(-mminimal-toc, [ 350 OCTAVE_CC_FLAG(-mminimal-toc, [
345 XTRA_CFLAGS="$XTRA_CFLAGS -mminimal-toc"]) 351 XTRA_CFLAGS="$XTRA_CFLAGS -mminimal-toc"])
346 352
347 OCTAVE_CXX_FLAG(-mminimal-toc, [ 353 OCTAVE_CXX_FLAG(-mminimal-toc, [
348 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mminimal-toc"]) 354 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mminimal-toc"])
349 ;;
350 *-*-msdosmsvc)
351 CXXFLAGS="$CXXFLAGS -EHs -MD"
352 CFLAGS="$CFLAGS -MD"
353 ;; 355 ;;
354 esac 356 esac
355 357
356 AC_SUBST(XTRA_CFLAGS) 358 AC_SUBST(XTRA_CFLAGS)
357 AC_SUBST(XTRA_CXXFLAGS) 359 AC_SUBST(XTRA_CXXFLAGS)
636 AC_PROG_F77 638 AC_PROG_F77
637 639
638 have_fortran_compiler=false 640 have_fortran_compiler=false
639 have_f2c=false 641 have_f2c=false
640 642
643 F77_TOLOWER=true
644 F77_APPEND_UNDERSCORE=true
645 F77_APPEND_EXTRA_UNDERSCORE=true
641 if $use_f2c; then 646 if $use_f2c; then
642 have_f2c=true 647 have_f2c=true
643 else 648 else
644 if test -n "$F77"; then 649 if test -n "$F77"; then
645 AC_F77_LIBRARY_LDFLAGS 650 AC_F77_LIBRARY_LDFLAGS
646 AC_F77_DUMMY_MAIN 651 AC_F77_DUMMY_MAIN
647 AC_F77_WRAPPERS 652 AC_F77_WRAPPERS
653 case "$ac_cv_f77_mangling" in
654 "upper case") F77_TOLOWER=false ;;
655 esac
656 case "$ac_cv_f77_mangling" in
657 "no underscore") F77_APPEND_UNDERSCORE=false ;;
658 esac
659 case "$ac_cv_f77_mangling" in
660 "no extra underscore") F77_APPEND_EXTRA_UNDERSCORE=false ;;
661 esac
662
648 case "$canonical_host_type" in 663 case "$canonical_host_type" in
649 i[[3456789]]86-*-*) 664 i[[3456789]]86-*-*)
650 if test "$ac_cv_f77_compiler_gnu" = yes; then 665 if test "$ac_cv_f77_compiler_gnu" = yes; then
651 OCTAVE_F77_FLAG(-mieee-fp) 666 OCTAVE_F77_FLAG(-mieee-fp)
652 ### OCTAVE_F77_FLAG(-ffloat-store) 667 ### OCTAVE_F77_FLAG(-ffloat-store)
675 if test -n "$F2C"; then 690 if test -n "$F2C"; then
676 have_f2c=true 691 have_f2c=true
677 fi 692 fi
678 fi 693 fi
679 fi 694 fi
695 AC_SUBST(F77_TOLOWER)
696 AC_SUBST(F77_APPEND_UNDERSCORE)
697 AC_SUBST(F77_APPEND_EXTRA_UNDERSCORE)
680 698
681 f77_rules_frag=/dev/null 699 f77_rules_frag=/dev/null
682 if $have_fortran_compiler; then 700 if $have_fortran_compiler; then
683 f77_rules_frag=Makefrag.f77 701 f77_rules_frag=Makefrag.f77
684 cat << \EOF > $f77_rules_frag 702 cat << \EOF > $f77_rules_frag
740 else 758 else
741 AC_MSG_WARN([in order to build octave, you must have a compatible]) 759 AC_MSG_WARN([in order to build octave, you must have a compatible])
742 AC_MSG_WARN([Fortran compiler or f2c installed and in your path.]) 760 AC_MSG_WARN([Fortran compiler or f2c installed and in your path.])
743 AC_MSG_ERROR([See the file INSTALL for more information.]) 761 AC_MSG_ERROR([See the file INSTALL for more information.])
744 fi 762 fi
763
764 XTRA_CRUFT_LINK_DEPS=
765 case "$canonical_host_type" in
766 *-*-msdosmsvc)
767 FLIBS="$FLIBS -lkernel32"
768 XTRA_CRUFT_LINK_DEPS="-Wl,-def:cruft.def"
769 ;;
770 esac
771 AC_SUBST(XTRA_CRUFT_LINK_DEPS)
745 772
746 FC=$F77 773 FC=$F77
747 AC_SUBST(FC) 774 AC_SUBST(FC)
748 AC_SUBST_FILE(f77_rules_frag) 775 AC_SUBST_FILE(f77_rules_frag)
749 776