Changeset 4600 for nanovis/branches/1.1/configure.in

Timestamp:

Aug 1, 2014 11:48:02 PM (7 years ago)

Author:

ldelgass

Message:

Nanovis 1.1 doesn't depend on VTK, so remove VTK search from configure

File:

• nanovis/branches/1.1/configure.in (modified) (3 diffs)

nanovis/branches/1.1/configure.in

@@ -17 +17 @@
     [with_rappture=$withval],
     [with_rappture=yes])
-
-AC_ARG_WITH(
-    [vtk-includes],
-    [AS_HELP_STRING([--with-vtk-includes=DIR],
-        [VTK include files are in DIR])],
-    [with_vtk_includes=$withval],
-    [with_vtk_includes=""])
-
-AC_ARG_WITH(
-    [vtk-libs],
-    [AS_HELP_STRING([--with-vtk-libs=DIR],
-        [VTK libraries are in DIR])],
-    [with_vtk_libs=$withval],
-    [with_vtk_libs=""])
-
-AC_ARG_WITH(
-    [vtk],
-    [AS_HELP_STRING([--with-vtk=VERSION],
-        [Version of VTK required @<:@default=6.1@:>@])],
-    [with_vtk=$withval],
-    [with_vtk=""])
 
 AC_ARG_WITH(
@@ -160 +139 @@
 fi
 
-# We are assuming that we're using VTK 6.0
-VTK_VERSION=6.1
-VTK_LIB_DIR=${libdir}
-VTK_INC_DIR=${incdir}
-
-if test "x$with_vtk_includes" != "x"; then
-   VTK_INC_DIR=$with_vtk_includes
-fi
-
-if test "x$with_vtk_libs" != "x"; then
-   VTK_LIB_DIR=$with_vtk_libs
-fi
-
-dnl Prefer our VTK installation over systems. --with-vtk overrides.
-if test "x$with_vtk" != "x" ; then
-   VTK_VERSION=$with_vtk
-fi
-
-if ! test -d "$VTK_INC_DIR/vtk-${VTK_VERSION}" ; then
-   AC_ERROR([Couldn't find VTK includes])
-else
-   VTK_INC_SPEC="-I${VTK_INC_DIR}/vtk-${VTK_VERSION}"
-fi
-
-save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS=$VTK_INC_SPEC
-AC_CHECK_HEADERS([vtkSmartPointer.h], [], [AC_MSG_WARN([cannot find vtkSmartPointer.h])])
-CPPFLAGS=$save_CPPFLAGS
-
 AC_CHECK_HEADER([GL/glut.h])
 AC_CHECK_HEADER([GL/glew.h])
@@ -267 +217 @@
 AC_SUBST(TCL_LIB_SPEC)
 AC_SUBST(TCL_VERSION)
-AC_SUBST(VTK_VERSION)
-AC_SUBST(VTK_INC_DIR)
-AC_SUBST(VTK_LIB_DIR)
 
 AC_OUTPUT([