[cig-commits] r13597 - cs/cigma/trunk/config

[luis at geodynamics.org]

Author: luis
Date: 2008-12-09 18:15:32 -0800 (Tue, 09 Dec 2008)
New Revision: 13597

Modified:
   cs/cigma/trunk/config/cigma_vtk.m4
Log:
Call AC_SUBST on VTK flag variables so we can use them in the makefile

Also, renamed macro to CIGMA_PATH_VTK

Modified: cs/cigma/trunk/config/cigma_vtk.m4
===================================================================
--- cs/cigma/trunk/config/cigma_vtk.m4	2008-12-10 02:15:29 UTC (rev 13596)
+++ cs/cigma/trunk/config/cigma_vtk.m4	2008-12-10 02:15:32 UTC (rev 13597)
@@ -35,11 +35,11 @@
 
 ##############################################################################
 #
-# AM_PATH_VTK([minimum-version], [action-if-found], [action-if-not-found])
+# CIGMA_PATH_VTK([minimum-version], [action-if-found], [action-if-not-found])
 # 
 # NOTE: [minimum-version] must be in the form [X.Y.Z]
 #
-AC_DEFUN([AM_PATH_VTK],[
+AC_DEFUN([CIGMA_PATH_VTK],[
 
     dnl do we want to check for VTK?
     if [[ $with_vtk = "yes" ]]; then
@@ -86,11 +86,15 @@
             VTK_LIBS="-lvtkIO -lvtkDICOMParser -lvtkFiltering -lvtkCommon $VTK_SUPPORT_LIBS -lvtksys"
 
             dnl set VTK c,cpp,ld flags
-            VTK_CFLAGS="-I$VTK_PREFIX/include/vtk$vtk_suffix"
-            VTK_CXXFLAGS="$VTK_CFLAGS"
+            #VTK_CFLAGS="-I$VTK_PREFIX/include/vtk$vtk_suffix"
+            #VTK_CXXFLAGS="$VTK_CFLAGS"
             VTK_INCLUDES="-I$VTK_PREFIX/include/vtk$vtk_suffix"
             VTK_LDFLAGS="-L$VTK_PREFIX/lib/vtk$vtk_suffix -L$VTK_PREFIX/lib64/vtk$vtk_suffix"
 
+            AC_SUBST(VTK_INCLUDES)
+            AC_SUBST(VTK_LDFLAGS)
+            AC_SUBST(VTK_LIBS)
+
             dnl now, eventually check version
             if [[ -n "$1" ]]; then