Introducing check procedure for Fortran; correct compilation/linkage rules for Fortran source files.

This commit is contained in:
vsr 2007-01-22 13:08:41 +00:00
parent e174e4abb2
commit 384738cce0
4 changed files with 30 additions and 8 deletions

View File

@ -39,6 +39,15 @@ CXX = @CXX@
CXXFLAGS = @CXXFLAGS@
CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
# FORTRAN
F77 = @F77@
FC = @FC@
FFLAGS = @FFLAGS@
FCFLAGS = @FCFLAGS@
FLIBS = @FLIBS@
FCLIBS = @FCLIBS@
# BOOST Library
BOOST_CPPFLAGS = @BOOST_CPPFLAGS@

View File

@ -308,10 +308,10 @@ distclean: clean
$(LT_COMPILE) $(CFLAGS) $(CPPFLAGS) -c $<
.f.o:
$(FC) $(FFLAGS) -c $< -o $@
$(FC) $(FCFLAGS) -c $< -o $@
.f.lo:
$(LT) --mode=compile $(FC) $(FFLAGS) -c $<
$(LT) --mode=compile $(FC) $(FCFLAGS) -c $<
.ui.h:
$(UIC) -o $@ $<

View File

@ -106,6 +106,23 @@ AC_DEPEND_FLAG
# AC_CC_WARNINGS([ansi])
cc_ok=yes
echo
echo ---------------------------------------------
echo testing Fortran
echo ---------------------------------------------
echo
fortran_ok=no
AC_PROG_F77
AC_F77_LIBRARY_LDFLAGS
AC_PROG_FC
AC_FC_LIBRARY_LDFLAGS
if test "X$FC" != "X" ; then
fortran_ok=yes
fi
echo
dnl Library libdl :
AC_CHECK_LIB(dl,dlopen)
@ -324,7 +341,7 @@ echo ---------------------------------------------
echo
echo Configure
variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok qwt_ok Kernel_ok Geom_ok Med_ok"
variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok qwt_ok Kernel_ok Geom_ok Med_ok"
for var in $variables
do

View File

@ -45,11 +45,7 @@ LIB_SERVER_IDL =
CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
ifeq ($(F77),gfortran)
LDFLAGS += -lgfortran
else
LDFLAGS += -lg2c
endif
LDFLAGS += $(FCLIBS)
@CONCLUDE@