[cgma-dev] r5481 - in cgm/branches/merge-cubit13.1: . itaps

[jiangtao_ma at yahoo.com]

Author: janehu
Date: 2012-04-13 12:55:55 -0500 (Fri, 13 Apr 2012)
New Revision: 5481

Modified:
   cgm/branches/merge-cubit13.1/configure.ac
   cgm/branches/merge-cubit13.1/itaps/CATag.cpp
   cgm/branches/merge-cubit13.1/itaps/CATag.hpp
   cgm/branches/merge-cubit13.1/itaps/Makefile.am
   cgm/branches/merge-cubit13.1/itaps/iBase.h
   cgm/branches/merge-cubit13.1/itaps/iGeom-Defs.inc.in
   cgm/branches/merge-cubit13.1/itaps/iGeom.h
   cgm/branches/merge-cubit13.1/itaps/iGeomError.cc
   cgm/branches/merge-cubit13.1/itaps/iGeomError.h
   cgm/branches/merge-cubit13.1/itaps/iGeom_CGMA.cc
   cgm/branches/merge-cubit13.1/itaps/iGeom_protos.h
   cgm/branches/merge-cubit13.1/itaps/testgeom.cc
Log:
Updates from trunk cgm for itaps.


Modified: cgm/branches/merge-cubit13.1/configure.ac
===================================================================
--- cgm/branches/merge-cubit13.1/configure.ac	2012-04-12 21:17:13 UTC (rev 5480)
+++ cgm/branches/merge-cubit13.1/configure.ac	2012-04-13 17:55:55 UTC (rev 5481)
@@ -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,7 +25,7 @@
 ################################################################################
 #                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
 
@@ -308,11 +312,11 @@
 # Newer C++ compilers may not provide this backwards-compatibility
 # file.  Check if it is present, and if not, use our own.
 ACIS_NEW_COMPAT_INC='-I${top_srcdir}/compat/new'
-#if test "x$ACIS_DIR" != "xno"; then
+if test "x$ACIS_DIR" != "xno"; then
   AC_LANG_PUSH(C++)
-#  AC_CHECK_HEADER([new.h],[],[ACIS_INCLUDES="$ACIS_INCLUDES $ACIS_NEW_COMPAT_INC"])
+  AC_CHECK_HEADER([new.h],[],[ACIS_INCLUDES="$ACIS_INCLUDES $ACIS_NEW_COMPAT_INC"])
   AC_LANG_POP(C++)
-#fi
+fi
 
 AC_SUBST(ACIS_DEFS)
 AC_SUBST(ACIS_DIR)
@@ -387,6 +391,13 @@
 AC_SUBST(USE_BABEL)
 AM_CONDITIONAL(USE_BABEL, [test "xno" != "x$USE_BABEL"])
 
+################################################################################
+#                           ITAPS shim
+################################################################################
+AC_ARG_ENABLE([shim],[AC_HELP_STRING([--enable-shim],
+  [Enable ITAPS shim])],