Introducing check procedure for Fortran; correct compilation/linkage rules for Fortran source files.
This commit is contained in:
parent
29bdee2b25
commit
59ab1d8e2b
@ -36,6 +36,15 @@ CXX = @CXX@
|
|||||||
CXXFLAGS = @CXXFLAGS@
|
CXXFLAGS = @CXXFLAGS@
|
||||||
CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
|
CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
|
||||||
|
|
||||||
|
# FORTRAN
|
||||||
|
|
||||||
|
F77 = @F77@
|
||||||
|
FC = @FC@
|
||||||
|
FFLAGS = @FFLAGS@
|
||||||
|
FCFLAGS = @FCFLAGS@
|
||||||
|
FLIBS = @FLIBS@
|
||||||
|
FCLIBS = @FCLIBS@
|
||||||
|
|
||||||
# BOOST Library
|
# BOOST Library
|
||||||
|
|
||||||
BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
|
BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
|
||||||
|
@ -106,6 +106,23 @@ AC_DEPEND_FLAG
|
|||||||
# AC_CC_WARNINGS([ansi])
|
# AC_CC_WARNINGS([ansi])
|
||||||
cc_ok=yes
|
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 :
|
dnl Library libdl :
|
||||||
AC_CHECK_LIB(dl,dlopen)
|
AC_CHECK_LIB(dl,dlopen)
|
||||||
|
|
||||||
@ -330,7 +347,7 @@ echo ---------------------------------------------
|
|||||||
echo
|
echo
|
||||||
|
|
||||||
echo Configure
|
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 Kernel_ok Geom_ok SMesh_ok Netgen_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 Kernel_ok Geom_ok SMesh_ok Netgen_ok"
|
||||||
|
|
||||||
for var in $variables
|
for var in $variables
|
||||||
do
|
do
|
||||||
|
@ -77,12 +77,6 @@ LIB_OBJ_LO = $(LIB_OBJ_O:%.o=%.lo)
|
|||||||
$(LIB): $(LIB_OBJ_O) $(LIB_OBJ_LO)
|
$(LIB): $(LIB_OBJ_O) $(LIB_OBJ_LO)
|
||||||
LIB_OBJ = $(LIB_OBJ_LO)
|
LIB_OBJ = $(LIB_OBJ_LO)
|
||||||
|
|
||||||
ifeq ($(F77),gfortran)
|
LDFLAGS += $(OCC_LDPATH) $(FCLIBS) -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES
|
||||||
LDFLAGS += -lgfortran
|
|
||||||
else
|
|
||||||
LDFLAGS += -lg2c
|
|
||||||
endif
|
|
||||||
|
|
||||||
LDFLAGS += $(OCC_LDPATH) -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES
|
|
||||||
|
|
||||||
MOSTLYCLEAN += $(LIB_OBJ_O)
|
MOSTLYCLEAN += $(LIB_OBJ_O)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user