[cgma-dev] r1607 - cgm/trunk

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2008-02-21 10:57:23 -0600 (Thu, 21 Feb 2008)
New Revision: 1607

Modified:
   cgm/trunk/cgm.make.in
   cgm/trunk/configure.in
Log:
fix conditional inclusion of OpenCascade library

Modified: cgm/trunk/cgm.make.in
===================================================================
--- cgm/trunk/cgm.make.in	2008-02-21 16:55:21 UTC (rev 1606)
+++ cgm/trunk/cgm.make.in	2008-02-21 16:57:23 UTC (rev 1607)
@@ -28,7 +28,7 @@
 
 OCC_INCLUDES	     = @OCC_INC_FLAG@
 OCC_LIB_DIR	     = @OCC_LIB_FLAG@
-OCC_LIBS	     = @OCC_LIBS@
+OCC_LIBS	     = @CUBIT_OCC_LIB@ @OCC_LIBS@
 
 CGM_PARALLEL_INCLUDE = @CGM_PARALLEL_INCLUDE@
 CGM_PARALLEL_LIB = @CGM_PARALLEL_LIB@
@@ -83,8 +83,7 @@
         -lcubit_geom \
         -lcubit_util \
 	${CGM_PARALLEL_LIB} \
-        ${OCC_LIBS} \
-        -lcubit_OCC
+        ${OCC_LIBS} 
 
 CGM_LIBS_FILES_INTERNAL = \
        $(CGM_LIBDIR)/libcubit_virtual.a \

Modified: cgm/trunk/configure.in
===================================================================
--- cgm/trunk/configure.in	2008-02-21 16:55:21 UTC (rev 1606)
+++ cgm/trunk/configure.in	2008-02-21 16:57:23 UTC (rev 1607)
@@ -248,8 +248,10 @@
              [occ_DIR=no] )
 
 # if user specified option (other than --without-occ)
+CUBIT_OCC_LIB=
 if test "x$occ_DIR" != "xno"; then
   OCC_LIBS="-lTKMath -lTKXSBase -lTKernel -lTKShHealing -lTKBRep -lTKG3d -lTKBO -lTKFeat -lTKFillet -lTKG2d -lTKOffset -lTKBool -lTKGeomAlgo -lTKGeomBase -lTKPrim -lTKTopAlgo -lTKHLR -lTKIGES -lTKMesh -lTKPrim -lTKSTEP209 -lTKSTEPAttr -lTKSTEPBase -lTKSTEP -lTKSTL -lTKTopAlgo -lTKXSBase"
+  CUBIT_OCC_LIB="-lcubit_OCC"
 
   # Set OCC_INC_FLAG and OCC_LIB_FLAG based on --with-occ option
   if test "x$occ_DIR" = "x"; then
@@ -304,6 +306,7 @@
 AC_SUBST(OCC_INC_FLAG)
 AC_SUBST(OCC_LIB_FLAG)
 AC_SUBST(OCC_LIBS)
+AC_SUBST(CUBIT_OCC_LIB)
 
 # Allow "if WITH_OCC" in Makefile.am
 AM_CONDITIONAL( WITH_OCC, [test "x$occ_DIR" != "xno"] )