[MOAB-dev] r4135 - in MOAB/trunk: . itaps/imesh src

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-09-21 14:26:10 -0500 (Tue, 21 Sep 2010)
New Revision: 4135

Modified:
   MOAB/trunk/README
   MOAB/trunk/configure.ac
   MOAB/trunk/itaps/imesh/iMesh-Defs.inc.in
   MOAB/trunk/itaps/imesh/iMesh.h
   MOAB/trunk/src/Factory.cpp
Log:
iMesh.h: changing doxygen comment
iMesh-Defs.inc.in: adding @CCMIO_LIBS@ to libs
Factory.cpp: changing function name of Version, to MoabVersion, to avoid name collision
README: changing description of build step 6, to clarify it's only optional if you're not building MOAB apps.
configure.ac: typo in --disable-imesh help string, and commenting out reset of LDFLAGS, LIBS back to old versions after CGM test, fixes building CGM-enabled MOAB.



Modified: MOAB/trunk/README
===================================================================
--- MOAB/trunk/README	2010-09-21 03:35:27 UTC (rev 4134)
+++ MOAB/trunk/README	2010-09-21 19:26:10 UTC (rev 4135)
@@ -56,8 +56,9 @@
    command 'make' to compile MOAB and any configured MOAB-based tools.
 5. In whichever directory MOAB was build in, issue the command 
    'make check' to verify that MOAB compiled and is working correctly.
-6. Optional: Issue the command 'make install' to install the MOAB 
-   library and headers in the configured install directory.
+6. Issue the command 'make install' to install the MOAB library and headers 
+   in the configured install directory.  (This step is optional if you're 
+   only building tools distributed with MOAB.)
 
 
 =====================================

Modified: MOAB/trunk/configure.ac
===================================================================
--- MOAB/trunk/configure.ac	2010-09-21 03:35:27 UTC (rev 4134)
+++ MOAB/trunk/configure.ac	2010-09-21 19:26:10 UTC (rev 4135)
@@ -127,7 +127,7 @@
 
 FORCE_IMESH=no
 AC_ARG_ENABLE( [imesh],
-[AC_HELP_STRING([--disable-imesh],[Do no build support for iMesh interface.])],
+[AC_HELP_STRING([--disable-imesh],[Do not build support for iMesh interface.])],
 [FORCE_IMESH=yes],
 [enableval=yes] )
 
@@ -977,6 +977,8 @@
   CPPFLAGS="$old_CPPFLAGS"
   LDFLAGS="$old_LDFLAGS"
   LIBS="$old_LIBS"
+#  LDFLAGS="$old_LDFLAGS"
+#  LIBS="$old_LIBS"
   AC_LANG_POP([C++])
   EXPORT_LDFLAGS="$EXPORT_LDFLAGS $CGM_LDFLAGS"
   EXPORT_LTFLAGS="$EXPORT_LTFLAGS $CGM_LTFLAGS"

Modified: MOAB/trunk/itaps/imesh/iMesh-Defs.inc.in
===================================================================
--- MOAB/trunk/itaps/imesh/iMesh-Defs.inc.in	2010-09-21 03:35:27 UTC (rev 4134)
+++ MOAB/trunk/itaps/imesh/iMesh-Defs.inc.in	2010-09-21 19:26:10 UTC (rev 4135)
@@ -15,7 +15,7 @@
              -L$(IMESH_LIBDIR) -liMesh -lMOAB \
              @NETCDF_LIBS@ @HDF5_LIBS@ @LIBS@ \
              $(IMESH_CXX_LDFLAGS) $(IMESH_CXX_LIBS) \
-             @CGM_LDFLAGS@ @CGM_LIBS@
+             @CGM_LDFLAGS@ @CGM_LIBS@ @CCMIO_LIBS@