Changeset 4209


Ignore:
Timestamp:
Mar 9, 2014 3:33:17 PM (9 years ago)
Author:
mmc
Message:

Added some useful widgets: 1) Rappture::listbox, which is like the
usual Tk listbox, but adds icons for entries, indent levels for
entries, and a horizontal orientation that is useful when building
file browsers. 2) Rappture::Coverflow, which lets you select images
from an Apple-style coverflow display. 3) XAuth library, which can
be used to call OAuth-style web services.

Also fixed the build system to avoid Vtk stuff when --without-vtk and
--disable-vtkdicom are set.

Location:
trunk
Files:
5 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/configure

    r4156 r4209  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.69 for Rappture 1.4.
     3# Generated by GNU Autoconf 2.68 for Rappture 1.4.
    44#
    55# Report bugs to <rappture@nanohub.org>.
    66#
    77#
    8 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
     8# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
     9# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
     10# Foundation, Inc.
    911#
    1012#
    … …  
    135137(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
    136138
    137 # Use a proper internal environment variable to ensure we don't fall
    138   # into an infinite loop, continuously re-executing ourselves.
    139   if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
    140     _as_can_reexec=no; export _as_can_reexec;
    141     # We cannot yet assume a decent shell, so we have to provide a
    142 # neutralization value for shells without unset; and this also
    143 # works around shells that cannot unset nonexistent variables.
    144 # Preserve -v and -x to the replacement shell.
    145 BASH_ENV=/dev/null
    146 ENV=/dev/null
    147 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
    148 case $- in # ((((
    149   *v*x* | *x*v* ) as_opts=-vx ;;
    150   *v* ) as_opts=-v ;;
    151   *x* ) as_opts=-x ;;
    152   * ) as_opts= ;;
    153 esac
    154 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
    155 # Admittedly, this is quite paranoid, since all the known shells bail
    156 # out after a failed `exec'.
    157 $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
    158 as_fn_exit 255
    159   fi
    160   # We don't want this to propagate to other subprocesses.
    161           { _as_can_reexec=; unset _as_can_reexec;}
    162139if test "x$CONFIG_SHELL" = x; then
    163140  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
    … …  
    193170  exitcode=1; echo positional parameters were not saved.
    194171fi
    195 test x\$exitcode = x0 || exit 1
    196 test -x / || exit 1"
     172test x\$exitcode = x0 || exit 1"
    197173  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
    198174  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
    … …  
    239215
    240216      if test "x$CONFIG_SHELL" != x; then :
    241   export CONFIG_SHELL
    242              # We cannot yet assume a decent shell, so we have to provide a
    243 # neutralization value for shells without unset; and this also
    244 # works around shells that cannot unset nonexistent variables.
    245 # Preserve -v and -x to the replacement shell.
    246 BASH_ENV=/dev/null
    247 ENV=/dev/null
    248 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
    249 case $- in # ((((
    250   *v*x* | *x*v* ) as_opts=-vx ;;
    251   *v* ) as_opts=-v ;;
    252   *x* ) as_opts=-x ;;
    253   * ) as_opts= ;;
    254 esac
    255 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
    256 # Admittedly, this is quite paranoid, since all the known shells bail
    257 # out after a failed `exec'.
    258 $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
    259 exit 255
     217  # We cannot yet assume a decent shell, so we have to provide a
     218        # neutralization value for shells without unset; and this also
     219        # works around shells that cannot unset nonexistent variables.
     220        # Preserve -v and -x to the replacement shell.
     221        BASH_ENV=/dev/null
     222        ENV=/dev/null
     223        (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
     224        export CONFIG_SHELL
     225        case $- in # ((((
     226          *v*x* | *x*v* ) as_opts=-vx ;;
     227          *v* ) as_opts=-v ;;
     228          *x* ) as_opts=-x ;;
     229          * ) as_opts= ;;
     230        esac
     231        exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
    260232fi
    261233
    … …  
    360332
    361333} # as_fn_mkdir_p
    362 
    363 # as_fn_executable_p FILE
    364 # -----------------------
    365 # Test if FILE is an executable regular file.
    366 as_fn_executable_p ()
    367 {
    368   test -f "$1" && test -x "$1"
    369 } # as_fn_executable_p
    370334# as_fn_append VAR VALUE
    371335# ----------------------
    … …  
    489453    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
    490454
    491   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
    492   # already done that, so ensure we don't try to do so again and fall
    493   # in an infinite loop.  This has already happened in practice.
    494   _as_can_reexec=no; export _as_can_reexec
    495455  # Don't try to exec as it changes $[0], causing all sort of problems
    496456  # (the dirname of $[0] is not the place where we might find the
    … …  
    527487    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
    528488    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
    529     # In both cases, we have to default to `cp -pR'.
     489    # In both cases, we have to default to `cp -p'.
    530490    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
    531       as_ln_s='cp -pR'
     491      as_ln_s='cp -p'
    532492  elif ln conf$$.file conf$$ 2>/dev/null; then
    533493    as_ln_s=ln
    534494  else
    535     as_ln_s='cp -pR'
     495    as_ln_s='cp -p'
    536496  fi
    537497else
    538   as_ln_s='cp -pR'
     498  as_ln_s='cp -p'
    539499fi
    540500rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
    … …  
    548508fi
    549509
    550 as_test_x='test -x'
    551 as_executable_p=as_fn_executable_p
     510if test -x / >/dev/null 2>&1; then
     511  as_test_x='test -x'
     512else
     513  if ls -dL / >/dev/null 2>&1; then
     514    as_ls_L_option=L
     515  else
     516    as_ls_L_option=
     517  fi
     518  as_test_x='
     519    eval sh -c '\''
     520      if test -d "$1"; then
     521        test -d "$1/.";
     522      else
     523        case $1 in #(
     524        -*)set "./$1";;
     525        esac;
     526        case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
     527        ???[sx]*):;;*)false;;esac;fi
     528    '\'' sh
     529  '
     530fi
     531as_executable_p=$as_test_x
    552532
    553533# Sed expression to map a string onto a valid CPP name.
    … …  
    686666HAVE_FFMPEG_LIBS
    687667ENABLE_VTK_DICOM
     668ENABLE_VTK
    688669ENABLE_GUI
    689670ENABLE_LANG
    … …  
    13081289  if test "x$build_alias" = x; then
    13091290    cross_compiling=maybe
     1291    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
     1292    If a cross compiler is detected then cross compile mode will be used" >&2
    13101293  elif test "x$build_alias" != "x$host_alias"; then
    13111294    cross_compiling=yes
    … …  
    15791562  cat <<\_ACEOF
    15801563Rappture configure 1.4
    1581 generated by GNU Autoconf 2.69
    1582 
    1583 Copyright (C) 2012 Free Software Foundation, Inc.
     1564generated by GNU Autoconf 2.68
     1565
     1566Copyright (C) 2010 Free Software Foundation, Inc.
    15841567This configure script is free software; the Free Software Foundation
    15851568gives unlimited permission to copy, distribute and modify it.
    … …  
    18121795       } && test -s conftest$ac_exeext && {
    18131796         test "$cross_compiling" = yes ||
    1814          test -x conftest$ac_exeext
     1797         $as_test_x conftest$ac_exeext
    18151798       }; then :
    18161799  ac_retval=0
    … …  
    19251908       } && test -s conftest$ac_exeext && {
    19261909         test "$cross_compiling" = yes ||
    1927          test -x conftest$ac_exeext
     1910         $as_test_x conftest$ac_exeext
    19281911       }; then :
    19291912  ac_retval=0
    … …  
    22292212{
    22302213static int test_array [1 - 2 * !(($2) >= 0)];
    2231 test_array [0] = 0;
    2232 return test_array [0];
     2214test_array [0] = 0
    22332215
    22342216  ;
    … …  
    22462228{
    22472229static int test_array [1 - 2 * !(($2) <= $ac_mid)];
    2248 test_array [0] = 0;
    2249 return test_array [0];
     2230test_array [0] = 0
    22502231
    22512232  ;
    … …  
    22732254{
    22742255static int test_array [1 - 2 * !(($2) < 0)];
    2275 test_array [0] = 0;
    2276 return test_array [0];
     2256test_array [0] = 0
    22772257
    22782258  ;
    … …  
    22902270{
    22912271static int test_array [1 - 2 * !(($2) >= $ac_mid)];
    2292 test_array [0] = 0;
    2293 return test_array [0];
     2272test_array [0] = 0
    22942273
    22952274  ;
    … …  
    23252304{
    23262305static int test_array [1 - 2 * !(($2) <= $ac_mid)];
    2327 test_array [0] = 0;
    2328 return test_array [0];
     2306test_array [0] = 0
    23292307
    23302308  ;
    … …  
    23992377
    24002378It was created by Rappture $as_me 1.4, which was
    2401 generated by GNU Autoconf 2.69.  Invocation command line was
     2379generated by GNU Autoconf 2.68.  Invocation command line was
    24022380
    24032381  $ $0 $@
    … …  
    28492827    for ac_prog in ginstall scoinst install; do
    28502828      for ac_exec_ext in '' $ac_executable_extensions; do
    2851         if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
     2829        if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
    28522830          if test $ac_prog = install &&
    28532831            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
    … …  
    29232901  test -z "$as_dir" && as_dir=.
    29242902    for ac_exec_ext in '' $ac_executable_extensions; do
    2925   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2903  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    29262904    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
    29272905    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    29632941  test -z "$as_dir" && as_dir=.
    29642942    for ac_exec_ext in '' $ac_executable_extensions; do
    2965   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2943  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    29662944    ac_cv_prog_ac_ct_RANLIB="ranlib"
    29672945    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    30223000    for ac_prog in mkdir gmkdir; do
    30233001         for ac_exec_ext in '' $ac_executable_extensions; do
    3024            as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
     3002           { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
    30253003           case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
    30263004             'mkdir (GNU coreutils) '* | \
    … …  
    31063084  test -z "$as_dir" && as_dir=.
    31073085    for ac_exec_ext in '' $ac_executable_extensions; do
    3108   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     3086  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    31093087    ac_cv_prog_CC="${ac_tool_prefix}gcc"
    31103088    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    31463124  test -z "$as_dir" && as_dir=.
    31473125    for ac_exec_ext in '' $ac_executable_extensions; do
    3148   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     3126  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    31493127    ac_cv_prog_ac_ct_CC="gcc"
    31503128    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    31993177  test -z "$as_dir" && as_dir=.
    32003178    for ac_exec_ext in '' $ac_executable_extensions; do
    3201   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     3179  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    32023180    ac_cv_prog_CC="${ac_tool_prefix}cc"
    32033181    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    32403218  test -z "$as_dir" && as_dir=.
    32413219    for ac_exec_ext in '' $ac_executable_extensions; do
    3242   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     3220  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    32433221    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
    32443222       ac_prog_rejected=yes
    … …  
    32983276  test -z "$as_dir" && as_dir=.
    32993277    for ac_exec_ext in '' $ac_executable_extensions; do
    3300   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     3278  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    33013279    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
    33023280    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    33423320  test -z "$as_dir" && as_dir=.
    33433321    for ac_exec_ext in '' $ac_executable_extensions; do
    3344   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     3322  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    33453323    ac_cv_prog_ac_ct_CC="$ac_prog"
    33463324    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    37883766#include <stdarg.h>
    37893767#include <stdio.h>
    3790 struct stat;
     3768#include <sys/types.h>
     3769#include <sys/stat.h>
    37913770/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
    37923771struct buf { int x; };
    … …  
    39013880  test -z "$as_dir" && as_dir=.
    39023881    for ac_exec_ext in '' $ac_executable_extensions; do
    3903   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     3882  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    39043883    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
    39053884    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    39453924  test -z "$as_dir" && as_dir=.
    39463925    for ac_exec_ext in '' $ac_executable_extensions; do
    3947   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     3926  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    39483927    ac_cv_prog_ac_ct_CXX="$ac_prog"
    39493928    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    41544133  test -z "$as_dir" && as_dir=.
    41554134    for ac_exec_ext in '' $ac_executable_extensions; do
    4156   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     4135  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    41574136    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
    41584137    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    41984177  test -z "$as_dir" && as_dir=.
    41994178    for ac_exec_ext in '' $ac_executable_extensions; do
    4200   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     4179  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    42014180    ac_cv_prog_ac_ct_F77="$ac_prog"
    42024181    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    45054484    for ac_exec_ext in '' $ac_executable_extensions; do
    45064485      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
    4507       as_fn_executable_p "$ac_path_GREP" || continue
     4486      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
    45084487# Check for GNU ac_path_GREP and select it if it is found.
    45094488  # Check for GNU $ac_path_GREP
    … …  
    45714550    for ac_exec_ext in '' $ac_executable_extensions; do
    45724551      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
    4573       as_fn_executable_p "$ac_path_EGREP" || continue
     4552      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
    45744553# Check for GNU ac_path_EGREP and select it if it is found.
    45754554  # Check for GNU $ac_path_EGREP
    … …  
    56385617  test -z "$as_dir" && as_dir=.
    56395618    for ac_exec_ext in '' $ac_executable_extensions; do
    5640   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     5619  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    56415620    ac_cv_prog_AR="ar"
    56425621    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    73877366  test -z "$as_dir" && as_dir=.
    73887367    for ac_exec_ext in '' $ac_executable_extensions; do
    7389   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     7368  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    73907369    ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"
    73917370    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    74297408  test -z "$as_dir" && as_dir=.
    74307409    for ac_exec_ext in '' $ac_executable_extensions; do
    7431   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     7410  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    74327411    ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"
    74337412    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    74747453VTK_TCL_DIR=""
    74757454
     7455ENABLE_VTK=no
    74767456if test "$with_vtk" != "no" ; then
    74777457  if test "$with_vtk" != "yes" ; then
    … …  
    74797459  fi
    74807460  if test "x$with_vtk" != "x" ; then
     7461    ENABLE_VTK=yes
    74817462    for path in \
    74827463     $libdir/tcltk \
    … …  
    75567537  test -z "$as_dir" && as_dir=.
    75577538    for ac_exec_ext in '' $ac_executable_extensions; do
    7558   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     7539  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    75597540    ac_cv_path_MATLAB="$as_dir/$ac_word$ac_exec_ext"
    75607541    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    75987579  test -z "$as_dir" && as_dir=.
    75997580    for ac_exec_ext in '' $ac_executable_extensions; do
    7600   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     7581  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    76017582    ac_cv_path_MATLAB="$as_dir/$ac_word$ac_exec_ext"
    76027583    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    76487629  test -z "$as_dir" && as_dir=.
    76497630    for ac_exec_ext in '' $ac_executable_extensions; do
    7650   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     7631  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    76517632    ac_cv_path_MEX="$as_dir/$ac_word$ac_exec_ext"
    76527633    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    76887669  test -z "$as_dir" && as_dir=.
    76897670    for ac_exec_ext in '' $ac_executable_extensions; do
    7690   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     7671  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    76917672    ac_cv_path_MEXEXT="$as_dir/$ac_word$ac_exec_ext"
    76927673    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    77397720  test -z "$as_dir" && as_dir=.
    77407721    for ac_exec_ext in '' $ac_executable_extensions; do
    7741   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     7722  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    77427723    ac_cv_path_MCC="$as_dir/$ac_word$ac_exec_ext"
    77437724    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    78017782  test -z "$as_dir" && as_dir=.
    78027783    for ac_exec_ext in '' $ac_executable_extensions; do
    7803   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     7784  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    78047785    ac_cv_path_OCTAVE="$as_dir/$ac_word$ac_exec_ext"
    78057786    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    78417822  test -z "$as_dir" && as_dir=.
    78427823    for ac_exec_ext in '' $ac_executable_extensions; do
    7843   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     7824  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    78447825    ac_cv_path_MKOCTFILE="$as_dir/$ac_word$ac_exec_ext"
    78457826    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    79287909  test -z "$as_dir" && as_dir=.
    79297910    for ac_exec_ext in '' $ac_executable_extensions; do
    7930   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     7911  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    79317912    ac_cv_path_mkoctfile3="$as_dir/$ac_word$ac_exec_ext"
    79327913    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    79887969  test -z "$as_dir" && as_dir=.
    79897970    for ac_exec_ext in '' $ac_executable_extensions; do
    7990   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     7971  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    79917972    ac_cv_path_mkoctfile2="$as_dir/$ac_word$ac_exec_ext"
    79927973    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    80628043  test -z "$as_dir" && as_dir=.
    80638044    for ac_exec_ext in '' $ac_executable_extensions; do
    8064   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8045  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    80658046    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
    80668047    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    81038084  test -z "$as_dir" && as_dir=.
    81048085    for ac_exec_ext in '' $ac_executable_extensions; do
    8105   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8086  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    81068087    ac_cv_path_XSUBPP="$as_dir/$ac_word$ac_exec_ext"
    81078088    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    81448125  test -z "$as_dir" && as_dir=.
    81458126    for ac_exec_ext in '' $ac_executable_extensions; do
    8146   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8127  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    81478128    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
    81488129    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    81848165  test -z "$as_dir" && as_dir=.
    81858166    for ac_exec_ext in '' $ac_executable_extensions; do
    8186   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8167  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    81878168    ac_cv_path_XSUBPP="$as_dir/$ac_word$ac_exec_ext"
    81888169    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    82668247  test -z "$as_dir" && as_dir=.
    82678248    for ac_exec_ext in '' $ac_executable_extensions; do
    8268   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8249  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    82698250    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
    82708251    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    83088289  test -z "$as_dir" && as_dir=.
    83098290    for ac_exec_ext in '' $ac_executable_extensions; do
    8310   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8291  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    83118292    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
    83128293    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    84298410  test -z "$as_dir" && as_dir=.
    84308411    for ac_exec_ext in '' $ac_executable_extensions; do
    8431   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8412  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    84328413    ac_cv_path_JAVA="$as_dir/$ac_word$ac_exec_ext"
    84338414    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    84698450  test -z "$as_dir" && as_dir=.
    84708451    for ac_exec_ext in '' $ac_executable_extensions; do
    8471   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8452  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    84728453    ac_cv_path_JAVAC="$as_dir/$ac_word$ac_exec_ext"
    84738454    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    85098490  test -z "$as_dir" && as_dir=.
    85108491    for ac_exec_ext in '' $ac_executable_extensions; do
    8511   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8492  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    85128493    ac_cv_path_JAVAH="$as_dir/$ac_word$ac_exec_ext"
    85138494    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    85518532  test -z "$as_dir" && as_dir=.
    85528533    for ac_exec_ext in '' $ac_executable_extensions; do
    8553   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8534  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    85548535    ac_cv_path_JAVA="$as_dir/$ac_word$ac_exec_ext"
    85558536    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    85928573  test -z "$as_dir" && as_dir=.
    85938574    for ac_exec_ext in '' $ac_executable_extensions; do
    8594   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8575  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    85958576    ac_cv_path_JAVAC="$as_dir/$ac_word$ac_exec_ext"
    85968577    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    86338614  test -z "$as_dir" && as_dir=.
    86348615    for ac_exec_ext in '' $ac_executable_extensions; do
    8635   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8616  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    86368617    ac_cv_path_JAVAH="$as_dir/$ac_word$ac_exec_ext"
    86378618    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    87228703  test -z "$as_dir" && as_dir=.
    87238704    for ac_exec_ext in '' $ac_executable_extensions; do
    8724   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8705  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    87258706    ac_cv_path_R="$as_dir/$ac_word$ac_exec_ext"
    87268707    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    87648745  test -z "$as_dir" && as_dir=.
    87658746    for ac_exec_ext in '' $ac_executable_extensions; do
    8766   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8747  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    87678748    ac_cv_path_R="$as_dir/$ac_word$ac_exec_ext"
    87688749    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    95579538  test -z "$as_dir" && as_dir=.
    95589539    for ac_exec_ext in '' $ac_executable_extensions; do
    9559   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     9540  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    95609541    ac_cv_path_FFMPEG="$as_dir/$ac_word$ac_exec_ext"
    95619542    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    95999580  test -z "$as_dir" && as_dir=.
    96009581    for ac_exec_ext in '' $ac_executable_extensions; do
    9601   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     9582  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    96029583    ac_cv_path_FFMPEG="$as_dir/$ac_word$ac_exec_ext"
    96039584    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    … …  
    1011110092  fi
    1011210093fi
     10094
    1011310095
    1011410096
    … …  
    1061810600    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
    1061910601    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
    10620     # In both cases, we have to default to `cp -pR'.
     10602    # In both cases, we have to default to `cp -p'.
    1062110603    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
    10622       as_ln_s='cp -pR'
     10604      as_ln_s='cp -p'
    1062310605  elif ln conf$$.file conf$$ 2>/dev/null; then
    1062410606    as_ln_s=ln
    1062510607  else
    10626     as_ln_s='cp -pR'
     10608    as_ln_s='cp -p'
    1062710609  fi
    1062810610else
    10629   as_ln_s='cp -pR'
     10611  as_ln_s='cp -p'
    1063010612fi
    1063110613rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
    … …  
    1068710669fi
    1068810670
    10689 
    10690 # as_fn_executable_p FILE
    10691 # -----------------------
    10692 # Test if FILE is an executable regular file.
    10693 as_fn_executable_p ()
    10694 {
    10695   test -f "$1" && test -x "$1"
    10696 } # as_fn_executable_p
    10697 as_test_x='test -x'
    10698 as_executable_p=as_fn_executable_p
     10671if test -x / >/dev/null 2>&1; then
     10672  as_test_x='test -x'
     10673else
     10674  if ls -dL / >/dev/null 2>&1; then
     10675    as_ls_L_option=L
     10676  else
     10677    as_ls_L_option=
     10678  fi
     10679  as_test_x='
     10680    eval sh -c '\''
     10681      if test -d "$1"; then
     10682        test -d "$1/.";
     10683      else
     10684        case $1 in #(
     10685        -*)set "./$1";;
     10686        esac;
     10687        case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
     10688        ???[sx]*):;;*)false;;esac;fi
     10689    '\'' sh
     10690  '
     10691fi
     10692as_executable_p=$as_test_x
    1069910693
    1070010694# Sed expression to map a string onto a valid CPP name.
    … …  
    1071810712ac_log="
    1071910713This file was extended by Rappture $as_me 1.4, which was
    10720 generated by GNU Autoconf 2.69.  Invocation command line was
     10714generated by GNU Autoconf 2.68.  Invocation command line was
    1072110715
    1072210716  CONFIG_FILES    = $CONFIG_FILES
    … …  
    1078010774ac_cs_version="\\
    1078110775Rappture config.status 1.4
    10782 configured by $0, generated by GNU Autoconf 2.69,
     10776configured by $0, generated by GNU Autoconf 2.68,
    1078310777  with options \\"\$ac_cs_config\\"
    1078410778
    10785 Copyright (C) 2012 Free Software Foundation, Inc.
     10779Copyright (C) 2010 Free Software Foundation, Inc.
    1078610780This config.status script is free software; the Free Software Foundation
    1078710781gives unlimited permission to copy, distribute and modify it."
    … …  
    1087310867cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
    1087410868if \$ac_cs_recheck; then
    10875   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
     10869  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
    1087610870  shift
    1087710871  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6

  • trunk/configure.in

    r4156 r4209  
    195195VTK_TCL_DIR=""
    196196
     197ENABLE_VTK=no
    197198if test "$with_vtk" != "no" ; then
    198199  if test "$with_vtk" != "yes" ; then
    … …  
    200201  fi
    201202  if test "x$with_vtk" != "x" ; then
     203    ENABLE_VTK=yes
    202204    for path in \
    203205     $libdir/tcltk \
    … …  
    376378AC_SUBST(ENABLE_LANG)
    377379AC_SUBST(ENABLE_GUI)
     380AC_SUBST(ENABLE_VTK)
    378381AC_SUBST(ENABLE_VTK_DICOM)
    379382AC_SUBST(FFMPEG)

  • trunk/gui/scripts/Makefile.in

    r4178 r4209  
    3333                $(srcdir)/controlOwner.tcl \
    3434                $(srcdir)/controls.tcl \
     35                $(srcdir)/coverflow.tcl \
    3536                $(srcdir)/curve.tcl \
    3637                $(srcdir)/datatable.tcl \
    … …  
    115116                $(srcdir)/tooltip.tcl \
    116117                $(srcdir)/tuples.tcl \
     118                $(srcdir)/tweener.tcl \
    117119                $(srcdir)/unirect2d.tcl \
    118120                $(srcdir)/unirect3d.tcl \

  • trunk/gui/src/Makefile.in

    r4128 r4209  
    2727CFLAGS          = @CFLAGS@ -fPIC
    2828TCL_VERSION     = @TCL_VERSION@
     29TCLTK_SRCS      = -I../../../runtime/tcl8.4.19/generic -I../../../runtime/tk8.4.19/generic -I../../../runtime/tk8.4.19/unix
    2930TCL_LIB_SPEC    = @TCL_LIB_SPEC@
    3031TK_LIB_SPEC     = @TK_LIB_SPEC@
    3132TK_XLIBSW       = @TK_XLIBSW@
    3233VTK_VERSION     = @VTK_VERSION@
     34VTK_TCL_DIR     = @VTK_TCL_DIR@
    3335ENABLE_VTK_DICOM= @ENABLE_VTK_DICOM@
    34 VTK_LIB_SPEC    = -lvtkIOCore-$(VTK_VERSION) -lvtkIOLegacy-$(VTK_VERSION) -lvtkIOImage-$(VTK_VERSION) -lvtkCommonCore-$(VTK_VERSION)
     36VTK_LIB_SPEC    =
    3537
    3638CC_SWITCHES     = $(SHLIB_CFLAGS) $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
    … …  
    4244version         = @PACKAGE_VERSION@
    4345DEFINES         = -DPACKAGE_VERSION=\"$(version)\"
    44 
    45 ifeq ($(ENABLE_VTK_DICOM),yes)
    46 VTK_LIB_SPEC    += -lvtkDICOM
    47 DEFINES         += -DUSE_VTK_DICOM_PACKAGE
    48 endif
    4946
    5047RANLIB          = @RANLIB@
    … …  
    6259                RpCanvHotspot.o \
    6360                RpCanvPlacard.o \
    64                 RpDicomToVtk.o \
    6561                RpDiffview.o \
    6662                RpReadPoints.o \
    67                 RpDxToVtk.o \
    68                 RpPdbToVtk.o
     63                RpListbox.o \
     64                RpSqueezer.o
     65
     66ifneq ($(VTK_TCL_DIR),)
     67  OBJS += RpDxToVtk.o RpPdbToVtk.o
     68  VTK_LIB_SPEC += -lvtkIOCore-$(VTK_VERSION) -lvtkIOLegacy-$(VTK_VERSION) -lvtkIOImage-$(VTK_VERSION) -lvtkCommonCore-$(VTK_VERSION)
     69
     70  ifeq ($(ENABLE_VTK_DICOM),yes)
     71    OBJS += RpDicomToVtk.o
     72    VTK_LIB_SPEC += -lvtkDICOM
     73    DEFINES      += -DUSE_VTK_DICOM_PACKAGE
     74  endif
     75endif
     76
    6977
    7078name            = RapptureGUI$(version)
    … …  
    8391        $(INSTALL) -m 555 $(lib) $(destdir)
    8492
     93RpListbox.o: RpListbox.c
     94        $(CC) $(CC_SWITCHES) $(TCLTK_SRCS) -c $?
    8595.cc.o:
    8696        $(CXX) $(CXX_SWITCHES) -c $?

  • trunk/gui/src/RapptureGUI_Init.c

    r4118 r4209  
    2525extern Tcl_AppInitProc RpCanvHotspot_Init;
    2626extern Tcl_AppInitProc RpCanvPlacard_Init;
    27 extern Tcl_AppInitProc RpDicomToVtk_Init;
     27extern Tcl_AppInitProc RpDiffview_Init;
     28extern Tcl_AppInitProc RpListbox_Init;
     29extern Tcl_AppInitProc RpReadPoints_Init;
     30extern Tcl_AppInitProc RpSqueezer_Init;
     31
     32#ifdef ENABLE_VTK
    2833extern Tcl_AppInitProc RpDxToVtk_Init;
    2934extern Tcl_AppInitProc RpPdbToVtk_Init;
    30 extern Tcl_AppInitProc RpDiffview_Init;
    31 extern Tcl_AppInitProc RpReadPoints_Init;
     35#ifdef ENABLE_VTK_DICOM
     36extern Tcl_AppInitProc RpDicomToVtk_Init;
     37#endif
     38#endif
    3239
    3340#ifdef BUILD_Rappture
    … …  
    5057        return TCL_ERROR;
    5158    }
    52     if (RpDicomToVtk_Init(interp) != TCL_OK) {
     59    if (RpListbox_Init(interp) != TCL_OK) {
    5360        return TCL_ERROR;
    5461    }
     62    if (RpReadPoints_Init(interp) != TCL_OK) {
     63        return TCL_ERROR;
     64    }
     65    if (RpSqueezer_Init(interp) != TCL_OK) {
     66        return TCL_ERROR;
     67    }
     68    if (RpCanvHotspot_Init(interp) != TCL_OK) {
     69        return TCL_ERROR;
     70    }
     71#ifdef ENABLE_VTK
    5572    if (RpDxToVtk_Init(interp) != TCL_OK) {
    5673        return TCL_ERROR;
    … …  
    5976        return TCL_ERROR;
    6077    }
    61     if (RpReadPoints_Init(interp) != TCL_OK) {
     78#ifdef ENABLE_VTK_DICOM
     79    if (RpDicomToVtk_Init(interp) != TCL_OK) {
    6280        return TCL_ERROR;
    6381    }
    64     if (RpCanvHotspot_Init(interp) != TCL_OK) {
    65         return TCL_ERROR;
    66     }
     82#endif
     83#endif
    6784    return TCL_OK;
    6885}

  • trunk/lang/tcl/scripts/Makefile.in

    r4127 r4209  
    4646                $(srcdir)/result.tcl \
    4747                $(srcdir)/task.tcl \
    48                 $(srcdir)/units.tcl
     48                $(srcdir)/units.tcl \
     49                $(srcdir)/xauth.tcl
    4950
    5051OBJECTS         = \
Note: See TracChangeset for help on using the changeset viewer.