[cgma-dev] r4134 - cgm/trunk

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-09-20 22:35:27 -0500 (Mon, 20 Sep 2010)
New Revision: 4134

Modified:
   cgm/trunk/Makefile.am
   cgm/trunk/configure.ac
Log:
Adding --enable-igeom, to conform to itaps standard.  On by default.




Modified: cgm/trunk/Makefile.am
===================================================================
--- cgm/trunk/Makefile.am	2010-09-21 02:50:52 UTC (rev 4133)
+++ cgm/trunk/Makefile.am	2010-09-21 03:35:27 UTC (rev 4134)
@@ -1,5 +1,4 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = compat util geom init . itaps test cgm_apps
 # Don't loose the autoconf include path
 ACLOCAL_AMFLAGS = -I m4
 
@@ -12,6 +11,12 @@
 
 lib_LTLIBRARIES = libcgm.la
 
+if ENABLE_igeom
+  igeom_DIR = itaps
+else
+  igeom_DIR = 
+endif 
+
 if build_parallel
   CGM_ll_LIB = geom/parallel/libcubit_parallel.la
 else
@@ -43,8 +48,8 @@
   CORE_CGM_LIBS = 
 endif
 
+SUBDIRS = compat util geom init . $(igeom_DIR) test cgm_apps
 
-
 libcgm_la_LIBADD = init/libcgma_init.la $(CORE_CGM_LIBS) $(CGM_EXT_LIBS) $(CUBIT_FILE)
 
 libcgm_la_SOURCES = 

Modified: cgm/trunk/configure.ac
===================================================================
--- cgm/trunk/configure.ac	2010-09-21 02:50:52 UTC (rev 4133)
+++ cgm/trunk/configure.ac	2010-09-21 03:35:27 UTC (rev 4134)
@@ -265,6 +265,39 @@
 AM_CONDITIONAL(build_ACIS, test x$ACIS_DIR != xno)
 
 ################################################################################
+#                           iGeom Part 1 of 2
+################################################################################
+
+FORCE_IGEOM=no
+AC_ARG_ENABLE( [igeom],
+[AC_HELP_STRING([--disable-igeom],[Do not build support for iGeom interface])],
+[FORCE_IGEOM=yes],
+[enableval=yes] )
+