[cgma-dev] r5794 - cgm/trunk

[janehu at mcs.anl.gov]

Author: janehu
Date: 2012-10-15 10:27:36 -0500 (Mon, 15 Oct 2012)
New Revision: 5794

Modified:
   cgm/trunk/configure.ac
Log:
Miss checked in this file.

Modified: cgm/trunk/configure.ac
===================================================================
--- cgm/trunk/configure.ac	2012-10-14 03:43:08 UTC (rev 5793)
+++ cgm/trunk/configure.ac	2012-10-15 15:27:36 UTC (rev 5794)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                           Standard Stuff
 ################################################################################
-AC_INIT(CGMA, 12.3.0pre)
+AC_INIT(CGMA, 13.1)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([.])
 AC_CANONICAL_SYSTEM
@@ -22,8 +22,6 @@
 AC_C_BIGENDIAN( [], [AM_CPPFLAGS="$AM_CPPFLAGS -DLITTLE_ENDIAN=BYTE_ORDER"] )
 FATHOM_COMPILER_FLAGS
 
-FATHOM_CHECK_CXX_WORKS([], [AC_MSG_ERROR([Cannot build without C++ compiler])])
-
 ################################################################################
 #                Fortran Stuff for ITAPS C bindings
 ################################################################################
@@ -44,8 +42,8 @@
 ################################################################################
 #                              Extract libtool config
 ################################################################################
-FATHOM_LIBTOOL_VAR( [CXX], [compiler_lib_search_path], [CGM_CXX_LINKFLAGS])
-FATHOM_LIBTOOL_VAR( [CXX], [postdeps], [CGM_CXX_LIBS])
+ITAPS_LIBTOOL_VAR( [CXX], [compiler_lib_search_path], [CGM_CXX_LINKFLAGS])
+ITAPS_LIBTOOL_VAR( [CXX], [postdeps], [CGM_CXX_LIBS])
 AC_SUBST(CGM_CXX_LINKFLAGS)
 AC_SUBST(CGM_CXX_LIBS)
 
@@ -103,7 +101,6 @@
              AC_HELP_STRING([--with-CUBIT=<dir>],[DEPRECATED.  Use --with-cubit (small case)]),
              [CUBIT_DIR="$withval"
               DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-cubit=\"${withval}\""])
-
 if test "x$CUBIT_DIR" == "xyes"; then
   AC_MSG_ERROR([Option --with-CUBIT without specifying Cubit directory.])
 elif test "x$CUBIT_DIR" != "xno"; then
@@ -165,11 +162,11 @@
     [CUBIT_CAT_DEFINES=-DACIS_TWEAK_TOOL_CAT; AC_MSG_RESULT([yes])],
     [CUBIT_CAT_DEFINES=; AC_MSG_RESULT([no])])
 
-  # Test for Cubit 12.1 and later import_solid_model
-  AC_MSG_CHECKING([For Cubit 12 minor revision API])
-  # Set to 1 if it looks like Cubit 12.1, set to 2 if it looks like cubit 12.2,
+  # Test for Cubit 13.1 and later import_solid_model
+  AC_MSG_CHECKING([For Cubit 13 minor revision API])
+  # Set to 1 if it looks like Cubit 13.1,