Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1/configure.in

    r4160 r4600  
    1717    [with_rappture=$withval],
    1818    [with_rappture=yes])
    19 
    20 AC_ARG_WITH(
    21     [vtk-includes],
    22     [AS_HELP_STRING([--with-vtk-includes=DIR],
    23         [VTK include files are in DIR])],
    24     [with_vtk_includes=$withval],
    25     [with_vtk_includes=""])
    26 
    27 AC_ARG_WITH(
    28     [vtk-libs],
    29     [AS_HELP_STRING([--with-vtk-libs=DIR],
    30         [VTK libraries are in DIR])],
    31     [with_vtk_libs=$withval],
    32     [with_vtk_libs=""])
    33 
    34 AC_ARG_WITH(
    35     [vtk],
    36     [AS_HELP_STRING([--with-vtk=VERSION],
    37         [Version of VTK required @<:@default=6.1@:>@])],
    38     [with_vtk=$withval],
    39     [with_vtk=""])
    4019
    4120AC_ARG_WITH(
     
    160139fi
    161140
    162 # We are assuming that we're using VTK 6.0
    163 VTK_VERSION=6.1
    164 VTK_LIB_DIR=${libdir}
    165 VTK_INC_DIR=${incdir}
    166 
    167 if test "x$with_vtk_includes" != "x"; then
    168    VTK_INC_DIR=$with_vtk_includes
    169 fi
    170 
    171 if test "x$with_vtk_libs" != "x"; then
    172    VTK_LIB_DIR=$with_vtk_libs
    173 fi
    174 
    175 dnl Prefer our VTK installation over systems. --with-vtk overrides.
    176 if test "x$with_vtk" != "x" ; then
    177    VTK_VERSION=$with_vtk
    178 fi
    179 
    180 if ! test -d "$VTK_INC_DIR/vtk-${VTK_VERSION}" ; then
    181    AC_ERROR([Couldn't find VTK includes])
    182 else
    183    VTK_INC_SPEC="-I${VTK_INC_DIR}/vtk-${VTK_VERSION}"
    184 fi
    185 
    186 save_CPPFLAGS=$CPPFLAGS
    187 CPPFLAGS=$VTK_INC_SPEC
    188 AC_CHECK_HEADERS([vtkSmartPointer.h], [], [AC_MSG_WARN([cannot find vtkSmartPointer.h])])
    189 CPPFLAGS=$save_CPPFLAGS
    190 
    191141AC_CHECK_HEADER([GL/glut.h])
    192142AC_CHECK_HEADER([GL/glew.h])
     
    267217AC_SUBST(TCL_LIB_SPEC)
    268218AC_SUBST(TCL_VERSION)
    269 AC_SUBST(VTK_VERSION)
    270 AC_SUBST(VTK_INC_DIR)
    271 AC_SUBST(VTK_LIB_DIR)
    272219
    273220AC_OUTPUT([
Note: See TracChangeset for help on using the changeset viewer.