From 493f933497f34c3329c649b9c9a6b265801a618d Mon Sep 17 00:00:00 2001 From: abd Date: Fri, 20 Apr 2007 14:53:04 +0000 Subject: [PATCH] Fix compilation problems on Mandriva( right fortran flags ) --- configure.ac | 17 ++++++++++++++++- src/NETGEN/Makefile.am | 8 +------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index cfef4a1..0059e1f 100644 --- a/configure.ac +++ b/configure.ac @@ -110,6 +110,21 @@ 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 Library libdl : AC_CHECK_LIB(dl,dlopen) @@ -335,7 +350,7 @@ echo Summary echo --------------------------------------------- echo -AM_CONDITIONAL( USE_GFORTRAN, [test "$F77" = "gfortran"]) +#AM_CONDITIONAL( USE_GFORTRAN, [test "$F77" = "gfortran"]) 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" diff --git a/src/NETGEN/Makefile.am b/src/NETGEN/Makefile.am index 97f0c82..19d4632 100644 --- a/src/NETGEN/Makefile.am +++ b/src/NETGEN/Makefile.am @@ -72,12 +72,6 @@ nodist_libNETGEN_la_SOURCES = libNETGEN_la_LDFLAGS = $(LIB_OBJ_O) \ - $(CAS_LDPATH) -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES - -if USE_GFORTRAN -libNETGEN_la_LDFLAGS += -lgfortran -else !USE_GFORTRAN -libNETGEN_la_LDFLAGS += -lg2c -endif + $(CAS_LDPATH) -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES $(FCLIBS) libNETGEN_la_DEPENDENCIES = $(LIB_OBJ_O) -- 2.39.2