Changeset 4522 for branches/1.3/configure.in

Timestamp:

Jul 17, 2014, 12:10:30 AM (10 years ago)

Author:

ldelgass

Message:

Revert 4518 and pull in the changes to top level configure from trunk to
fix VTK directories for gui/src/Makefile and TCLLIBPATH in gui/apps

File:

• branches/1.3/configure.in (modified) (3 diffs)

branches/1.3/configure.in

@@ -186 +186 @@
 AC_ARG_WITH(
     [vtk],
-    [AS_HELP_STRING([--with-vtk[=DIR]],
-        [location of vtk library @<:@default=yes@:>@])],
+    [AS_HELP_STRING([--with-vtk[=version]],
+        [VTK library version @<:@default=6.0@:>@])],
     [], 
     [with_vtk=yes])
 
 AC_MSG_CHECKING([for vtk])
-VTKDIR=""
-
+VTK_VERSION=6.0
+VTK_TCL_DIR=""
+
+ENABLE_VTK=
 if test "$with_vtk" != "no" ; then
-  if test "$with_vtk" = "yes" ; then
+  if test "$with_vtk" != "yes" ; then
+    VTK_VERSION=$with_vtk
+  fi
+  if test "x$with_vtk" != "x" ; then
+    ENABLE_VTK=yes
     for path in \
+     $libdir/tcltk \
+     $exec_prefix/lib/tcltk \
+     $prefix/lib/tcltk \
      $libdir \
-     $prefix/lib/tcltk \
      $prefix/lib \
      $exec_prefix/lib \
      /usr/lib
     do
-      for vtk in $path/vtk-* ; do 
-        if test -d "${vtk}" ; then
-          VTKDIR=${vtk}
-        fi
-      done
-      if test "x${VTKDIR}" != "x" ; then
+      if test -d "$path/vtk-$VTK_VERSION" ; then
+        VTK_TCL_DIR="$path/vtk-$VTK_VERSION"
+      fi
+      if test "x${VTK_TCL_DIR}" != "x" ; then
         break
       fi
     done
   fi
-fi
-AC_MSG_RESULT([$VTKDIR])
+else
+  if test "${ENABLE_GUI}" = "yes" ; then
+    AC_MSG_WARN([VTK missing: Rappture GUI requires VTK for some features])
+  fi
+fi
+AC_MSG_RESULT([$VTK_TCL_DIR])
+
+AC_ARG_ENABLE(
+    [vtkdicom],
+    [AS_HELP_STRING([--enable-vtkdicom],
+        [Use vtkDICOM package @<:@default=no@:>@])],
+    [], 
+    [enable_vtkdicom=no])
+
+AC_MSG_CHECKING([for vtkDICOM])
+ENABLE_VTK_DICOM=
+if test "$enable_vtkdicom" != "no" ; then
+    ENABLE_VTK_DICOM="yes"
+fi
+AC_MSG_RESULT([$enable_vtkdicom])
 
 RP_LANG_MATLAB
@@ -354 +378 @@
 AC_SUBST(ENABLE_LANG)
 AC_SUBST(ENABLE_GUI)
+AC_SUBST(ENABLE_VTK)
+AC_SUBST(ENABLE_VTK_DICOM)
 AC_SUBST(FFMPEG)
 AC_SUBST(HAVE_FFMPEG_LIBS)
@@ -434 +460 @@
 AC_SUBST(TK_XLIBSW)
 AC_SUBST(TK_VERSION)
-AC_SUBST(VTKDIR)
+AC_SUBST(VTK_TCL_DIR)
+AC_SUBST(VTK_VERSION)
 AC_SUBST(XSUBPP)