[cig-commits] r22943 - seismo/3D/SPECFEM3D_GLOBE/trunk

[elliott.sales.de.andrade at geodynamics.org]

Author: elliott.sales.de.andrade
Date: 2013-10-08 00:12:59 -0700 (Tue, 08 Oct 2013)
New Revision: 22943

Modified:
   seismo/3D/SPECFEM3D_GLOBE/trunk/configure.ac
Log:
autoconf: Update Fortran module macro names.

I moved these to the backports file.

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/configure.ac
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/configure.ac	2013-10-08 07:11:52 UTC (rev 22942)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/configure.ac	2013-10-08 07:12:59 UTC (rev 22943)
@@ -15,6 +15,7 @@
 AC_CONFIG_HEADER([setup/config.h])
 
 AC_CONFIG_MACRO_DIR([m4])
+m4_include(m4/cit_backports.m4)
 
 ############################################################
 
@@ -120,13 +121,7 @@
 
 AC_PROG_CC
 
-AC_LANG_PUSH(C)
-AC_CHECK_HEADER(emmintrin.h,AC_DEFINE([HAVE_EMMINTRIN],[1],[Define if emmintrin.h]))
-AC_CHECK_HEADER(xmmintrin.h,AC_DEFINE([HAVE_XMMINTRIN],[1],[Define if xmmintrin.h]))
-AC_LANG_POP(C)
-
 ############################################################
-
 # influential environment variables
 
 AC_ARG_VAR(MPIFC, [MPI Fortran compiler command])
@@ -165,12 +160,31 @@
   FLAGS_CHECK+=" $MPI_INC"
 ])
 
-# Checks for libraries.
+# Checks for typedefs, structures, and compiler characteristics.
+AS_BOX([module extensions])
 
+AC_FC_MODULE_EXTENSION
+AC_SUBST([FC_MODEXT])
+AC_FC_MODULE_FLAG([], [])
+AC_FC_MODULE_OUTPUT_FLAG([
+	FCFLAGS_f90="$FC_MODOUT./obj $FC_MODINC./obj $FC_MODINC. $FCFLAGS_f90"
+	FC_MODDIR=./obj
+], [
+	FC_MODDIR=.
+])
+AC_SUBST([FC_MODDIR])
+
 # Checks for header files.
 
+AC_LANG_PUSH(C)
+AC_CHECK_HEADER(emmintrin.h,AC_DEFINE([HAVE_EMMINTRIN],[1],[Define if emmintrin.h]))
+AC_CHECK_HEADER(xmmintrin.h,AC_DEFINE([HAVE_XMMINTRIN],[1],[Define if xmmintrin.h]))
+AC_LANG_POP(C)
+
 CIT_FC_MPI_HEADER([$MPIFC], [$FLAGS_CHECK])
 
+# Checks for libraries.
+
 ###
 ### ADIOS
 ###
@@ -279,21 +293,6 @@
 
 ############################################################
 
-# Checks for typedefs, structures, and compiler characteristics.
-AS_BOX([module extensions])
-
-CIT_FC_MODULE_EXTENSION
-AC_SUBST([FC_MODEXT])
-CIT_FC_MODULE_FLAG([], [])
-CIT_FC_MODULE_OUTPUT_FLAG([
-	FCFLAGS_f90="$FC_MODOUT./obj $FC_MODINC./obj $FC_MODINC. $FCFLAGS_f90"
-	FC_MODDIR=./obj
-], [
-	FC_MODDIR=.
-])
-AC_SUBST([FC_MODDIR])
-
-# Checks for library functions.
 AS_BOX([setting up default simulation setup])
 
 AC_CONFIG_FILES([