Author: kraftche Date: 2011-03-21 11:50:35 -0500 (Mon, 21 Mar 2011) New Revision: 4616 Modified: cgm/trunk/configure.ac cgm/trunk/m4/compiler.m4 Log: o Sync m4/compiler.m4 with MOAB version o Add --disable-fortran flag to force iGeom.h w/out Fortran name mangling Modified: cgm/trunk/configure.ac =================================================================== --- cgm/trunk/configure.ac 2011-03-20 09:18:34 UTC (rev 4615) +++ cgm/trunk/configure.ac 2011-03-21 16:50:35 UTC (rev 4616) @@ -10,8 +10,12 @@ [AM_INIT_AUTOMAKE([foreign -Wall])]) AC_DISABLE_SHARED +AC_ARG_ENABLE([fortran],[AC_HELP_STRING([--disable-fortran], + [No Fortran name mangling in ITAPS C headers])], + [ENABLE_FORTRAN=$enableval],[ENABLE_FORTRAN=yes]) + EXTRA_GNU_FLAGS="-Wall -pipe -pedantic" -FATHOM_CHECK_COMPILERS +FATHOM_CHECK_COMPILERS([yes],[yes],[$ENABLE_FORTRAN]) AC_PROG_LIBTOOL LIBS="-lm" AC_PROG_SED @@ -21,14 +25,14 @@ ################################################################################ # Fortran Stuff for ITAPS C bindings ################################################################################ -if test "x" != "x$FC"; then +if test "xyes" = "x$ENABLE_FORTRAN" && test "x" != "x$FC"; then AC_FC_WRAPPERS fi ################################################################################ # Create libtool script ################################################################################ -# We need the libtool script both for the calls to the ITAPS_LIBTOOL_VAR +# We need the libtool script both for the calls to the FATHOM_LIBTOOL_VAR # macro and for us in testing for ACIS libraries. If we're using a newer # version of libtool, the script normally isn't generated until AC_OUTPUT # at the end of the configure script. Ask that it be created now instead. @@ -38,8 +42,8 @@ ################################################################################ # Extract libtool config ################################################################################ -ITAPS_LIBTOOL_VAR( [CXX], [compiler_lib_search_path], [CGM_CXX_LINKFLAGS]) -ITAPS_LIBTOOL_VAR( [CXX], [postdeps], [CGM_CXX_LIBS]) +FATHOM_LIBTOOL_VAR( [CXX], [compiler_lib_search_path], [CGM_CXX_LINKFLAGS]) +FATHOM_LIBTOOL_VAR( [CXX], [postdeps], [CGM_CXX_LIBS]) AC_SUBST(CGM_CXX_LINKFLAGS) AC_SUBST(CGM_CXX_LIBS) Modified: cgm/trunk/m4/compiler.m4 =================================================================== --- cgm/trunk/m4/compiler.m4 2011-03-20 09:18:34 UTC (rev 4615) +++ cgm/trunk/m4/compiler.m4 2011-03-21 16:50:35 UTC (rev 4616)