mirror of https://github.com/BOINC/boinc.git
Fix bug in recent automake distro that causes C programs to be compiled with a
fortran compiler if F77 isn't found before libtool is initialized. svn path=/trunk/boinc/; revision=16991
This commit is contained in:
parent
6eceff3114
commit
3570240b53
|
@ -36,9 +36,11 @@ fi
|
|||
dnl Checks for programs.
|
||||
AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
AC_PROG_F77
|
||||
AC_PROG_CPP
|
||||
AC_PROG_MAKE_SET
|
||||
SAH_LINKS
|
||||
AC_LANG_PUSH(C)
|
||||
AM_PROG_CC_C_O
|
||||
|
||||
m4_divert_once([HELP_ENABLE],
|
||||
|
@ -146,7 +148,6 @@ AC_ARG_ENABLE(pkg-manager,
|
|||
],
|
||||
[])
|
||||
|
||||
|
||||
BOINC_SET_COMPILE_FLAGS
|
||||
|
||||
configured_to_build=
|
||||
|
|
|
@ -20,7 +20,7 @@ AC_DEFUN([BOINC_CHECK_CFLAG],[
|
|||
$3
|
||||
]
|
||||
)
|
||||
AC_LANG_POP
|
||||
AC_LANG_POP(C)
|
||||
])
|
||||
|
||||
AC_DEFUN([BOINC_CHECK_CXXFLAG],[
|
||||
|
@ -44,7 +44,7 @@ AC_DEFUN([BOINC_CHECK_CXXFLAG],[
|
|||
$3
|
||||
]
|
||||
)
|
||||
AC_LANG_POP
|
||||
AC_LANG_POP(C++)
|
||||
])
|
||||
|
||||
AC_DEFUN([BOINC_CHECK_FFLAG],[
|
||||
|
@ -65,7 +65,7 @@ AC_DEFUN([BOINC_CHECK_FFLAG],[
|
|||
$3
|
||||
]
|
||||
)
|
||||
AC_LANG_POP
|
||||
AC_LANG_POP(Fortran 77)
|
||||
])
|
||||
|
||||
|
||||
|
@ -90,5 +90,5 @@ AC_DEFUN([BOINC_CHECK_LDFLAG],[
|
|||
$3
|
||||
]
|
||||
)
|
||||
AC_LANG_POP
|
||||
AC_LANG_POP(C)
|
||||
])
|
||||
|
|
|
@ -34,13 +34,13 @@ fi
|
|||
|
||||
if test x${enable_optimize} = xyes ; then
|
||||
BOINC_CHECK_CFLAG(-fast)
|
||||
BOINC_CHECK_CXXFLAG(-fast)
|
||||
BOINC_CHECK_FFLAG(-fast)
|
||||
BOINC_CHECK_CFLAG(-O3)
|
||||
BOINC_CHECK_CXXFLAG(-O3)
|
||||
BOINC_CHECK_FFLAG(-O3)
|
||||
BOINC_CHECK_CFLAG(-ffast-math)
|
||||
BOINC_CHECK_CXXFLAG(-fast)
|
||||
BOINC_CHECK_CXXFLAG(-O3)
|
||||
BOINC_CHECK_CXXFLAG(-ffast-math)
|
||||
BOINC_CHECK_FFLAG(-fast)
|
||||
BOINC_CHECK_FFLAG(-O3)
|
||||
BOINC_CHECK_FFLAG(-ffast-math)
|
||||
fi
|
||||
|
||||
|
@ -48,10 +48,10 @@ if test x${enable_generic_processor} = xyes ; then
|
|||
case ${target} in
|
||||
i*86-*-darwin*)
|
||||
BOINC_CHECK_CFLAG(-march=pentium4)
|
||||
BOINC_CHECK_CXXFLAG(-march=pentium4)
|
||||
BOINC_CHECK_FFLAG(-march=pentium4)
|
||||
BOINC_CHECK_CFLAG(-mtune=prescott)
|
||||
BOINC_CHECK_CXXFLAG(-march=pentium4)
|
||||
BOINC_CHECK_CXXFLAG(-mtune=prescott)
|
||||
BOINC_CHECK_FFLAG(-march=pentium4)
|
||||
BOINC_CHECK_FFLAG(-mtune=prescott)
|
||||
;;
|
||||
i*86-*)
|
||||
|
@ -79,13 +79,13 @@ if test x${enable_generic_processor} = xyes ; then
|
|||
x86_64-*)
|
||||
dnl gcc
|
||||
BOINC_CHECK_CFLAG(-msse2)
|
||||
BOINC_CHECK_CXXFLAG(-msse2)
|
||||
BOINC_CHECK_FFLAG(-msse2)
|
||||
BOINC_CHECK_CFLAG(-march=opteron)
|
||||
BOINC_CHECK_CXXFLAG(-march=opteron)
|
||||
BOINC_CHECK_FFLAG(-march=opteron)
|
||||
BOINC_CHECK_CFLAG(-mtune=generic)
|
||||
BOINC_CHECK_CXXFLAG(-msse2)
|
||||
BOINC_CHECK_CXXFLAG(-march=opteron)
|
||||
BOINC_CHECK_CXXFLAG(-mtune=generic)
|
||||
BOINC_CHECK_FFLAG(-msse2)
|
||||
BOINC_CHECK_FFLAG(-march=opteron)
|
||||
BOINC_CHECK_FFLAG(-mtune=generic)
|
||||
;;
|
||||
sparc-*)
|
||||
|
|
Loading…
Reference in New Issue