Changeset 4600 for nanovis

Timestamp:

Aug 1, 2014 11:48:02 PM (9 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:

• configure (modified) (6 diffs)
• configure.in (modified) (3 diffs)

nanovis/branches/1.1/configure

@@ -624 +624 @@
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-VTK_LIB_DIR
-VTK_INC_DIR
-VTK_VERSION
 TCL_VERSION
 TCL_LIB_SPEC
@@ -701 +698 @@
 with_tcllib
 with_rappture
-with_vtk_includes
-with_vtk_libs
-with_vtk
 with_ffmpeg
 with_statsdir
@@ -1332 +1326 @@
   --with-rappture=DIR     location of rappture files lib/librappture.a and
                           include/rappture.h [default=/usr]
-  --with-vtk-includes=DIR VTK include files are in DIR
-  --with-vtk-libs=DIR     VTK libraries are in DIR
-  --with-vtk=VERSION      Version of VTK required [default=6.1]
   --with-ffmpeg=DIR       location of ffmpeg [default=yes]
   --with-statsdir=DIR     Write statistics in DIR
@@ -2260 +2251 @@
 
 
-# Check whether --with-vtk-includes was given.
-if test "${with_vtk_includes+set}" = set; then :
-  withval=$with_vtk_includes; with_vtk_includes=$withval
-else
-  with_vtk_includes=""
-fi
-
-
-
-# Check whether --with-vtk-libs was given.
-if test "${with_vtk_libs+set}" = set; then :
-  withval=$with_vtk_libs; with_vtk_libs=$withval
-else
-  with_vtk_libs=""
-fi
-
-
-
-# Check whether --with-vtk was given.
-if test "${with_vtk+set}" = set; then :
-  withval=$with_vtk; with_vtk=$withval
-else
-  with_vtk=""
-fi
-
-
-
 # Check whether --with-ffmpeg was given.
 if test "${with_ffmpeg+set}" = set; then :
@@ -4705 +4669 @@
 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
-
-if test "x$with_vtk" != "x" ; then
-   VTK_VERSION=$with_vtk
-fi
-
-if ! test -d "$VTK_INC_DIR/vtk-${VTK_VERSION}" ; then
-   as_fn_error $? "Couldn't find VTK includes" "$LINENO" 5
-else
-   VTK_INC_SPEC="-I${VTK_INC_DIR}/vtk-${VTK_VERSION}"
-fi
-
-save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS=$VTK_INC_SPEC
-for ac_header in vtkSmartPointer.h
-do :
-  ac_fn_cxx_check_header_mongrel "$LINENO" "vtkSmartPointer.h" "ac_cv_header_vtkSmartPointer_h" "$ac_includes_default"
-if test "x$ac_cv_header_vtkSmartPointer_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_VTKSMARTPOINTER_H 1
-_ACEOF
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find vtkSmartPointer.h" >&5
-$as_echo "$as_me: WARNING: cannot find vtkSmartPointer.h" >&2;}
-fi
-
-done
-
-CPPFLAGS=$save_CPPFLAGS
-
 ac_fn_cxx_check_header_mongrel "$LINENO" "GL/glut.h" "ac_cv_header_GL_glut_h" "$ac_includes_default"
 if test "x$ac_cv_header_GL_glut_h" = xyes; then :
@@ -4954 +4876 @@
   LD_RPATH="$loader_run_path:${CG_LIB_DIR}"
 fi
-
-
-
 
 

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([