[cgma-dev] r5472 - cgm/branches/merge-cubit13.1

[jiangtao_ma at yahoo.com]

Author: janehu
Date: 2012-04-09 15:23:53 -0500 (Mon, 09 Apr 2012)
New Revision: 5472

Added:
   cgm/branches/merge-cubit13.1/README
Modified:
   cgm/branches/merge-cubit13.1/configure.ac
Log:
Added a note for this branch.

Added: cgm/branches/merge-cubit13.1/README
===================================================================
--- cgm/branches/merge-cubit13.1/README	                        (rev 0)
+++ cgm/branches/merge-cubit13.1/README	2012-04-09 20:23:53 UTC (rev 5472)
@@ -0,0 +1 @@
+This is code from merging the cubit13.1 code and Version12.2 code.

Modified: cgm/branches/merge-cubit13.1/configure.ac
===================================================================
--- cgm/branches/merge-cubit13.1/configure.ac	2012-04-09 19:53:35 UTC (rev 5471)
+++ cgm/branches/merge-cubit13.1/configure.ac	2012-04-09 20:23:53 UTC (rev 5472)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                           Standard Stuff
 ################################################################################
-AC_INIT(CGMA, 10.2.3)
+AC_INIT(CGMA, 13.1)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([.])
 AC_CANONICAL_SYSTEM
@@ -131,78 +131,78 @@
   export SHLIB_PATH
   export PATH
   pattern=["${CUBIT_BIN_DIR}/*cubiti[0-9][0-9].*"]
-#  for file in $pattern; do
-#    AC_MSG_CHECKING([for AcisQueryEngine::instance_ in $file])
-#    num=[`expr X"$file" : X".*cubiti\([0-9][0-9]\)\..*"`]
-#    LIBS="$old_LIBS -lcubiti$num"
-#    AC_LINK_IFELSE([AC_LANG_PROGRAM(
-#      [class AcisQueryEngine { public: static AcisQueryEngine* instance_; };],
-#      [AcisQueryEngine::instance_ = 0;])],
-#      [CUBIT_LIBS="-L${CUBIT_BIN_DIR} -lcubiti$num"
-#       CUBIT_FILE=`expr x"$file" : x"$CUBIT_BIN_DIR/\(.*\)"`
-#       CUBIT_FILE="${CUBIT_BIN_DIR}/$CUBIT_FILE"
-#       AC_MSG_RESULT(yes)
-#       break],
-#      [AC_MSG_RESULT(no)])
-#  done
+  for file in $pattern; do
+    AC_MSG_CHECKING([for AcisQueryEngine::instance_ in $file])
+    num=[`expr X"$file" : X".*cubiti\([0-9][0-9]\)\..*"`]
+    LIBS="$old_LIBS -lcubiti$num"
+    AC_LINK_IFELSE([AC_LANG_PROGRAM(
+      [class AcisQueryEngine { public: static AcisQueryEngine* instance_; };],
+      [AcisQueryEngine::instance_ = 0;])],
+      [CUBIT_LIBS="-L${CUBIT_BIN_DIR} -lcubiti$num"
+       CUBIT_FILE=`expr x"$file" : x"$CUBIT_BIN_DIR/\(.*\)"`
+       CUBIT_FILE="${CUBIT_BIN_DIR}/$CUBIT_FILE"
+       AC_MSG_RESULT(yes)
+       break],
+      [AC_MSG_RESULT(no)])