[MOAB-dev] r5130 - in MOAB/trunk: . examples/itaps itaps

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-08-29 10:51:22 -0500 (Mon, 29 Aug 2011)
New Revision: 5130

Modified:
   MOAB/trunk/configure.ac
   MOAB/trunk/examples/itaps/Makefile.am
   MOAB/trunk/itaps/iBase_f.h
Log:
o Clean up previous Fortran build changes
o Don't try to build ITAPS Fortran examples if MOAB is configured with --disable-fortran


Modified: MOAB/trunk/configure.ac
===================================================================
--- MOAB/trunk/configure.ac	2011-08-29 15:29:10 UTC (rev 5129)
+++ MOAB/trunk/configure.ac	2011-08-29 15:51:22 UTC (rev 5130)
@@ -25,6 +25,7 @@
 EXTRA_INTEL_FLAGS='-Wall'
 FATHOM_CHECK_COMPILERS([yes],[yes],[$ENABLE_FORTRAN])
 AM_CONDITIONAL(PARALLEL,[test "x$WITH_MPI" != "xno"])
+AM_CONDITIONAL(ENABLE_FORTRAN,[test "x$ENABLE_FORTRAN" != "xno"])
 LIBS="$LIBS -lm"
 
 AC_PROG_LN_S
@@ -230,11 +231,6 @@
   fi
 fi
 
-AM_FCFLAGS="$AM_FCFLAGS -DPTRSIZE=${SIZEOF_VOID_P}"
-AM_FFLAGS="$AM_FFLAGS -DPTRSIZE=${SIZEOF_VOID_P}"
-AC_SUBST(AM_FCFLAGS)
-AC_SUBST(AM_FFLAGS)
-
 ################################################################################
 #                              Version Stuff
 ################################################################################

Modified: MOAB/trunk/examples/itaps/Makefile.am
===================================================================
--- MOAB/trunk/examples/itaps/Makefile.am	2011-08-29 15:29:10 UTC (rev 5129)
+++ MOAB/trunk/examples/itaps/Makefile.am	2011-08-29 15:51:22 UTC (rev 5130)
@@ -1,10 +1,14 @@
+if ENABLE_FORTRAN
 check_PROGRAMS = FindConnectF TagIterateC TagIterateF
+else
+check_PROGRAMS = TagIterateC
+endif
 
 AM_CPPFLAGS += -I$(top_srcdir)/itaps/imesh \
 	-I$(top_srcdir)/itaps/ \
 	-I$(top_builddir)/itaps/imesh
 
-AM_FFLAGS += -fcray-pointer
+AM_FFLAGS = -fcray-pointer
 
 TESTS = $(check_PROGRAMS)
 LDADD = $(top_builddir)/itaps/imesh/libiMesh.la $(top_builddir)/src/libMOAB.la ${MOAB_CXX_LINKFLAGS} ${MOAB_CXX_LIBS}

Modified: MOAB/trunk/itaps/iBase_f.h
===================================================================
--- MOAB/trunk/itaps/iBase_f.h	2011-08-29 15:29:10 UTC (rev 5129)
+++ MOAB/trunk/itaps/iBase_f.h	2011-08-29 15:51:22 UTC (rev 5130)
@@ -1,7 +1,11 @@