Fix compilation problems on Mandriva64 and Mandriva

diff --git a/configure.ac b/configure.ac
index ab62f2c5c68f79bcfdcdc0a154e9dcd5db58518b..b4585ccc731cae29107e9678c77b540590d8038e 100644 (file)
--- a/configure.ac
+++ b/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

diff --git a/src/MEFISTO2/Makefile.am b/src/MEFISTO2/Makefile.am
index 23aecb0dd6711eff1501d052336ea09ebe8f2572..90cf0b98a0a5ae34053b2d01db1d6fb4161d4bc4 100644 (file)
--- a/src/MEFISTO2/Makefile.am
+++ b/src/MEFISTO2/Makefile.am
@@ -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
 

diff --git a/src/StdMeshers/Makefile.am b/src/StdMeshers/Makefile.am
index 750e7d100946f5be50a2a002e0dcb955479fa5eb..42cb6e927e20ab63086b9426511d7aa3b79dfba0 100644 (file)
--- a/src/StdMeshers/Makefile.am
+++ b/src/StdMeshers/Makefile.am
@@ -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 \