[cgma-dev] r2197 - in cgm/trunk: . itaps

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2008-11-03 09:36:31 -0600 (Mon, 03 Nov 2008)
New Revision: 2197

Modified:
   cgm/trunk/configure.in
   cgm/trunk/itaps/Makefile.am
Log:
fix minor errors introduced with earlier configure changes

Modified: cgm/trunk/configure.in
===================================================================
--- cgm/trunk/configure.in	2008-11-03 14:32:35 UTC (rev 2196)
+++ cgm/trunk/configure.in	2008-11-03 15:36:31 UTC (rev 2197)
@@ -72,9 +72,6 @@
 ################################################################################
 #                         Use Cubit shared libraries
 ################################################################################
-CGM_LIBS_LINK='$(CGM_LIBS_LINK_INTERNAL)'
-CGM_LIBS_FILES='$(CGM_LIBS_FILES_INTERNAL)'
-CGM_LIBS_LTFLAGS=
 CUBIT_FILE=no
 CUBIT_BIN_DIR=no
 HAVE_ACIS_DEF=
@@ -208,6 +205,7 @@
   CGM_EXT_LIBS="$CGM_EXT_LIBS $ACIS_LIBS"
   CGM_EXT_LDFLAGS="$CGM_EXT_LDFLAGS $ACIS_LINK_FLAGS"
   CGM_EXT_INCLUDE="$CGM_EXT_INCLUDE $ACIS_INCLUDES"
+  CGM_EXT_LTFLAGS="$CGM_EXT_LTFLAGS $ACIS_LTFLAGS"
   if test "x$GXX" = "xyes"; then
     CPPFLAGS="$CPPFLAGS -isystem $ACIS_DIR/include"
   fi

Modified: cgm/trunk/itaps/Makefile.am
===================================================================
--- cgm/trunk/itaps/Makefile.am	2008-11-03 14:32:35 UTC (rev 2196)
+++ cgm/trunk/itaps/Makefile.am	2008-11-03 15:36:31 UTC (rev 2197)
@@ -45,7 +45,7 @@
 testgeom_SOURCES = testgeom.cc
 testgeom_LDADD = libiGeom.la
 testgeom_CPPFLAGS = $(CPPFLAGS) -DSRCDIR=$(srcdir)
-testgeom_LDFLAGS = $(CGM_LIBS_LTFLAGS)
+testgeom_LDFLAGS = $(CGM_EXT_LTFLAGS)
 
 # Automake doesn't seem to have a directory defined for
 # platform-dependent data (or include) files. So put