mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-01-14 02:30:33 +05:00
Fix compilation problems on Mandriva64 and Mandriva
This commit is contained in:
parent
e29e100d4e
commit
c6ad6d4c6d
24
configure.ac
24
configure.ac
@ -115,6 +115,25 @@ 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
|
||||
|
||||
dnl AM_CONDITIONAL( USE_GFORTRAN, [test "$F77" = "gfortran"])
|
||||
|
||||
echo
|
||||
|
||||
dnl Library libdl :
|
||||
AC_CHECK_LIB(dl,dlopen)
|
||||
|
||||
@ -334,8 +353,7 @@ echo
|
||||
|
||||
CHECK_MED
|
||||
|
||||
|
||||
AM_CONDITIONAL( USE_GFORTRAN, [test "$F77" = "gfortran"])
|
||||
CHECK_PLATFORM
|
||||
|
||||
echo
|
||||
echo ---------------------------------------------
|
||||
@ -344,7 +362,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
|
||||
|
@ -37,14 +37,16 @@ dist_libMEFISTO2D_la_SOURCES = \
|
||||
# additionnal information to compil and link file
|
||||
libMEFISTO2D_la_CPPFLAGS = \
|
||||
$(CAS_CPPFLAGS) \
|
||||
$(KERNEL_CXXFLAGS)
|
||||
$(KERNEL_CXXFLAGS) \
|
||||
@PLATFORM_INCLUDES@
|
||||
|
||||
libMEFISTO2D_la_LDFLAGS = \
|
||||
$(KERNEL_LDFLAGS) -lSALOMELocalTrace
|
||||
$(KERNEL_LDFLAGS) -lSALOMELocalTrace \
|
||||
$(FCLIBS)
|
||||
|
||||
if USE_GFORTRAN
|
||||
libMEFISTO2D_la_LDFLAGS += -lgfortran
|
||||
else !USE_GFORTRAN
|
||||
libMEFISTO2D_la_LDFLAGS += -lg2c
|
||||
endif
|
||||
#if USE_GFORTRAN
|
||||
#libMEFISTO2D_la_LDFLAGS += -lgfortran
|
||||
#else !USE_GFORTRAN
|
||||
#libMEFISTO2D_la_LDFLAGS += -lg2c
|
||||
#endif
|
||||
|
||||
|
@ -115,7 +115,8 @@ libStdMeshers_la_CPPFLAGS = \
|
||||
-I$(srcdir)/../SMESH \
|
||||
-I$(srcdir)/../SMESHDS \
|
||||
-I$(srcdir)/../SMDS \
|
||||
-I$(srcdir)/../Controls
|
||||
-I$(srcdir)/../Controls \
|
||||
@PLATFORM_INCLUDES@
|
||||
|
||||
libStdMeshers_la_LDFLAGS = \
|
||||
../SMESH/libSMESHimpl.la \
|
||||
|
Loading…
Reference in New Issue
Block a user