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

    r4501 r4522  
    626626LIBOBJS
    627627subdirs
    628 VTKDIR
     628VTK_VERSION
     629VTK_TCL_DIR
    629630TK_VERSION
    630631TK_XLIBSW
     
    684685HAVE_INTTYPES_H
    685686HAVE_FFMPEG_LIBS
     687ENABLE_VTK_DICOM
     688ENABLE_VTK
    686689ENABLE_GUI
    687690ENABLE_LANG
     
    822825with_tclsh
    823826with_vtk
     827enable_vtkdicom
    824828with_matlab
    825829with_octave
     
    14701474  --enable-gui            build code related to the graphical user interface
    14711475                          [default=yes]
     1476  --enable-vtkdicom       Use vtkDICOM package [default=no]
    14721477  --enable-shared         build and link with shared libraries --enable-shared
    14731478  --enable-symbols        build with debugging symbols --disable-symbols
     
    14791484  --with-ffmpeg=DIR       location of ffmpeg [default=yes]
    14801485  --with-tclsh=DIR        location of tclsh [default=yes]
    1481   --with-vtk=DIR          location of vtk library [default=yes]
     1486  --with-vtk=version      VTK library version [default=6.0]
    14821487  --with-matlab=DIR       location of matlab and mex compiler [default=yes]
    14831488  --with-octave=DIR       path of default octave compiler `mkoctfile'
     
    74677472{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vtk" >&5
    74687473$as_echo_n "checking for vtk... " >&6; }
    7469 VTKDIR=""
    7470 
     7474VTK_VERSION=6.0
     7475VTK_TCL_DIR=""
     7476
     7477ENABLE_VTK=
    74717478if test "$with_vtk" != "no" ; then
    7472   if test "$with_vtk" = "yes" ; then
     7479  if test "$with_vtk" != "yes" ; then
     7480    VTK_VERSION=$with_vtk
     7481  fi
     7482  if test "x$with_vtk" != "x" ; then
     7483    ENABLE_VTK=yes
    74737484    for path in \
     7485     $libdir/tcltk \
     7486     $exec_prefix/lib/tcltk \
     7487     $prefix/lib/tcltk \
    74747488     $libdir \
    7475      $prefix/lib/tcltk \
    74767489     $prefix/lib \
    74777490     $exec_prefix/lib \
    74787491     /usr/lib
    74797492    do
    7480       for vtk in $path/vtk-* ; do
    7481         if test -d "${vtk}" ; then
    7482           VTKDIR=${vtk}
    7483         fi
    7484       done
    7485       if test "x${VTKDIR}" != "x" ; then
     7493      if test -d "$path/vtk-$VTK_VERSION" ; then
     7494        VTK_TCL_DIR="$path/vtk-$VTK_VERSION"
     7495      fi
     7496      if test "x${VTK_TCL_DIR}" != "x" ; then
    74867497        break
    74877498      fi
    74887499    done
    74897500  fi
    7490 fi
    7491 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VTKDIR" >&5
    7492 $as_echo "$VTKDIR" >&6; }
     7501else
     7502  if test "${ENABLE_GUI}" = "yes" ; then
     7503    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: VTK missing: Rappture GUI requires VTK for some features" >&5
     7504$as_echo "$as_me: WARNING: VTK missing: Rappture GUI requires VTK for some features" >&2;}
     7505  fi
     7506fi
     7507{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $VTK_TCL_DIR" >&5
     7508$as_echo "$VTK_TCL_DIR" >&6; }
     7509
     7510# Check whether --enable-vtkdicom was given.
     7511if test "${enable_vtkdicom+set}" = set; then :
     7512  enableval=$enable_vtkdicom;
     7513else
     7514  enable_vtkdicom=no
     7515fi
     7516
     7517
     7518{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vtkDICOM" >&5
     7519$as_echo_n "checking for vtkDICOM... " >&6; }
     7520ENABLE_VTK_DICOM=
     7521if test "$enable_vtkdicom" != "no" ; then
     7522    ENABLE_VTK_DICOM="yes"
     7523fi
     7524{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_vtkdicom" >&5
     7525$as_echo "$enable_vtkdicom" >&6; }
    74937526
    74947527
     
    1009910132
    1010010133
     10134
     10135
    1010110136MAKE=${make_command}
     10137
    1010210138
    1010310139
Note: See TracChangeset for help on using the changeset viewer.