[cgma-dev] r1756 - cgm/trunk

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2008-04-10 12:26:24 -0500 (Thu, 10 Apr 2008)
New Revision: 1756

Modified:
   cgm/trunk/cgm.make.in
   cgm/trunk/configure.in
Log:
remove bogus link flag when configured w/out ACIS

Modified: cgm/trunk/cgm.make.in
===================================================================
--- cgm/trunk/cgm.make.in	2008-04-10 17:12:24 UTC (rev 1755)
+++ cgm/trunk/cgm.make.in	2008-04-10 17:26:24 UTC (rev 1756)
@@ -18,6 +18,7 @@
 ACIS_DEFS            = @ACIS_DEFS@
 ACIS_DIR             = @ACIS_DIR@
 ACIS_LIB_DIR         = @ACIS_LIB_DIR@
+ACIS_LINK_FLAGS      = @ACIS_LINK_FLAGS@
 ACIS_VERSION         = @ACIS_VERSION@
 ACIS_HEALER          = @ACIS_HEALER@
 ACIS_PLATFORM        = @ACIS_PLATFORM@
@@ -66,7 +67,7 @@
 # will be overriden upon install
 CGM_INCLUDES = $(CGM_INC_CPPFLAGS_UNINSTALLED)
 
-CGM_LIBS_LDFLAGS_COMMON = -L$(ACIS_LIB_DIR) $(OCC_LIB_FLAG)
+CGM_LIBS_LDFLAGS_COMMON = $(ACIS_LINK_FLAGS) $(OCC_LIB_FLAG)
 
 CGM_LIBS_LDFLAGS_UNINSTALLED = \
 	-L at abs_builddir@/geom/virtual/.libs \
@@ -105,7 +106,7 @@
 
 CGM_LIBS_LINK_INTERNAL = $(LDFLAGS) $(CGM_LIBS_LDFLAGS) $(CGM_LIBS_LIBRARIES)
 
-CGMA_INIT_LDFLAGS_UNINSTALLED = -L$(CGM_LIBDIR)/init -L$(CGM_LIBDIR)/init/.libs 
+CGMA_INIT_LDFLAGS_UNINSTALLED = -L at abs_builddir@/init -L at abs_builddir@/init/.libs 
 CGMA_INIT_LDFLAGS_INSTALLED = -L$(CGM_LIBDIR)
 
 # Will be overridden upon install

Modified: cgm/trunk/configure.in
===================================================================
--- cgm/trunk/configure.in	2008-04-10 17:12:24 UTC (rev 1755)
+++ cgm/trunk/configure.in	2008-04-10 17:26:24 UTC (rev 1756)
@@ -164,10 +164,11 @@
  ACIS_VERSION=$withval],
 [ACIS_VERSION=0])
 if test "x$ACIS_DIR" == "x"; then 
-  ACIS_DIR=no; 
+  ACIS_DIR=no
 fi          
 if test "x$ACIS_DIR" == "xno"; then
-  ACIS_LIB_DIR=".";
+  ACIS_LIB_DIR=
+  ACIS_LINK_FLAGS=
 fi
 if test "x$ACIS_DIR" != "xno"; then
   if test "x$CUBIT_DIR" != "xno"; then
@@ -191,6 +192,7 @@
   fi
   CGM_ACIS_LIBS='-lcubit_ACIS'
   ACIS_LIBS="$ACIS_LIBS $ACIS_XLIBS $ACIS_BASE_LIBS"
+  ACIS_LINK_FLAGS='-L$(ACIS_LIB_DIR)'
   ACIS_HEALER="-DACIS_HEALER"
   ACIS_INCLUDES="-I$ACIS_DIR/include"
   ACIS_DEFS='$(ACIS_STEP_TRANSLATOR) $(ACIS_IGES_TRANSLATOR) -DCUBIT_ACIS_VERSION=$(ACIS_VERSION) -DACIS_VERSION=$(ACIS_VERSION) -D$(ACIS_PLATFORM) -DACIS_LOCAL_OPS'
@@ -199,6 +201,7 @@
 fi
 AC_SUBST(ACIS_DEFS)
 AC_SUBST(ACIS_DIR)
+AC_SUBST(ACIS_LINK_FLAGS)
 AC_SUBST(ACIS_LIB_DIR)
 AC_SUBST(ACIS_INCLUDES)
 AC_SUBST(ACIS_LIBS)