[MOAB-dev] r3618 - in MOAB/trunk: . config itaps/igeom

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-03-15 10:28:05 -0500 (Mon, 15 Mar 2010)
New Revision: 3618

Removed:
   MOAB/trunk/itaps/igeom/iGeom_FCDefs.h.in
Modified:
   MOAB/trunk/config/ITAPSFortranMangling.cmake
   MOAB/trunk/config/compiler.m4
   MOAB/trunk/configure.ac
Log:
add configure option --disable-fortran to disable fortran name mangingling for iMesh, iGeom, and MBCN C API

Modified: MOAB/trunk/config/ITAPSFortranMangling.cmake
===================================================================
--- MOAB/trunk/config/ITAPSFortranMangling.cmake	2010-03-15 15:27:29 UTC (rev 3617)
+++ MOAB/trunk/config/ITAPSFortranMangling.cmake	2010-03-15 15:28:05 UTC (rev 3618)
@@ -4,7 +4,7 @@
 
 SET( match_expr "^[ \\t]*void[ \\t]+${prefix}_([a-z][_a-zA-Z0-9]*)[ \\t]*\\(.*$" )
 FILE( STRINGS ${input_file} data REGEX ${match_expr} )
-FILE( WRITE ${output_file} "#include \"MBCN_FCDefs.h\"\n#ifdef FC_FUNC_\n\n" )
+FILE( WRITE ${output_file} "#include \"MOAB_FCDefs.h\"\n#ifdef FC_FUNC_\n\n" )
 FOREACH( line ${data} )
   STRING(REGEX REPLACE ${match_expr} "${prefix}_\\1" func ${line})
   STRING(TOUPPER ${func} upper)

Modified: MOAB/trunk/config/compiler.m4
===================================================================
--- MOAB/trunk/config/compiler.m4	2010-03-15 15:27:29 UTC (rev 3617)
+++ MOAB/trunk/config/compiler.m4	2010-03-15 15:28:05 UTC (rev 3618)
@@ -21,6 +21,7 @@
 #  CPP      - The C preprocessor
 #  CC       - The C compiler
 #  CXX      - The C++ compiler
+#  FC       - The Fortran compiler
 #  CFLAGS   - C compiler flags
 #  CXXFLAGS - C++ compiler flags
 #  WITH_MPI - 'yes' if parallel support, 'no' otherwise
@@ -41,7 +42,6 @@
 test "xno" = "x$CHECK_CXX" || CHECK_CXX=yes 
 test "xno" = "x$CHECK_FC" || CHECK_FC=yes 
 
-
   # Save these before calling AC_PROG_CC or AC_PROG_CXX
   # because those macros will modify them, and we want
   # the original user values, not the autoconf defaults.

Modified: MOAB/trunk/configure.ac
===================================================================
--- MOAB/trunk/configure.ac	2010-03-15 15:27:29 UTC (rev 3617)
+++ MOAB/trunk/configure.ac	2010-03-15 15:28:05 UTC (rev 3618)
@@ -15,8 +15,12 @@
 #                           Compilers
 ################################################################################
 
+AC_ARG_ENABLE([fortran],[AC_HELP_STRING([disable-fortran],
+  [No Fortran name mangling in ITAPS/MBCN C headers])],
+  [ENABLE_FORTRAN=$enableval],[ENABLE_FORTRAN=yes])
+
 EXTRA_GNU_FLAGS='-Wall -pipe'
-FATHOM_CHECK_COMPILERS([yes],[yes],[yes])
+FATHOM_CHECK_COMPILERS([yes],[yes],[$ENABLE_FORTRAN])
 AM_CONDITIONAL(PARALLEL,[test "x$WITH_MPI" != "xno"])
 LIBS="-lm"
 
@@ -116,7 +120,7 @@
     ENABLE_imesh=yes
     ;;
   nofortran|NoFortran|noFORTRAN|NoFORTRAN|Nofortran)
-    AC_MSG_ERROR([Depricated value for --enable-imesh: \"$enableval\".  Try \"FC= F77=\"])
+    AC_MSG_ERROR([Depricated value for --enable-imesh: \"$enableval\".  Try \"--disable-fortran\"])
     ;;
   no)
     ENABLE_imesh=no

Deleted: MOAB/trunk/itaps/igeom/iGeom_FCDefs.h.in
===================================================================
--- MOAB/trunk/itaps/igeom/iGeom_FCDefs.h.in	2010-03-15 15:27:29 UTC (rev 3617)
+++ MOAB/trunk/itaps/igeom/iGeom_FCDefs.h.in	2010-03-15 15:28:05 UTC (rev 3618)
@@ -1,7 +0,0 @@
-
-/* Fortran-mangle iGeom symbol names */
-#undef IGEOM_FORTRAN
-
-#ifdef IGEOM_FORTRAN
-# include "MBCN_FCDefs.h"
-#endif