[cig-commits] [commit] devel: updates configure scripts to match also SPECFEM3D_Cartesian ones (db3335b)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Dec 8 08:42:39 PST 2014
Repository : https://github.com/geodynamics/specfem3d_globe
On branch : devel
Link : https://github.com/geodynamics/specfem3d_globe/compare/2cc93c33966a370878432590563633b66f4a1f90...00ae7db05e62851315db5db27dab495a7ec137d3
>---------------------------------------------------------------
commit db3335b26895e6175631d7489fa561d09205e6de
Author: daniel peter <peterda at ethz.ch>
Date: Thu Dec 4 16:32:31 2014 +0100
updates configure scripts to match also SPECFEM3D_Cartesian ones
>---------------------------------------------------------------
db3335b26895e6175631d7489fa561d09205e6de
configure | 7 +++++++
configure.ac | 6 ++++++
2 files changed, 13 insertions(+)
diff --git a/configure b/configure
index 3528cd8..ab52ee8 100755
--- a/configure
+++ b/configure
@@ -674,6 +674,7 @@ CPPFLAGS
CFLAGS
CC
FCLIBS
+srcdir
FCENV
OBJEXT
EXEEXT
@@ -3319,6 +3320,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
export FC
export MPIFC
+F77="$FC"
+FFLAGS="$FCFLAGS"
+
+
+
flags_guess="$SHELL $srcdir/flags.guess"
@@ -4699,6 +4705,7 @@ ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_fc_compiler_gnu
+
ac_ext=${ac_fc_srcext-f}
ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
diff --git a/configure.ac b/configure.ac
index 0c5c95d..f9f4d63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,7 +148,12 @@ fi
AC_PROG_FC
export FC
export MPIFC
+F77="$FC"
+FFLAGS="$FCFLAGS"
+
+AC_PROVIDE([AC_PROG_F77])
AC_SUBST([FCENV])
+AC_SUBST(srcdir)
flags_guess="$SHELL $srcdir/flags.guess"
AC_MSG_NOTICE([running $flags_guess])
@@ -160,6 +165,7 @@ AC_FC_WRAPPERS
AC_LANG(Fortran)
AC_FC_SRCEXT(f90)
AC_FC_FREEFORM()
+
AC_FC_PP_DEFINE()
AC_SUBST([FC_DEFINE])
AC_FC_PP_SRCEXT(F90)dnl Because AC_FC_PP_DEFINE messes with things.
More information about the CIG-COMMITS
mailing list