Changeset 4467 for branches/1.3/packages/vizservers/configure.in

Timestamp:

Jul 8, 2014 10:11:13 AM (10 years ago)

Author:

ldelgass

Message:

Separate configure for nanovis

File:

• branches/1.3/packages/vizservers/configure.in (modified) (5 diffs)

branches/1.3/packages/vizservers/configure.in

@@ -38 +38 @@
     [with_vtk=$withval],
     [with_vtk=yes])
-
-AC_ARG_WITH(
-    [ffmpeg],
-    [AS_HELP_STRING([--with-ffmpeg[=DIR]],
-      [location of ffmpeg @<:@default=yes@:>@])],
-    [],
-    [with_ffmpeg=yes])
 
 RP_LANG_PYTHON
@@ -114 +107 @@
 #       Tcl headers and library (done)
 #       GL headers and library
-#       GLuT headers and library
 #       GLEW header and library
-#       Cg headers and library
-#       CgGL headers and library
 #       pthread library
 #       ffmpeg headers and library (started)
@@ -204 +194 @@
 CPPFLAGS=$save_CPPFLAGS
 
-AC_CHECK_HEADER([GL/glut.h])
 AC_CHECK_HEADER([GL/glew.h])
 
@@ -214 +203 @@
 save_CPPFLAGS=$CPPFLAGS
 
-
-#--------------------------------------------------------------------
-# search for ffmpeg executable
-#--------------------------------------------------------------------
-if test "${with_ffmpeg}" != "no" ; then
-  if test "${with_ffmpeg}" = "yes" ; then 
-    AC_PATH_PROG(FFMPEG, ffmpeg)
-  else 
-    AC_PATH_PROG(FFMPEG, ffmpeg, [], [${with_ffmpeg}/bin:${with_ffmpeg}])
-  fi 
-  if test "${FFMPEG}x" != "x" ; then
-    AC_DEFINE(HAVE_FFMPEG, 1, [nanovis can use ffmpeg to create videos.])
-  fi
-fi
-
-AC_MSG_CHECKING([for nVidia Cg installation])
-CG_DIR=""
-for dir in \
- /opt/nvidia-cg-toolkit \
- /usr/cg \
- /usr
-do
-  if test -r "$dir/include" ; then
-    CG_DIR=$dir
-    break
-  fi
-done
-AC_MSG_RESULT([${CG_DIR}])
-
-CG_INC_SPEC="-I${CG_DIR}/include"
-
-save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="${CG_INC_SPEC} $CPPFLAGS"
-AC_CHECK_HEADERS([Cg/cgGL.h], [], AC_MSG_WARN([cannot find nVidia Cg headers]))
-CPPFLAGS=$save_CPPFLAGS
-
-CG_LIB_DIR=""
-for dir in \
- /opt/nvidia-cg-toolkit \
- /usr/cg \
- /usr
-do
-  if test -r "$dir/lib" ; then
-    CG_LIB_DIR=$dir/lib
-    break
-  fi
-  if test -r "$dir/lib64" ; then
-    CG_LIB_DIR=$dir/lib64
-    break
-  fi
-done
-
-if test "${CG_LIB_DIR}" = "/usr/lib" ; then
-  CG_INC_SPEC=""
-  CG_LIB_SPEC="-lCg -lCgGL"
-else 
-  CG_LIB_SPEC="-L${CG_LIB_DIR} -lCg -lCgGL"
-  LD_RPATH="$loader_run_path:${CG_LIB_DIR}"
-fi
-
-SUBDIRS="nanoscale nanovis pymolproxy vtkvis"
+SUBDIRS="nanoscale pymolproxy vtkvis"
 
 AC_SUBST(CFLAGS_DEBUG)
 AC_SUBST(CFLAGS_OPTIMIZE)
-AC_SUBST(CG_INC_SPEC)
-AC_SUBST(CG_LIB_SPEC)
-AC_SUBST(FFMPEG)
 AC_SUBST(LD_RPATH)
 AC_SUBST(RP_DIR)
@@ -309 +235 @@
    nanoscale/Makefile \
    nanoscale/renderservers.tcl \
-   nanovis/Doxyfile \
-   nanovis/Makefile \
-   nanovis/graphics/Makefile \
-   nanovis/imgLoaders/Makefile \
-   nanovis/newmat11/Makefile \
-   nanovis/util/Makefile \
-   nanovis/vrmath/Makefile \
    pymolproxy/Makefile \
    vtkvis/Doxyfile \