[cig-commits] r22503 - in seismo/2D/SPECFEM2D/trunk: . m4 src/meshfem2D src/specfem2D
elliott.sales.de.andrade at geodynamics.org
elliott.sales.de.andrade at geodynamics.org
Tue Jul 2 23:32:38 PDT 2013
Author: elliott.sales.de.andrade
Date: 2013-07-02 23:32:37 -0700 (Tue, 02 Jul 2013)
New Revision: 22503
Modified:
seismo/2D/SPECFEM2D/trunk/configure
seismo/2D/SPECFEM2D/trunk/configure.ac
seismo/2D/SPECFEM2D/trunk/m4/cit_fortran.m4
seismo/2D/SPECFEM2D/trunk/src/meshfem2D/Makefile.in
seismo/2D/SPECFEM2D/trunk/src/specfem2D/Makefile.in
Log:
Fix Fortran preprocessor define options.
On IBM, the Fortran compiler doesn't recognize -D to define a
preprocessor name. Instead it just interprets all the letters in
whatever you defined as single-letter options. Naturally, this causes
strange results.
Modified: seismo/2D/SPECFEM2D/trunk/configure
===================================================================
--- seismo/2D/SPECFEM2D/trunk/configure 2013-07-03 06:32:30 UTC (rev 22502)
+++ seismo/2D/SPECFEM2D/trunk/configure 2013-07-03 06:32:37 UTC (rev 22503)
@@ -645,6 +645,8 @@
EGREP
GREP
CPP
+FC_DEFINE
+FCFLAGS_F
FCFLAGS_f90
ac_ct_CC
CPPFLAGS
@@ -4577,7 +4579,132 @@
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'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
+ac_fc_pp_define_srcext_save=$ac_fc_srcext
+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'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran flag to compile preprocessed .F files" >&5
+$as_echo_n "checking for Fortran flag to compile preprocessed .F files... " >&6; }
+if ${ac_cv_fc_pp_srcext_F+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_ext=F
+ac_fcflags_pp_srcext_save=$ac_fcflags_srcext
+ac_fcflags_srcext=
+ac_cv_fc_pp_srcext_F=unknown
+case $ac_ext in #(
+ [fF]77) ac_try=f77-cpp-input;; #(
+ *) ac_try=f95-cpp-input;;
+esac
+for ac_flag in none -ftpp -fpp -Tf "-fpp -Tf" -xpp=fpp -Mpreprocess "-e Z" \
+ -cpp -xpp=cpp -qsuffix=cpp=F "-x $ac_try" +cpp -Cpp; do
+ test "x$ac_flag" != xnone && ac_fcflags_srcext="$ac_flag"
+ cat > conftest.$ac_ext <<_ACEOF
+ program main
+#if 0
+#include <ac_nonexistent.h>
+ choke me
+#endif
+ end
+_ACEOF
+if ac_fn_fc_try_compile "$LINENO"; then :
+ cat > conftest.$ac_ext <<_ACEOF
+ program main
+
+#if 1
+#include <ac_nonexistent.h>
+ choke me
+#endif
+ end
+_ACEOF
+if ac_fn_fc_try_compile "$LINENO"; then :
+
+else
+ ac_cv_fc_pp_srcext_F=$ac_flag; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest.$ac_objext conftest.F
+ac_fcflags_srcext=$ac_fcflags_pp_srcext_save
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_pp_srcext_F" >&5
+$as_echo "$ac_cv_fc_pp_srcext_F" >&6; }
+if test "x$ac_cv_fc_pp_srcext_F" = xunknown; then
+ as_fn_error $? "Fortran could not compile preprocessed .F files" "$LINENO" 5
+else
+ ac_fc_srcext=F
+ if test "x$ac_cv_fc_pp_srcext_F" = xnone; then
+ ac_fcflags_srcext=""
+ FCFLAGS_F=""
+ else
+ ac_fcflags_srcext=$ac_cv_fc_pp_srcext_F
+ FCFLAGS_F=$ac_cv_fc_pp_srcext_F
+ fi
+
+
+fi
+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'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to define symbols for preprocessed Fortran" >&5
+$as_echo_n "checking how to define symbols for preprocessed Fortran... " >&6; }
+if ${ac_cv_fc_pp_define+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_fc_pp_define_srcext_save=$ac_fc_srcext
+ac_cv_fc_pp_define=unknown
+ac_fc_pp_define_FCFLAGS_save=$FCFLAGS
+for ac_flag in -D -WF,-D -Wp,-D -Wc,-D
+do
+ FCFLAGS="$ac_fc_pp_define_FCFLAGS_save ${ac_flag}FOOBAR ${ac_flag}ZORK=42"
+ cat > conftest.$ac_ext <<_ACEOF
+ program main
+
+#ifndef FOOBAR
+ choke me
+#endif
+#if ZORK != 42
+ choke me
+#endif
+ end
+_ACEOF
+if ac_fn_fc_try_compile "$LINENO"; then :
+ ac_cv_fc_pp_define=$ac_flag
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ test x"$ac_cv_fc_pp_define" != xunknown && break
+done
+FCFLAGS=$ac_fc_pp_define_FCFLAGS_save
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_pp_define" >&5
+$as_echo "$ac_cv_fc_pp_define" >&6; }
+ac_fc_srcext=$ac_fc_pp_define_srcext_save
+if test "x$ac_cv_fc_pp_define" = xunknown; then
+ FC_DEFINE=
+ as_fn_error 77 "Fortran does not allow to define preprocessor symbols" "$LINENO" 5
+else
+ FC_DEFINE=$ac_cv_fc_pp_define
+
+fi
+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'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
+
+
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
Modified: seismo/2D/SPECFEM2D/trunk/configure.ac
===================================================================
--- seismo/2D/SPECFEM2D/trunk/configure.ac 2013-07-03 06:32:30 UTC (rev 22502)
+++ seismo/2D/SPECFEM2D/trunk/configure.ac 2013-07-03 06:32:37 UTC (rev 22503)
@@ -79,6 +79,8 @@
AC_LANG(Fortran)
AC_FC_SRCEXT(f90)
AC_FC_FREEFORM()
+CIT_FC_PP_DEFINE()
+AC_SUBST([FC_DEFINE])
AC_PROG_CC
Modified: seismo/2D/SPECFEM2D/trunk/m4/cit_fortran.m4
===================================================================
--- seismo/2D/SPECFEM2D/trunk/m4/cit_fortran.m4 2013-07-03 06:32:30 UTC (rev 22502)
+++ seismo/2D/SPECFEM2D/trunk/m4/cit_fortran.m4 2013-07-03 06:32:37 UTC (rev 22503)
@@ -306,4 +306,58 @@
])dnl _CIT_FC_TRIVIAL_MPI_PROGRAM
+#
+# The following macro is from autoconf 2.68 (which is still new).
+#
+
+# CIT_FC_PP_DEFINE([ACTION-IF-SUCCESS], [ACTION-IF-FAILURE = FAILURE])
+# -------------------------------------------------------------------
+# Find a flag to specify defines for preprocessed Fortran. Not all
+# Fortran compilers use -D. Substitute FC_DEFINE with the result and
+# call ACTION-IF-SUCCESS (defaults to nothing) if successful, and
+# ACTION-IF-FAILURE (defaults to failing with an error message) if not.
+#
+# Known flags:
+# IBM: -WF,-D
+# Lahey/Fujitsu: -Wp,-D older versions???
+# f2c: -D or -Wc,-D
+# others: -D
+AC_DEFUN([CIT_FC_PP_DEFINE],
+[AC_LANG_PUSH([Fortran])dnl
+ac_fc_pp_define_srcext_save=$ac_fc_srcext
+AC_FC_PP_SRCEXT([F])
+AC_CACHE_CHECK([how to define symbols for preprocessed Fortran],
+ [ac_cv_fc_pp_define],
+[ac_fc_pp_define_srcext_save=$ac_fc_srcext
+ac_cv_fc_pp_define=unknown
+ac_fc_pp_define_FCFLAGS_save=$FCFLAGS
+for ac_flag in -D -WF,-D -Wp,-D -Wc,-D
+do
+ FCFLAGS="$ac_fc_pp_define_FCFLAGS_save ${ac_flag}FOOBAR ${ac_flag}ZORK=42"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[
+#ifndef FOOBAR
+ choke me
+#endif
+#if ZORK != 42
+ choke me
+#endif]])],
+ [ac_cv_fc_pp_define=$ac_flag])
+ test x"$ac_cv_fc_pp_define" != xunknown && break
+done
+FCFLAGS=$ac_fc_pp_define_FCFLAGS_save
+])
+ac_fc_srcext=$ac_fc_pp_define_srcext_save
+if test "x$ac_cv_fc_pp_define" = xunknown; then
+ FC_DEFINE=
+ m4_default([$2],
+ [AC_MSG_ERROR([Fortran does not allow to define preprocessor symbols], 77)])
+else
+ FC_DEFINE=$ac_cv_fc_pp_define
+ $1
+fi
+AC_SUBST([FC_DEFINE])dnl
+AC_LANG_POP([Fortran])dnl
+])
+
+
dnl end of file
Modified: seismo/2D/SPECFEM2D/trunk/src/meshfem2D/Makefile.in
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/meshfem2D/Makefile.in 2013-07-03 06:32:30 UTC (rev 22502)
+++ seismo/2D/SPECFEM2D/trunk/src/meshfem2D/Makefile.in 2013-07-03 06:32:37 UTC (rev 22503)
@@ -57,7 +57,7 @@
CFLAGS = @CFLAGS@ $(CPPFLAGS) -I../../setup
## serial or parallel
- at COND_MPI_TRUE@F90 = $(MPIFC) $(FCFLAGS) -DUSE_MPI -DUSE_SCOTCH -I"@SCOTCH_INCLUDEDIR@" $(MPILIBS)
+ at COND_MPI_TRUE@F90 = $(MPIFC) $(FCFLAGS) @FC_DEFINE at USE_MPI @FC_DEFINE at USE_SCOTCH -I"@SCOTCH_INCLUDEDIR@" $(MPILIBS)
@COND_MPI_FALSE at F90 = $(FC) $(FCFLAGS)
## scotch libraries
Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/Makefile.in
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/Makefile.in 2013-07-03 06:32:30 UTC (rev 22502)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/Makefile.in 2013-07-03 06:32:37 UTC (rev 22503)
@@ -62,7 +62,7 @@
CFLAGS = @CFLAGS@ $(CPPFLAGS) -I../../setup
## serial or parallel
- at COND_MPI_TRUE@F90 = $(MPIFC) $(FCFLAGS) -DUSE_MPI -DUSE_SCOTCH -I"@SCOTCH_INCLUDEDIR@" $(MPILIBS)
+ at COND_MPI_TRUE@F90 = $(MPIFC) $(FCFLAGS) @FC_DEFINE at USE_MPI @FC_DEFINE at USE_SCOTCH -I"@SCOTCH_INCLUDEDIR@" $(MPILIBS)
@COND_MPI_FALSE at F90 = $(FC) $(FCFLAGS)
More information about the CIG-COMMITS
mailing list