Commit 7c1aa8d7 authored by vijaysm's avatar vijaysm
Browse files

1) Disabling fortran configuration works now. But this requires commenting out...

1) Disabling fortran configuration works now. But this requires commenting out AC_F77_WRAPPERS and AC_FC_WRAPPERS which might cause issues when enabling fortran.
2) Fix an error in make check when fortran is disabled
parent 7da96fee
......@@ -134,12 +134,12 @@ fi
AC_PROG_CXXCPP
# Fortran support
#if (test "x$CHECK_FC" != "xno"); then
if (test "x$CHECK_FC" != "xno"); then
FATHOM_SET_MPI_COMPILER([FC], [$FC_LIST],[$COMPILERPATHS])
FATHOM_SET_MPI_COMPILER([F77],[$F77_LIST],[$COMPILERPATHS])
AC_PROG_FC
AC_PROG_F77
#fi
fi
]) # FATHOM_CHECK_COMPILERS
......@@ -178,6 +178,8 @@ CFLAGS="$USER_CFLAGS $FATHOM_CC_SPECIAL"
CXXFLAGS="$USER_CXXFLAGS $FATHOM_CXX_SPECIAL"
FFLAGS="$USER_FFLAGS $FATHOM_F77_SPECIAL"
FCFLAGS="$USER_FCFLAGS $FATHOM_FC_SPECIAL"
FLIBS=""
FCLIBS=""
# On IBM/AIX, the check for OBJEXT fails for the mpcc compiler.
# (Comment out this hack, it should be fixed correctly now)
......@@ -210,7 +212,7 @@ if test "xyes" = "x$enable_debug"; then
DEBUG=yes
CXXFLAGS="$CXXFLAGS -g"
CFLAGS="$CFLAGS -g"
if (test "x$ENABLE_FORTRAN" != "xno"); then
if (test "x$CHECK_FC" != "xno"); then
FCFLAGS="$FCFLAGS -g"
FFLAGS="$FFLAGS -g"
fi
......@@ -292,10 +294,10 @@ DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --enable-32bit=$enable_32b
# Check if we are using new Darwin kernels with Clang -- needs libc++ instead of libstdc++
if (test "x$ENABLE_FORTRAN" != "xno" && test "x$CHECK_FC" != "xno"); then
AC_F77_WRAPPERS
#AC_F77_LIBRARY_LDFLAGS
AC_FC_WRAPPERS
#AC_FC_LIBRARY_LDFLAGS
#AC_F77_WRAPPERS
##AC_F77_LIBRARY_LDFLAGS
#AC_FC_WRAPPERS
##AC_FC_LIBRARY_LDFLAGS
# check how to link against C++ runtime for fortran programs correctly
AC_LANG_PUSH([Fortran])
......@@ -331,6 +333,9 @@ if (test "x$ENABLE_FORTRAN" != "xno" && test "x$CHECK_FC" != "xno"); then
fi
AC_SUBST(FLIBS)
AC_SUBST(FCLIBS)
]) # FATHOM_COMPILER_FLAGS
#######################################################################################
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment