Ignore:
Timestamp:
Jul 17, 2014 12:10:30 AM (7 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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3/configure.in

    r4501 r4522  
    186186AC_ARG_WITH(
    187187    [vtk],
    188     [AS_HELP_STRING([--with-vtk[=DIR]],
    189         [location of vtk library @<:@default=yes@:>@])],
     188    [AS_HELP_STRING([--with-vtk[=version]],
     189        [VTK library version @<:@default=6.0@:>@])],
    190190    [],
    191191    [with_vtk=yes])
    192192
    193193AC_MSG_CHECKING([for vtk])
    194 VTKDIR=""
    195 
     194VTK_VERSION=6.0
     195VTK_TCL_DIR=""
     196
     197ENABLE_VTK=
    196198if test "$with_vtk" != "no" ; then
    197   if test "$with_vtk" = "yes" ; then
     199  if test "$with_vtk" != "yes" ; then
     200    VTK_VERSION=$with_vtk
     201  fi
     202  if test "x$with_vtk" != "x" ; then
     203    ENABLE_VTK=yes
    198204    for path in \
     205     $libdir/tcltk \
     206     $exec_prefix/lib/tcltk \
     207     $prefix/lib/tcltk \
    199208     $libdir \
    200      $prefix/lib/tcltk \
    201209     $prefix/lib \
    202210     $exec_prefix/lib \
    203211     /usr/lib
    204212    do
    205       for vtk in $path/vtk-* ; do
    206         if test -d "${vtk}" ; then
    207           VTKDIR=${vtk}
    208         fi
    209       done
    210       if test "x${VTKDIR}" != "x" ; then
     213      if test -d "$path/vtk-$VTK_VERSION" ; then
     214        VTK_TCL_DIR="$path/vtk-$VTK_VERSION"
     215      fi
     216      if test "x${VTK_TCL_DIR}" != "x" ; then
    211217        break
    212218      fi
    213219    done
    214220  fi
    215 fi
    216 AC_MSG_RESULT([$VTKDIR])
     221else
     222  if test "${ENABLE_GUI}" = "yes" ; then
     223    AC_MSG_WARN([VTK missing: Rappture GUI requires VTK for some features])
     224  fi
     225fi
     226AC_MSG_RESULT([$VTK_TCL_DIR])
     227
     228AC_ARG_ENABLE(
     229    [vtkdicom],
     230    [AS_HELP_STRING([--enable-vtkdicom],
     231        [Use vtkDICOM package @<:@default=no@:>@])],
     232    [],
     233    [enable_vtkdicom=no])
     234
     235AC_MSG_CHECKING([for vtkDICOM])
     236ENABLE_VTK_DICOM=
     237if test "$enable_vtkdicom" != "no" ; then
     238    ENABLE_VTK_DICOM="yes"
     239fi
     240AC_MSG_RESULT([$enable_vtkdicom])
    217241
    218242RP_LANG_MATLAB
     
    354378AC_SUBST(ENABLE_LANG)
    355379AC_SUBST(ENABLE_GUI)
     380AC_SUBST(ENABLE_VTK)
     381AC_SUBST(ENABLE_VTK_DICOM)
    356382AC_SUBST(FFMPEG)
    357383AC_SUBST(HAVE_FFMPEG_LIBS)
     
    434460AC_SUBST(TK_XLIBSW)
    435461AC_SUBST(TK_VERSION)
    436 AC_SUBST(VTKDIR)
     462AC_SUBST(VTK_TCL_DIR)
     463AC_SUBST(VTK_VERSION)
    437464AC_SUBST(XSUBPP)
    438465
Note: See TracChangeset for help on using the changeset viewer.