Changeset 4600 for nanovis/branches


Ignore:
Timestamp:
Aug 2, 2014, 2:48:02 AM (5 years ago)
Author:
ldelgass
Message:

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

Location:
nanovis/branches/1.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1/configure

    r4160 r4600  
    624624ac_subst_vars='LTLIBOBJS
    625625LIBOBJS
    626 VTK_LIB_DIR
    627 VTK_INC_DIR
    628 VTK_VERSION
    629626TCL_VERSION
    630627TCL_LIB_SPEC
     
    701698with_tcllib
    702699with_rappture
    703 with_vtk_includes
    704 with_vtk_libs
    705 with_vtk
    706700with_ffmpeg
    707701with_statsdir
     
    13321326  --with-rappture=DIR     location of rappture files lib/librappture.a and
    13331327                          include/rappture.h [default=/usr]
    1334   --with-vtk-includes=DIR VTK include files are in DIR
    1335   --with-vtk-libs=DIR     VTK libraries are in DIR
    1336   --with-vtk=VERSION      Version of VTK required [default=6.1]
    13371328  --with-ffmpeg=DIR       location of ffmpeg [default=yes]
    13381329  --with-statsdir=DIR     Write statistics in DIR
     
    22602251
    22612252
    2262 # Check whether --with-vtk-includes was given.
    2263 if test "${with_vtk_includes+set}" = set; then :
    2264   withval=$with_vtk_includes; with_vtk_includes=$withval
    2265 else
    2266   with_vtk_includes=""
    2267 fi
    2268 
    2269 
    2270 
    2271 # Check whether --with-vtk-libs was given.
    2272 if test "${with_vtk_libs+set}" = set; then :
    2273   withval=$with_vtk_libs; with_vtk_libs=$withval
    2274 else
    2275   with_vtk_libs=""
    2276 fi
    2277 
    2278 
    2279 
    2280 # Check whether --with-vtk was given.
    2281 if test "${with_vtk+set}" = set; then :
    2282   withval=$with_vtk; with_vtk=$withval
    2283 else
    2284   with_vtk=""
    2285 fi
    2286 
    2287 
    2288 
    22892253# Check whether --with-ffmpeg was given.
    22902254if test "${with_ffmpeg+set}" = set; then :
     
    47054669fi
    47064670
    4707 # We are assuming that we're using VTK 6.0
    4708 VTK_VERSION=6.1
    4709 VTK_LIB_DIR=${libdir}
    4710 VTK_INC_DIR=${incdir}
    4711 
    4712 if test "x$with_vtk_includes" != "x"; then
    4713    VTK_INC_DIR=$with_vtk_includes
    4714 fi
    4715 
    4716 if test "x$with_vtk_libs" != "x"; then
    4717    VTK_LIB_DIR=$with_vtk_libs
    4718 fi
    4719 
    4720 if test "x$with_vtk" != "x" ; then
    4721    VTK_VERSION=$with_vtk
    4722 fi
    4723 
    4724 if ! test -d "$VTK_INC_DIR/vtk-${VTK_VERSION}" ; then
    4725    as_fn_error $? "Couldn't find VTK includes" "$LINENO" 5
    4726 else
    4727    VTK_INC_SPEC="-I${VTK_INC_DIR}/vtk-${VTK_VERSION}"
    4728 fi
    4729 
    4730 save_CPPFLAGS=$CPPFLAGS
    4731 CPPFLAGS=$VTK_INC_SPEC
    4732 for ac_header in vtkSmartPointer.h
    4733 do :
    4734   ac_fn_cxx_check_header_mongrel "$LINENO" "vtkSmartPointer.h" "ac_cv_header_vtkSmartPointer_h" "$ac_includes_default"
    4735 if test "x$ac_cv_header_vtkSmartPointer_h" = xyes; then :
    4736   cat >>confdefs.h <<_ACEOF
    4737 #define HAVE_VTKSMARTPOINTER_H 1
    4738 _ACEOF
    4739 
    4740 else
    4741   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find vtkSmartPointer.h" >&5
    4742 $as_echo "$as_me: WARNING: cannot find vtkSmartPointer.h" >&2;}
    4743 fi
    4744 
    4745 done
    4746 
    4747 CPPFLAGS=$save_CPPFLAGS
    4748 
    47494671ac_fn_cxx_check_header_mongrel "$LINENO" "GL/glut.h" "ac_cv_header_GL_glut_h" "$ac_includes_default"
    47504672if test "x$ac_cv_header_GL_glut_h" = xyes; then :
     
    49544876  LD_RPATH="$loader_run_path:${CG_LIB_DIR}"
    49554877fi
    4956 
    4957 
    4958 
    49594878
    49604879
  • 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.