Changeset 2120 for branches


Ignore:
Timestamp:
Mar 8, 2011 10:27:00 AM (13 years ago)
Author:
gah
Message:
 
Location:
branches/blt4/packages/vizservers
Files:
30 added
25 edited

Legend:

Unmodified
Added
Removed

  • branches/blt4/packages/vizservers/Makefile.in

    r1948 r2120  
    1818VPATH           = $(srcdir)
    1919
    20 SUBDIRS         = nanoscale nanovis pymolproxy
     20SUBDIRS         = @SUBDIRS@
    2121FILES           = \
    2222                start_viz.sh
    2323
    24 .PHONY: nanoscale nanovis pymolproxy
     24.PHONY: $(SUBDIRS)
    2525
    2626all:

  • branches/blt4/packages/vizservers/configure

    r1874 r2120  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.65 for vizservers 0.1.
     3# Generated by GNU Autoconf 2.68 for vizservers 0.1.
    44#
    55# Report bugs to <rappture@nanohub.org>.
    … …  
    77#
    88# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
    9 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
    10 # Inc.
     9# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
     10# Foundation, Inc.
    1111#
    1212#
    … …  
    9292
    9393# Find who we are.  Look in the path if we contain no directory separator.
     94as_myself=
    9495case $0 in #((
    9596  *[\\/]* ) as_myself=$0 ;;
    … …  
    217218        # neutralization value for shells without unset; and this also
    218219        # works around shells that cannot unset nonexistent variables.
     220        # Preserve -v and -x to the replacement shell.
    219221        BASH_ENV=/dev/null
    220222        ENV=/dev/null
    221223        (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
    222224        export CONFIG_SHELL
    223         exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
     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+"$@"}
    224232fi
    225233
    … …  
    320328    done
    321329    test -z "$as_dirs" || eval "mkdir $as_dirs"
    322   } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
     330  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
    323331
    324332
    … …  
    360368
    361369
    362 # as_fn_error ERROR [LINENO LOG_FD]
    363 # ---------------------------------
     370# as_fn_error STATUS ERROR [LINENO LOG_FD]
     371# ----------------------------------------
    364372# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    365373# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
    366 # script with status $?, using 1 if that was 0.
     374# script with STATUS, using 1 if that was 0.
    367375as_fn_error ()
    368376{
    369   as_status=$?; test $as_status -eq 0 && as_status=1
    370   if test "$3"; then
    371     as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    372     $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
     377  as_status=$1; test $as_status -eq 0 && as_status=1
     378  if test "$4"; then
     379    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     380    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
    373381  fi
    374   $as_echo "$as_me: error: $1" >&2
     382  $as_echo "$as_me: error: $2" >&2
    375383  as_fn_exit $as_status
    376384} # as_fn_error
    … …  
    534542
    535543# Name of the host.
    536 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
     544# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
    537545# so uname gets run too.
    538546ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
    … …  
    598606LD_RPATH
    599607CG_DIR
     608FF_INC_SPEC
    600609DX_LIB_SPEC
    601610DX_INC_SPEC
     611VTK_LIB_DIR
     612VTK_INC_SPEC
    602613RP_DIR
    603614RP2_INCL_DIR
    … …  
    620631INSTALL_SCRIPT
    621632INSTALL_PROGRAM
     633XMKMF
    622634SHLIB_LDFLAGS
    623635INSTALL_STUB_LIB
    … …  
    697709ac_user_opts='
    698710enable_option_checking
     711with_tcllib
     712with_rappture
     713with_vtk_includes
     714with_vtk_libs
    699715enable_64bit
    700716enable_64bit_vis
    701717enable_corefoundation
    702718enable_load
    703 with_tcllib
    704 with_rappture
     719with_x
    705720'
    706721      ac_precious_vars='build_alias
    … …  
    713728CPPFLAGS
    714729CPP
     730XMKMF
    715731CXX
    716732CXXFLAGS
    … …  
    779795
    780796  case $ac_option in
    781   *=*)  ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
    782   *)    ac_optarg=yes ;;
     797  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
     798  *=)   ac_optarg= ;;
     799  *)    ac_optarg=yes ;;
    783800  esac
    784801
    … …  
    825842    # Reject names that are not valid shell variable names.
    826843    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
    827       as_fn_error "invalid feature name: $ac_useropt"
     844      as_fn_error $? "invalid feature name: $ac_useropt"
    828845    ac_useropt_orig=$ac_useropt
    829846    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    851868    # Reject names that are not valid shell variable names.
    852869    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
    853       as_fn_error "invalid feature name: $ac_useropt"
     870      as_fn_error $? "invalid feature name: $ac_useropt"
    854871    ac_useropt_orig=$ac_useropt
    855872    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10551072    # Reject names that are not valid shell variable names.
    10561073    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
    1057       as_fn_error "invalid package name: $ac_useropt"
     1074      as_fn_error $? "invalid package name: $ac_useropt"
    10581075    ac_useropt_orig=$ac_useropt
    10591076    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10711088    # Reject names that are not valid shell variable names.
    10721089    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
    1073       as_fn_error "invalid package name: $ac_useropt"
     1090      as_fn_error $? "invalid package name: $ac_useropt"
    10741091    ac_useropt_orig=$ac_useropt
    10751092    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    11011118    x_libraries=$ac_optarg ;;
    11021119
    1103   -*) as_fn_error "unrecognized option: \`$ac_option'
    1104 Try \`$0 --help' for more information."
     1120  -*) as_fn_error $? "unrecognized option: \`$ac_option'
     1121Try \`$0 --help' for more information"
    11051122    ;;
    11061123
    … …  
    11101127    case $ac_envvar in #(
    11111128      '' | [0-9]* | *[!_$as_cr_alnum]* )
    1112       as_fn_error "invalid variable name: \`$ac_envvar'" ;;
     1129      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
    11131130    esac
    11141131    eval $ac_envvar=\$ac_optarg
    … …  
    11201137    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
    11211138      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
    1122     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     1139    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
    11231140    ;;
    11241141
    … …  
    11281145if test -n "$ac_prev"; then
    11291146  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
    1130   as_fn_error "missing argument to $ac_option"
     1147  as_fn_error $? "missing argument to $ac_option"
    11311148fi
    11321149
    … …  
    11341151  case $enable_option_checking in
    11351152    no) ;;
    1136     fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
     1153    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
    11371154    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    11381155  esac
    … …  
    11571174    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    11581175  esac
    1159   as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
     1176  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
    11601177done
    11611178
    … …  
    11711188  if test "x$build_alias" = x; then
    11721189    cross_compiling=maybe
    1173     $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
    1174     If a cross compiler is detected then cross compile mode will be used." >&2
     1190    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
     1191    If a cross compiler is detected then cross compile mode will be used" >&2
    11751192  elif test "x$build_alias" != "x$host_alias"; then
    11761193    cross_compiling=yes
    … …  
    11871204ac_ls_di=`ls -di .` &&
    11881205ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
    1189   as_fn_error "working directory cannot be determined"
     1206  as_fn_error $? "working directory cannot be determined"
    11901207test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
    1191   as_fn_error "pwd does not report name of working directory"
     1208  as_fn_error $? "pwd does not report name of working directory"
    11921209
    11931210
    … …  
    12281245if test ! -r "$srcdir/$ac_unique_file"; then
    12291246  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
    1230   as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
     1247  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
    12311248fi
    12321249ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
    12331250ac_abs_confdir=`(
    1234         cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
     1251        cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
    12351252        pwd)`
    12361253# When building in place, set srcdir=.
    … …  
    12721289      --help=recursive    display the short help of all the included packages
    12731290  -V, --version           display version information and exit
    1274   -q, --quiet, --silent   do not print \`checking...' messages
     1291  -q, --quiet, --silent   do not print \`checking ...' messages
    12751292      --cache-file=FILE   cache test results in FILE [disabled]
    12761293  -C, --config-cache      alias for \`--cache-file=config.cache'
    … …  
    13141331
    13151332  cat <<\_ACEOF
     1333
     1334X features:
     1335  --x-includes=DIR    X include files are in DIR
     1336  --x-libraries=DIR   X library files are in DIR
    13161337_ACEOF
    13171338fi
    … …  
    13391360  --with-rappture=DIR     location of rappture files lib/librappture2.a and
    13401361                          include/rappture2/rappture2.h [default=/usr]
     1362  --with-vtk-includes=DIR VTK include files are in DIR
     1363  --with-vtk-libs=DIR     VTK libraries are in DIR
     1364  --with-x                use the X Window System
    13411365
    13421366Some influential environment variables:
    … …  
    13491373              you have headers in a nonstandard directory <include dir>
    13501374  CPP         C preprocessor
     1375  XMKMF       Path to xmkmf, Makefile generator for X Window System
    13511376  CXX         C++ compiler command
    13521377  CXXFLAGS    C++ compiler flags
    … …  
    14201445  cat <<\_ACEOF
    14211446vizservers configure 0.1
    1422 generated by GNU Autoconf 2.65
    1423 
    1424 Copyright (C) 2009 Free Software Foundation, Inc.
     1447generated by GNU Autoconf 2.68
     1448
     1449Copyright (C) 2010 Free Software Foundation, Inc.
    14251450This configure script is free software; the Free Software Foundation
    14261451gives unlimited permission to copy, distribute and modify it.
    … …  
    14661491        ac_retval=1
    14671492fi
    1468   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1493  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    14691494  as_fn_set_status $ac_retval
    14701495
    … …  
    15121537  # left behind by Apple's compiler.  We do this before executing the actions.
    15131538  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
    1514   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1539  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    15151540  as_fn_set_status $ac_retval
    15161541
    … …  
    15381563  fi
    15391564  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1540   test $ac_status = 0; } >/dev/null && {
     1565  test $ac_status = 0; } > conftest.i && {
    15411566         test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
    15421567         test ! -s conftest.err
    … …  
    15491574    ac_retval=1
    15501575fi
    1551   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1576  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    15521577  as_fn_set_status $ac_retval
    15531578
    … …  
    15621587{
    15631588  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    1564   if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     1589  if eval \${$3+:} false; then :
    15651590  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    15661591$as_echo_n "checking for $2... " >&6; }
    1567 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     1592if eval \${$3+:} false; then :
    15681593  $as_echo_n "(cached) " >&6
    15691594fi
    … …  
    16011626  ac_header_preproc=no
    16021627fi
    1603 rm -f conftest.err conftest.$ac_ext
     1628rm -f conftest.err conftest.i conftest.$ac_ext
    16041629{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
    16051630$as_echo "$ac_header_preproc" >&6; }
    … …  
    16241649    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
    16251650$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
    1626 ( cat <<\_ASBOX
    1627 ## ----------------------------------- ##
     1651( $as_echo "## ----------------------------------- ##
    16281652## Report this to rappture@nanohub.org ##
    1629 ## ----------------------------------- ##
    1630 _ASBOX
     1653## ----------------------------------- ##"
    16311654     ) | sed "s/^/$as_me: WARNING:     /" >&2
    16321655    ;;
    … …  
    16341657  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    16351658$as_echo_n "checking for $2... " >&6; }
    1636 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     1659if eval \${$3+:} false; then :
    16371660  $as_echo_n "(cached) " >&6
    16381661else
    … …  
    16431666$as_echo "$ac_res" >&6; }
    16441667fi
    1645   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1668  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    16461669
    16471670} # ac_fn_c_check_header_mongrel
    … …  
    16841707fi
    16851708  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
    1686   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1709  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    16871710  as_fn_set_status $ac_retval
    16881711
    … …  
    16981721  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    16991722$as_echo_n "checking for $2... " >&6; }
    1700 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     1723if eval \${$3+:} false; then :
    17011724  $as_echo_n "(cached) " >&6
    17021725else
    … …  
    17161739               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
    17171740$as_echo "$ac_res" >&6; }
    1718   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1741  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    17191742
    17201743} # ac_fn_c_check_header_compile
    … …  
    17531776        ac_retval=1
    17541777fi
    1755   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1778  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    17561779  as_fn_set_status $ac_retval
    17571780
    … …  
    17791802  fi
    17801803  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1781   test $ac_status = 0; } >/dev/null && {
     1804  test $ac_status = 0; } > conftest.i && {
    17821805         test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
    17831806         test ! -s conftest.err
    … …  
    17901813    ac_retval=1
    17911814fi
    1792   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1815  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    17931816  as_fn_set_status $ac_retval
    17941817
    … …  
    18321855fi
    18331856  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
    1834   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1857  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    18351858  as_fn_set_status $ac_retval
    18361859
    … …  
    20102033
    20112034  fi
    2012   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     2035  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    20132036  as_fn_set_status $ac_retval
    20142037
    … …  
    20232046{
    20242047  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    2025   if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     2048  if eval \${$3+:} false; then :
    20262049  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    20272050$as_echo_n "checking for $2... " >&6; }
    2028 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     2051if eval \${$3+:} false; then :
    20292052  $as_echo_n "(cached) " >&6
    20302053fi
    … …  
    20622085  ac_header_preproc=no
    20632086fi
    2064 rm -f conftest.err conftest.$ac_ext
     2087rm -f conftest.err conftest.i conftest.$ac_ext
    20652088{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
    20662089$as_echo "$ac_header_preproc" >&6; }
    … …  
    20852108    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
    20862109$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
    2087 ( cat <<\_ASBOX
    2088 ## ----------------------------------- ##
     2110( $as_echo "## ----------------------------------- ##
    20892111## Report this to rappture@nanohub.org ##
    2090 ## ----------------------------------- ##
    2091 _ASBOX
     2112## ----------------------------------- ##"
    20922113     ) | sed "s/^/$as_me: WARNING:     /" >&2
    20932114    ;;
    … …  
    20952116  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    20962117$as_echo_n "checking for $2... " >&6; }
    2097 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     2118if eval \${$3+:} false; then :
    20982119  $as_echo_n "(cached) " >&6
    20992120else
    … …  
    21042125$as_echo "$ac_res" >&6; }
    21052126fi
    2106   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     2127  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    21072128
    21082129} # ac_fn_cxx_check_header_mongrel
    2109 
    2110 # ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES
    2111 # ---------------------------------------------------------
    2112 # Tests whether HEADER exists and can be compiled using the include files in
    2113 # INCLUDES, setting the cache variable VAR accordingly.
    2114 ac_fn_cxx_check_header_compile ()
    2115 {
    2116   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    2117   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    2118 $as_echo_n "checking for $2... " >&6; }
    2119 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    2120   $as_echo_n "(cached) " >&6
    2121 else
    2122   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    2123 /* end confdefs.h.  */
    2124 $4
    2125 #include <$2>
    2126 _ACEOF
    2127 if ac_fn_cxx_try_compile "$LINENO"; then :
    2128   eval "$3=yes"
    2129 else
    2130   eval "$3=no"
    2131 fi
    2132 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    2133 fi
    2134 eval ac_res=\$$3
    2135                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
    2136 $as_echo "$ac_res" >&6; }
    2137   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    2138 
    2139 } # ac_fn_cxx_check_header_compile
    21402130
    21412131# ac_fn_cxx_try_link LINENO
    … …  
    21802170  # left behind by Apple's compiler.  We do this before executing the actions.
    21812171  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
    2182   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     2172  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    21832173  as_fn_set_status $ac_retval
    21842174
    21852175} # ac_fn_cxx_try_link
     2176
     2177# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES
     2178# ---------------------------------------------------------
     2179# Tests whether HEADER exists and can be compiled using the include files in
     2180# INCLUDES, setting the cache variable VAR accordingly.
     2181ac_fn_cxx_check_header_compile ()
     2182{
     2183  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     2184  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
     2185$as_echo_n "checking for $2... " >&6; }
     2186if eval \${$3+:} false; then :
     2187  $as_echo_n "(cached) " >&6
     2188else
     2189  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     2190/* end confdefs.h.  */
     2191$4
     2192#include <$2>
     2193_ACEOF
     2194if ac_fn_cxx_try_compile "$LINENO"; then :
     2195  eval "$3=yes"
     2196else
     2197  eval "$3=no"
     2198fi
     2199rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     2200fi
     2201eval ac_res=\$$3
     2202               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
     2203$as_echo "$ac_res" >&6; }
     2204  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
     2205
     2206} # ac_fn_cxx_check_header_compile
    21862207
    21872208# ac_fn_cxx_check_func LINENO FUNC VAR
    … …  
    21932214  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    21942215$as_echo_n "checking for $2... " >&6; }
    2195 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     2216if eval \${$3+:} false; then :
    21962217  $as_echo_n "(cached) " >&6
    21972218else
    … …  
    22482269               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
    22492270$as_echo "$ac_res" >&6; }
    2250   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     2271  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    22512272
    22522273} # ac_fn_cxx_check_func
    … …  
    22562277
    22572278It was created by vizservers $as_me 0.1, which was
    2258 generated by GNU Autoconf 2.65.  Invocation command line was
     2279generated by GNU Autoconf 2.68.  Invocation command line was
    22592280
    22602281  $ $0 $@
    … …  
    23662387    echo
    23672388
    2368     cat <<\_ASBOX
    2369 ## ---------------- ##
     2389    $as_echo "## ---------------- ##
    23702390## Cache variables. ##
    2371 ## ---------------- ##
    2372 _ASBOX
     2391## ---------------- ##"
    23732392    echo
    23742393    # The following way of writing the cache mishandles newlines in values,
    … …  
    24042423    echo
    24052424
    2406     cat <<\_ASBOX
    2407 ## ----------------- ##
     2425    $as_echo "## ----------------- ##
    24082426## Output variables. ##
    2409 ## ----------------- ##
    2410 _ASBOX
     2427## ----------------- ##"
    24112428    echo
    24122429    for ac_var in $ac_subst_vars
    … …  
    24212438
    24222439    if test -n "$ac_subst_files"; then
    2423       cat <<\_ASBOX
    2424 ## ------------------- ##
     2440      $as_echo "## ------------------- ##
    24252441## File substitutions. ##
    2426 ## ------------------- ##
    2427 _ASBOX
     2442## ------------------- ##"
    24282443      echo
    24292444      for ac_var in $ac_subst_files
    … …  
    24392454
    24402455    if test -s confdefs.h; then
    2441       cat <<\_ASBOX
    2442 ## ----------- ##
     2456      $as_echo "## ----------- ##
    24432457## confdefs.h. ##
    2444 ## ----------- ##
    2445 _ASBOX
     2458## ----------- ##"
    24462459      echo
    24472460      cat confdefs.h
    … …  
    24982511ac_site_file2=NONE
    24992512if test -n "$CONFIG_SITE"; then
    2500   ac_site_file1=$CONFIG_SITE
     2513  # We do not want a PATH search for config.site.
     2514  case $CONFIG_SITE in #((
     2515    -*)  ac_site_file1=./$CONFIG_SITE;;
     2516    */*) ac_site_file1=$CONFIG_SITE;;
     2517    *)   ac_site_file1=./$CONFIG_SITE;;
     2518  esac
    25012519elif test "x$prefix" != xNONE; then
    25022520  ac_site_file1=$prefix/share/config.site
    … …  
    25132531$as_echo "$as_me: loading site script $ac_site_file" >&6;}
    25142532    sed 's/^/| /' "$ac_site_file" >&5
    2515     . "$ac_site_file"
     2533    . "$ac_site_file" \
     2534      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     2535$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     2536as_fn_error $? "failed to load site script $ac_site_file
     2537See \`config.log' for more details" "$LINENO" 5; }
    25162538  fi
    25172539done
    … …  
    25892611  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
    25902612$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
    2591   as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
     2613  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
    25922614fi
    25932615## -------------------- ##
    … …  
    26032625
    26042626ac_config_headers="$ac_config_headers nanovis/nvconf.h nanoscale/config.h"
     2627
     2628
     2629
     2630# Check whether --with-tcllib was given.
     2631if test "${with_tcllib+set}" = set; then :
     2632  withval=$with_tcllib; with_tcllib=$withval
     2633else
     2634  with_tcllib=""
     2635fi
     2636
     2637
     2638
     2639# Check whether --with-rappture was given.
     2640if test "${with_rappture+set}" = set; then :
     2641  withval=$with_rappture; with_rappture=$withval
     2642else
     2643  with_rappture=/usr
     2644fi
     2645
     2646
     2647
     2648# Check whether --with-vtk-includes was given.
     2649if test "${with_vtk_includes+set}" = set; then :
     2650  withval=$with_vtk_includes; with_vtk_includes=$withval
     2651else
     2652  with_vtk_includes=/usr/include/vtk-5.6
     2653fi
     2654
     2655
     2656
     2657# Check whether --with-vtk-libs was given.
     2658if test "${with_vtk_libs+set}" = set; then :
     2659  withval=$with_vtk_libs; with_vtk_libs=$withval
     2660else
     2661  with_vtk_libs=/usr/lib/vtk-5.6
     2662fi
    26052663
    26062664
    … …  
    26352693{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    26362694$as_echo_n "checking for $ac_word... " >&6; }
    2637 if test "${ac_cv_prog_CC+set}" = set; then :
     2695if ${ac_cv_prog_CC+:} false; then :
    26382696  $as_echo_n "(cached) " >&6
    26392697else
    … …  
    26752733{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    26762734$as_echo_n "checking for $ac_word... " >&6; }
    2677 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
     2735if ${ac_cv_prog_ac_ct_CC+:} false; then :
    26782736  $as_echo_n "(cached) " >&6
    26792737else
    … …  
    27282786{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    27292787$as_echo_n "checking for $ac_word... " >&6; }
    2730 if test "${ac_cv_prog_CC+set}" = set; then :
     2788if ${ac_cv_prog_CC+:} false; then :
    27312789  $as_echo_n "(cached) " >&6
    27322790else
    … …  
    27682826{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    27692827$as_echo_n "checking for $ac_word... " >&6; }
    2770 if test "${ac_cv_prog_CC+set}" = set; then :
     2828if ${ac_cv_prog_CC+:} false; then :
    27712829  $as_echo_n "(cached) " >&6
    27722830else
    … …  
    28272885{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    28282886$as_echo_n "checking for $ac_word... " >&6; }
    2829 if test "${ac_cv_prog_CC+set}" = set; then :
     2887if ${ac_cv_prog_CC+:} false; then :
    28302888  $as_echo_n "(cached) " >&6
    28312889else
    … …  
    28712929{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    28722930$as_echo_n "checking for $ac_word... " >&6; }
    2873 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
     2931if ${ac_cv_prog_ac_ct_CC+:} false; then :
    28742932  $as_echo_n "(cached) " >&6
    28752933else
    … …  
    29252983test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    29262984$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2927 as_fn_error "no acceptable C compiler found in \$PATH
    2928 See \`config.log' for more details." "$LINENO" 5; }
     2985as_fn_error $? "no acceptable C compiler found in \$PATH
     2986See \`config.log' for more details" "$LINENO" 5; }
    29292987
    29302988# Provide some information about the compiler.
    … …  
    30403098{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    30413099$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3042 { as_fn_set_status 77
    3043 as_fn_error "C compiler cannot create executables
    3044 See \`config.log' for more details." "$LINENO" 5; }; }
     3100as_fn_error 77 "C compiler cannot create executables
     3101See \`config.log' for more details" "$LINENO" 5; }
    30453102else
    30463103  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    … …  
    30843141  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    30853142$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3086 as_fn_error "cannot compute suffix of executables: cannot compile and link
    3087 See \`config.log' for more details." "$LINENO" 5; }
     3143as_fn_error $? "cannot compute suffix of executables: cannot compile and link
     3144See \`config.log' for more details" "$LINENO" 5; }
    30883145fi
    30893146rm -f conftest conftest$ac_cv_exeext
    … …  
    31423199        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    31433200$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3144 as_fn_error "cannot run C compiled programs.
     3201as_fn_error $? "cannot run C compiled programs.
    31453202If you meant to cross compile, use \`--host'.
    3146 See \`config.log' for more details." "$LINENO" 5; }
     3203See \`config.log' for more details" "$LINENO" 5; }
    31473204    fi
    31483205  fi
    … …  
    31553212{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
    31563213$as_echo_n "checking for suffix of object files... " >&6; }
    3157 if test "${ac_cv_objext+set}" = set; then :
     3214if ${ac_cv_objext+:} false; then :
    31583215  $as_echo_n "(cached) " >&6
    31593216else
    … …  
    31953252{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    31963253$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3197 as_fn_error "cannot compute suffix of object files: cannot compile
    3198 See \`config.log' for more details." "$LINENO" 5; }
     3254as_fn_error $? "cannot compute suffix of object files: cannot compile
     3255See \`config.log' for more details" "$LINENO" 5; }
    31993256fi
    32003257rm -f conftest.$ac_cv_objext conftest.$ac_ext
    … …  
    32063263{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
    32073264$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
    3208 if test "${ac_cv_c_compiler_gnu+set}" = set; then :
     3265if ${ac_cv_c_compiler_gnu+:} false; then :
    32093266  $as_echo_n "(cached) " >&6
    32103267else
    … …  
    32433300{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
    32443301$as_echo_n "checking whether $CC accepts -g... " >&6; }
    3245 if test "${ac_cv_prog_cc_g+set}" = set; then :
     3302if ${ac_cv_prog_cc_g+:} false; then :
    32463303  $as_echo_n "(cached) " >&6
    32473304else
    … …  
    33213378{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
    33223379$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
    3323 if test "${ac_cv_prog_cc_c89+set}" = set; then :
     3380if ${ac_cv_prog_cc_c89+:} false; then :
    33243381  $as_echo_n "(cached) " >&6
    33253382else
    … …  
    34223479{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    34233480$as_echo_n "checking for $ac_word... " >&6; }
    3424 if test "${ac_cv_prog_RANLIB+set}" = set; then :
     3481if ${ac_cv_prog_RANLIB+:} false; then :
    34253482  $as_echo_n "(cached) " >&6
    34263483else
    … …  
    34623519{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    34633520$as_echo_n "checking for $ac_word... " >&6; }
    3464 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
     3521if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
    34653522  $as_echo_n "(cached) " >&6
    34663523else
    … …  
    35213578fi
    35223579if test -z "$CPP"; then
    3523   if test "${ac_cv_prog_CPP+set}" = set; then :
     3580  if ${ac_cv_prog_CPP+:} false; then :
    35243581  $as_echo_n "(cached) " >&6
    35253582else
    … …  
    35513608continue
    35523609fi
    3553 rm -f conftest.err conftest.$ac_ext
     3610rm -f conftest.err conftest.i conftest.$ac_ext
    35543611
    35553612  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    35673624break
    35683625fi
    3569 rm -f conftest.err conftest.$ac_ext
     3626rm -f conftest.err conftest.i conftest.$ac_ext
    35703627
    35713628done
    35723629# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    3573 rm -f conftest.err conftest.$ac_ext
     3630rm -f conftest.i conftest.err conftest.$ac_ext
    35743631if $ac_preproc_ok; then :
    35753632  break
    … …  
    36103667continue
    36113668fi
    3612 rm -f conftest.err conftest.$ac_ext
     3669rm -f conftest.err conftest.i conftest.$ac_ext
    36133670
    36143671  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    36263683break
    36273684fi
    3628 rm -f conftest.err conftest.$ac_ext
     3685rm -f conftest.err conftest.i conftest.$ac_ext
    36293686
    36303687done
    36313688# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    3632 rm -f conftest.err conftest.$ac_ext
     3689rm -f conftest.i conftest.err conftest.$ac_ext
    36333690if $ac_preproc_ok; then :
    36343691
    … …  
    36363693  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    36373694$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3638 as_fn_error "C preprocessor \"$CPP\" fails sanity check
    3639 See \`config.log' for more details." "$LINENO" 5; }
     3695as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
     3696See \`config.log' for more details" "$LINENO" 5; }
    36403697fi
    36413698
    … …  
    36493706{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
    36503707$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
    3651 if test "${ac_cv_path_GREP+set}" = set; then :
     3708if ${ac_cv_path_GREP+:} false; then :
    36523709  $as_echo_n "(cached) " >&6
    36533710else
    … …  
    36983755IFS=$as_save_IFS
    36993756  if test -z "$ac_cv_path_GREP"; then
    3700     as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
     3757    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    37013758  fi
    37023759else
    … …  
    37123769{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
    37133770$as_echo_n "checking for egrep... " >&6; }
    3714 if test "${ac_cv_path_EGREP+set}" = set; then :
     3771if ${ac_cv_path_EGREP+:} false; then :
    37153772  $as_echo_n "(cached) " >&6
    37163773else
    … …  
    37643821IFS=$as_save_IFS
    37653822  if test -z "$ac_cv_path_EGREP"; then
    3766     as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
     3823    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    37673824  fi
    37683825else
    … …  
    37793836{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
    37803837$as_echo_n "checking for ANSI C header files... " >&6; }
    3781 if test "${ac_cv_header_stdc+set}" = set; then :
     3838if ${ac_cv_header_stdc+:} false; then :
    37823839  $as_echo_n "(cached) " >&6
    37833840else
    … …  
    38963953ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
    38973954"
    3898 eval as_val=\$$as_ac_Header
    3899    if test "x$as_val" = x""yes; then :
     3955if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    39003956  cat >>confdefs.h <<_ACEOF
    39013957#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    … …  
    39484004    { $as_echo "$as_me:${as_lineno-$LINENO}: checking system version" >&5
    39494005$as_echo_n "checking system version... " >&6; }
    3950 if test "${tcl_cv_sys_version+set}" = set; then :
     4006if ${tcl_cv_sys_version+:} false; then :
    39514007  $as_echo_n "(cached) " >&6
    39524008else
    … …  
    39844040    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
    39854041$as_echo_n "checking for dlopen in -ldl... " >&6; }
    3986 if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
     4042if ${ac_cv_lib_dl_dlopen+:} false; then :
    39874043  $as_echo_n "(cached) " >&6
    39884044else
    … …  
    40184074{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
    40194075$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
    4020 if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
     4076if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
    40214077  have_dl=yes
    40224078else
    … …  
    40524108{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    40534109$as_echo_n "checking for $ac_word... " >&6; }
    4054 if test "${ac_cv_prog_AR+set}" = set; then :
     4110if ${ac_cv_prog_AR+:} false; then :
    40554111  $as_echo_n "(cached) " >&6
    40564112else
    … …  
    40864142
    40874143    if test "${AR}" = "" ; then
    4088         as_fn_error "Required archive tool 'ar' not found on PATH." "$LINENO" 5
     4144        as_fn_error $? "Required archive tool 'ar' not found on PATH." "$LINENO" 5
    40894145    fi
    40904146    STLIB_LD='${AR} cr'
    … …  
    41774233            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettimeofday in -lbsd" >&5
    41784234$as_echo_n "checking for gettimeofday in -lbsd... " >&6; }
    4179 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then :
     4235if ${ac_cv_lib_bsd_gettimeofday+:} false; then :
    41804236  $as_echo_n "(cached) " >&6
    41814237else
    … …  
    42114267{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gettimeofday" >&5
    42124268$as_echo "$ac_cv_lib_bsd_gettimeofday" >&6; }
    4213 if test "x$ac_cv_lib_bsd_gettimeofday" = x""yes; then :
     4269if test "x$ac_cv_lib_bsd_gettimeofday" = xyes; then :
    42144270  libbsd=yes
    42154271else
    … …  
    42384294            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_ntoa in -lbind" >&5
    42394295$as_echo_n "checking for inet_ntoa in -lbind... " >&6; }
    4240 if test "${ac_cv_lib_bind_inet_ntoa+set}" = set; then :
     4296if ${ac_cv_lib_bind_inet_ntoa+:} false; then :
    42414297  $as_echo_n "(cached) " >&6
    42424298else
    … …  
    42724328{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_inet_ntoa" >&5
    42734329$as_echo "$ac_cv_lib_bind_inet_ntoa" >&6; }
    4274 if test "x$ac_cv_lib_bind_inet_ntoa" = x""yes; then :
     4330if test "x$ac_cv_lib_bind_inet_ntoa" = xyes; then :
    42754331  LIBS="$LIBS -lbind -lsocket"
    42764332fi
    … …  
    43234379            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
    43244380$as_echo_n "checking for shl_load in -ldld... " >&6; }
    4325 if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
     4381if ${ac_cv_lib_dld_shl_load+:} false; then :
    43264382  $as_echo_n "(cached) " >&6
    43274383else
    … …  
    43574413{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
    43584414$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
    4359 if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
     4415if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
    43604416  tcl_ok=yes
    43614417else
    … …  
    44124468            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
    44134469$as_echo_n "checking for shl_load in -ldld... " >&6; }
    4414 if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
     4470if ${ac_cv_lib_dld_shl_load+:} false; then :
    44154471  $as_echo_n "(cached) " >&6
    44164472else
    … …  
    44464502{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
    44474503$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
    4448 if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
     4504if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
    44494505  tcl_ok=yes
    44504506else
    … …  
    45554611            else
    45564612                ac_fn_c_check_header_mongrel "$LINENO" "dld.h" "ac_cv_header_dld_h" "$ac_includes_default"
    4557 if test "x$ac_cv_header_dld_h" = x""yes; then :
     4613if test "x$ac_cv_header_dld_h" = xyes; then :
    45584614
    45594615                    SHLIB_LD="ld -shared"
    … …  
    45724628                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -m64 flag" >&5
    45734629$as_echo_n "checking if compiler accepts -m64 flag... " >&6; }
    4574 if test "${tcl_cv_cc_m64+set}" = set; then :
     4630if ${tcl_cv_cc_m64+:} false; then :
    45754631  $as_echo_n "(cached) " >&6
    45764632else
    … …  
    46364692            else
    46374693                ac_fn_c_check_header_mongrel "$LINENO" "dld.h" "ac_cv_header_dld_h" "$ac_includes_default"
    4638 if test "x$ac_cv_header_dld_h" = x""yes; then :
     4694if test "x$ac_cv_header_dld_h" = xyes; then :
    46394695
    46404696                    SHLIB_LD="ld -shared"
    … …  
    46874743            # Not available on all versions:  check for include file.
    46884744            ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
    4689 if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
     4745if test "x$ac_cv_header_dlfcn_h" = xyes; then :
    46904746
    46914747                # NetBSD/SPARC needs -fPIC, -fpic will not do.
    … …  
    47004756                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF" >&5
    47014757$as_echo_n "checking for ELF... " >&6; }
    4702 if test "${tcl_cv_ld_elf+set}" = set; then :
     4758if ${tcl_cv_ld_elf+:} false; then :
    47034759  $as_echo_n "(cached) " >&6
    47044760else
    … …  
    47824838                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF" >&5
    47834839$as_echo_n "checking for ELF... " >&6; }
    4784 if test "${tcl_cv_ld_elf+set}" = set; then :
     4840if ${tcl_cv_ld_elf+:} false; then :
    47854841  $as_echo_n "(cached) " >&6
    47864842else
    … …  
    48604916                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch ppc64 flag" >&5
    48614917$as_echo_n "checking if compiler accepts -arch ppc64 flag... " >&6; }
    4862 if test "${tcl_cv_cc_arch_ppc64+set}" = set; then :
     4918if ${tcl_cv_cc_arch_ppc64+:} false; then :
    48634919  $as_echo_n "(cached) " >&6
    48644920else
    … …  
    48954951                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch x86_64 flag" >&5
    48964952$as_echo_n "checking if compiler accepts -arch x86_64 flag... " >&6; }
    4897 if test "${tcl_cv_cc_arch_x86_64+set}" = set; then :
     4953if ${tcl_cv_cc_arch_x86_64+:} false; then :
    48984954  $as_echo_n "(cached) " >&6
    48994955else
    … …  
    49404996            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld accepts -single_module flag" >&5
    49414997$as_echo_n "checking if ld accepts -single_module flag... " >&6; }
    4942 if test "${tcl_cv_ld_single_module+set}" = set; then :
     4998if ${tcl_cv_ld_single_module+:} false; then :
    49434999  $as_echo_n "(cached) " >&6
    49445000else
    … …  
    49825038            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld accepts -search_paths_first flag" >&5
    49835039$as_echo_n "checking if ld accepts -search_paths_first flag... " >&6; }
    4984 if test "${tcl_cv_ld_search_paths_first+set}" = set; then :
     5040if ${tcl_cv_ld_search_paths_first+:} false; then :
    49855041  $as_echo_n "(cached) " >&6
    49865042else
    … …  
    50325088                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CoreFoundation.framework" >&5
    50335089$as_echo_n "checking for CoreFoundation.framework... " >&6; }
    5034 if test "${tcl_cv_lib_corefoundation+set}" = set; then :
     5090if ${tcl_cv_lib_corefoundation+:} false; then :
    50355091  $as_echo_n "(cached) " >&6
    50365092else
    … …  
    50785134                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit CoreFoundation" >&5
    50795135$as_echo_n "checking for 64-bit CoreFoundation... " >&6; }
    5080 if test "${tcl_cv_lib_corefoundation_64+set}" = set; then :
     5136if ${tcl_cv_lib_corefoundation_64+:} false; then :
    50815137  $as_echo_n "(cached) " >&6
    50825138else
    … …  
    54035459            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld accepts -Bexport flag" >&5
    54045460$as_echo_n "checking for ld accepts -Bexport flag... " >&6; }
    5405 if test "${tcl_cv_ld_Bexport+set}" = set; then :
     5461if ${tcl_cv_ld_Bexport+:} false; then :
    54065462  $as_echo_n "(cached) " >&6
    54075463else
    … …  
    54695525        { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/exec.h" >&5
    54705526$as_echo_n "checking sys/exec.h... " >&6; }
    5471 if test "${tcl_cv_sysexec_h+set}" = set; then :
     5527if ${tcl_cv_sysexec_h+:} false; then :
    54725528  $as_echo_n "(cached) " >&6
    54735529else
    … …  
    55105566            { $as_echo "$as_me:${as_lineno-$LINENO}: checking a.out.h" >&5
    55115567$as_echo_n "checking a.out.h... " >&6; }
    5512 if test "${tcl_cv_aout_h+set}" = set; then :
     5568if ${tcl_cv_aout_h+:} false; then :
    55135569  $as_echo_n "(cached) " >&6
    55145570else
    … …  
    55515607                { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/exec_aout.h" >&5
    55525608$as_echo_n "checking sys/exec_aout.h... " >&6; }
    5553 if test "${tcl_cv_sysexecaout_h+set}" = set; then :
     5609if ${tcl_cv_sysexecaout_h+:} false; then :
    55545610  $as_echo_n "(cached) " >&6
    55555611else
    … …  
    57295785
    57305786
    5731 ac_aux_dir=
    5732 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
    5733   for ac_t in install-sh install.sh shtool; do
    5734     if test -f "$ac_dir/$ac_t"; then
    5735       ac_aux_dir=$ac_dir
    5736       ac_install_sh="$ac_aux_dir/$ac_t -c"
     5787{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
     5788$as_echo_n "checking for X... " >&6; }
     5789
     5790
     5791# Check whether --with-x was given.
     5792if test "${with_x+set}" = set; then :
     5793  withval=$with_x;
     5794fi
     5795
     5796# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
     5797if test "x$with_x" = xno; then
     5798  # The user explicitly disabled X.
     5799  have_x=disabled
     5800else
     5801  case $x_includes,$x_libraries in #(
     5802    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
     5803    *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
     5804  $as_echo_n "(cached) " >&6
     5805else
     5806  # One or both of the vars are not set, and there is no cached value.
     5807ac_x_includes=no ac_x_libraries=no
     5808rm -f -r conftest.dir
     5809if mkdir conftest.dir; then
     5810  cd conftest.dir
     5811  cat >Imakefile <<'_ACEOF'
     5812incroot:
     5813        @echo incroot='${INCROOT}'
     5814usrlibdir:
     5815        @echo usrlibdir='${USRLIBDIR}'
     5816libdir:
     5817        @echo libdir='${LIBDIR}'
     5818_ACEOF
     5819  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
     5820    # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
     5821    for ac_var in incroot usrlibdir libdir; do
     5822      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
     5823    done
     5824    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
     5825    for ac_extension in a so sl dylib la dll; do
     5826      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
     5827         test -f "$ac_im_libdir/libX11.$ac_extension"; then
     5828        ac_im_usrlibdir=$ac_im_libdir; break
     5829      fi
     5830    done
     5831    # Screen out bogus values from the imake configuration.  They are
     5832    # bogus both because they are the default anyway, and because
     5833    # using them would break gcc on systems where it needs fixed includes.
     5834    case $ac_im_incroot in
     5835        /usr/include) ac_x_includes= ;;
     5836        *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     5837    esac
     5838    case $ac_im_usrlibdir in
     5839        /usr/lib | /usr/lib64 | /lib | /lib64) ;;
     5840        *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
     5841    esac
     5842  fi
     5843  cd ..
     5844  rm -f -r conftest.dir
     5845fi
     5846
     5847# Standard set of common directories for X headers.
     5848# Check X11 before X11Rn because it is often a symlink to the current release.
     5849ac_x_header_dirs='
     5850/usr/X11/include
     5851/usr/X11R7/include
     5852/usr/X11R6/include
     5853/usr/X11R5/include
     5854/usr/X11R4/include
     5855
     5856/usr/include/X11
     5857/usr/include/X11R7
     5858/usr/include/X11R6
     5859/usr/include/X11R5
     5860/usr/include/X11R4
     5861
     5862/usr/local/X11/include
     5863/usr/local/X11R7/include
     5864/usr/local/X11R6/include
     5865/usr/local/X11R5/include
     5866/usr/local/X11R4/include
     5867
     5868/usr/local/include/X11
     5869/usr/local/include/X11R7
     5870/usr/local/include/X11R6
     5871/usr/local/include/X11R5
     5872/usr/local/include/X11R4
     5873
     5874/usr/X386/include
     5875/usr/x386/include
     5876/usr/XFree86/include/X11
     5877
     5878/usr/include
     5879/usr/local/include
     5880/usr/unsupported/include
     5881/usr/athena/include
     5882/usr/local/x11r5/include
     5883/usr/lpp/Xamples/include
     5884
     5885/usr/openwin/include
     5886/usr/openwin/share/include'
     5887
     5888if test "$ac_x_includes" = no; then
     5889  # Guess where to find include files, by looking for Xlib.h.
     5890  # First, try using that file with no special directory specified.
     5891  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     5892/* end confdefs.h.  */
     5893#include <X11/Xlib.h>
     5894_ACEOF
     5895if ac_fn_c_try_cpp "$LINENO"; then :
     5896  # We can compile using X headers with no special include directory.
     5897ac_x_includes=
     5898else
     5899  for ac_dir in $ac_x_header_dirs; do
     5900  if test -r "$ac_dir/X11/Xlib.h"; then
     5901    ac_x_includes=$ac_dir
     5902    break
     5903  fi
     5904done
     5905fi
     5906rm -f conftest.err conftest.i conftest.$ac_ext
     5907fi # $ac_x_includes = no
     5908
     5909if test "$ac_x_libraries" = no; then
     5910  # Check for the libraries.
     5911  # See if we find them without any special options.
     5912  # Don't add to $LIBS permanently.
     5913  ac_save_LIBS=$LIBS
     5914  LIBS="-lX11 $LIBS"
     5915  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     5916/* end confdefs.h.  */
     5917#include <X11/Xlib.h>
     5918int
     5919main ()
     5920{
     5921XrmInitialize ()
     5922  ;
     5923  return 0;
     5924}
     5925_ACEOF
     5926if ac_fn_c_try_link "$LINENO"; then :
     5927  LIBS=$ac_save_LIBS
     5928# We can link X programs with no special library path.
     5929ac_x_libraries=
     5930else
     5931  LIBS=$ac_save_LIBS
     5932for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
     5933do
     5934  # Don't even attempt the hair of trying to link an X program!
     5935  for ac_extension in a so sl dylib la dll; do
     5936    if test -r "$ac_dir/libX11.$ac_extension"; then
     5937      ac_x_libraries=$ac_dir
    57375938      break 2
    57385939    fi
    57395940  done
    57405941done
     5942fi
     5943rm -f core conftest.err conftest.$ac_objext \
     5944    conftest$ac_exeext conftest.$ac_ext
     5945fi # $ac_x_libraries = no
     5946
     5947case $ac_x_includes,$ac_x_libraries in #(
     5948  no,* | *,no | *\'*)
     5949    # Didn't find X, or a directory has "'" in its name.
     5950    ac_cv_have_x="have_x=no";; #(
     5951  *)
     5952    # Record where we found X for the cache.
     5953    ac_cv_have_x="have_x=yes\
     5954        ac_x_includes='$ac_x_includes'\
     5955        ac_x_libraries='$ac_x_libraries'"
     5956esac
     5957fi
     5958;; #(
     5959    *) have_x=yes;;
     5960  esac
     5961  eval "$ac_cv_have_x"
     5962fi # $with_x != no
     5963
     5964if test "$have_x" != yes; then
     5965  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
     5966$as_echo "$have_x" >&6; }
     5967  no_x=yes
     5968else
     5969  # If each of the values was on the command line, it overrides each guess.
     5970  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
     5971  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
     5972  # Update the cache value to reflect the command line values.
     5973  ac_cv_have_x="have_x=yes\
     5974        ac_x_includes='$x_includes'\
     5975        ac_x_libraries='$x_libraries'"
     5976  { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
     5977$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
     5978fi
     5979
     5980
     5981ac_aux_dir=
     5982for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
     5983  if test -f "$ac_dir/install-sh"; then
     5984    ac_aux_dir=$ac_dir
     5985    ac_install_sh="$ac_aux_dir/install-sh -c"
     5986    break
     5987  elif test -f "$ac_dir/install.sh"; then
     5988    ac_aux_dir=$ac_dir
     5989    ac_install_sh="$ac_aux_dir/install.sh -c"
     5990    break
     5991  elif test -f "$ac_dir/shtool"; then
     5992    ac_aux_dir=$ac_dir
     5993    ac_install_sh="$ac_aux_dir/shtool install -c"
     5994    break
     5995  fi
     5996done
    57415997if test -z "$ac_aux_dir"; then
    5742   as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
     5998  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
    57435999fi
    57446000
    … …  
    57696025$as_echo_n "checking for a BSD-compatible install... " >&6; }
    57706026if test -z "$INSTALL"; then
    5771 if test "${ac_cv_path_install+set}" = set; then :
     6027if ${ac_cv_path_install+:} false; then :
    57726028  $as_echo_n "(cached) " >&6
    57736029else
    … …  
    58506106{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    58516107$as_echo_n "checking for $ac_word... " >&6; }
    5852 if test "${ac_cv_prog_RANLIB+set}" = set; then :
     6108if ${ac_cv_prog_RANLIB+:} false; then :
    58536109  $as_echo_n "(cached) " >&6
    58546110else
    … …  
    58906146{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    58916147$as_echo_n "checking for $ac_word... " >&6; }
    5892 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
     6148if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
    58936149  $as_echo_n "(cached) " >&6
    58946150else
    … …  
    59516207$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
    59526208if test -z "$MKDIR_P"; then
    5953   if test "${ac_cv_path_mkdir+set}" = set; then :
     6209  if ${ac_cv_path_mkdir+:} false; then :
    59546210  $as_echo_n "(cached) " >&6
    59556211else
    … …  
    60016257{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    60026258$as_echo_n "checking for $ac_word... " >&6; }
    6003 if test "${ac_cv_prog_CC+set}" = set; then :
     6259if ${ac_cv_prog_CC+:} false; then :
    60046260  $as_echo_n "(cached) " >&6
    60056261else
    … …  
    60416297{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    60426298$as_echo_n "checking for $ac_word... " >&6; }
    6043 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
     6299if ${ac_cv_prog_ac_ct_CC+:} false; then :
    60446300  $as_echo_n "(cached) " >&6
    60456301else
    … …  
    60946350{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    60956351$as_echo_n "checking for $ac_word... " >&6; }
    6096 if test "${ac_cv_prog_CC+set}" = set; then :
     6352if ${ac_cv_prog_CC+:} false; then :
    60976353  $as_echo_n "(cached) " >&6
    60986354else
    … …  
    61346390{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    61356391$as_echo_n "checking for $ac_word... " >&6; }
    6136 if test "${ac_cv_prog_CC+set}" = set; then :
     6392if ${ac_cv_prog_CC+:} false; then :
    61376393  $as_echo_n "(cached) " >&6
    61386394else
    … …  
    61936449{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    61946450$as_echo_n "checking for $ac_word... " >&6; }
    6195 if test "${ac_cv_prog_CC+set}" = set; then :
     6451if ${ac_cv_prog_CC+:} false; then :
    61966452  $as_echo_n "(cached) " >&6
    61976453else
    … …  
    62376493{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    62386494$as_echo_n "checking for $ac_word... " >&6; }
    6239 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
     6495if ${ac_cv_prog_ac_ct_CC+:} false; then :
    62406496  $as_echo_n "(cached) " >&6
    62416497else
    … …  
    62916547test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    62926548$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    6293 as_fn_error "no acceptable C compiler found in \$PATH
    6294 See \`config.log' for more details." "$LINENO" 5; }
     6549as_fn_error $? "no acceptable C compiler found in \$PATH
     6550See \`config.log' for more details" "$LINENO" 5; }
    62956551
    62966552# Provide some information about the compiler.
    … …  
    63216577{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
    63226578$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
    6323 if test "${ac_cv_c_compiler_gnu+set}" = set; then :
     6579if ${ac_cv_c_compiler_gnu+:} false; then :
    63246580  $as_echo_n "(cached) " >&6
    63256581else
    … …  
    63586614{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
    63596615$as_echo_n "checking whether $CC accepts -g... " >&6; }
    6360 if test "${ac_cv_prog_cc_g+set}" = set; then :
     6616if ${ac_cv_prog_cc_g+:} false; then :
    63616617  $as_echo_n "(cached) " >&6
    63626618else
    … …  
    64366692{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
    64376693$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
    6438 if test "${ac_cv_prog_cc_c89+set}" = set; then :
     6694if ${ac_cv_prog_cc_c89+:} false; then :
    64396695  $as_echo_n "(cached) " >&6
    64406696else
    … …  
    65436799fi
    65446800if test -z "$CPP"; then
    6545   if test "${ac_cv_prog_CPP+set}" = set; then :
     6801  if ${ac_cv_prog_CPP+:} false; then :
    65466802  $as_echo_n "(cached) " >&6
    65476803else
    … …  
    65736829continue
    65746830fi
    6575 rm -f conftest.err conftest.$ac_ext
     6831rm -f conftest.err conftest.i conftest.$ac_ext
    65766832
    65776833  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    65896845break
    65906846fi
    6591 rm -f conftest.err conftest.$ac_ext
     6847rm -f conftest.err conftest.i conftest.$ac_ext
    65926848
    65936849done
    65946850# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    6595 rm -f conftest.err conftest.$ac_ext
     6851rm -f conftest.i conftest.err conftest.$ac_ext
    65966852if $ac_preproc_ok; then :
    65976853  break
    … …  
    66326888continue
    66336889fi
    6634 rm -f conftest.err conftest.$ac_ext
     6890rm -f conftest.err conftest.i conftest.$ac_ext
    66356891
    66366892  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    66486904break
    66496905fi
    6650 rm -f conftest.err conftest.$ac_ext
     6906rm -f conftest.err conftest.i conftest.$ac_ext
    66516907
    66526908done
    66536909# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    6654 rm -f conftest.err conftest.$ac_ext
     6910rm -f conftest.i conftest.err conftest.$ac_ext
    66556911if $ac_preproc_ok; then :
    66566912
    … …  
    66586914  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    66596915$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    6660 as_fn_error "C preprocessor \"$CPP\" fails sanity check
    6661 See \`config.log' for more details." "$LINENO" 5; }
     6916as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
     6917See \`config.log' for more details" "$LINENO" 5; }
    66626918fi
    66636919
    … …  
    66846940{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    66856941$as_echo_n "checking for $ac_word... " >&6; }
    6686 if test "${ac_cv_prog_CXX+set}" = set; then :
     6942if ${ac_cv_prog_CXX+:} false; then :
    66876943  $as_echo_n "(cached) " >&6
    66886944else
    … …  
    67286984{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    67296985$as_echo_n "checking for $ac_word... " >&6; }
    6730 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
     6986if ${ac_cv_prog_ac_ct_CXX+:} false; then :
    67316987  $as_echo_n "(cached) " >&6
    67326988else
    … …  
    68067062{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
    68077063$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
    6808 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
     7064if ${ac_cv_cxx_compiler_gnu+:} false; then :
    68097065  $as_echo_n "(cached) " >&6
    68107066else
    … …  
    68437099{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
    68447100$as_echo_n "checking whether $CXX accepts -g... " >&6; }
    6845 if test "${ac_cv_prog_cxx_g+set}" = set; then :
     7101if ${ac_cv_prog_cxx_g+:} false; then :
    68467102  $as_echo_n "(cached) " >&6
    68477103else
    … …  
    69337189$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
    69347190if test -z "$CXXCPP"; then
    6935   if test "${ac_cv_prog_CXXCPP+set}" = set; then :
     7191  if ${ac_cv_prog_CXXCPP+:} false; then :
    69367192  $as_echo_n "(cached) " >&6
    69377193else
    … …  
    69637219continue
    69647220fi
    6965 rm -f conftest.err conftest.$ac_ext
     7221rm -f conftest.err conftest.i conftest.$ac_ext
    69667222
    69677223  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    69797235break
    69807236fi
    6981 rm -f conftest.err conftest.$ac_ext
     7237rm -f conftest.err conftest.i conftest.$ac_ext
    69827238
    69837239done
    69847240# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    6985 rm -f conftest.err conftest.$ac_ext
     7241rm -f conftest.i conftest.err conftest.$ac_ext
    69867242if $ac_preproc_ok; then :
    69877243  break
    … …  
    70227278continue
    70237279fi
    7024 rm -f conftest.err conftest.$ac_ext
     7280rm -f conftest.err conftest.i conftest.$ac_ext
    70257281
    70267282  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    70387294break
    70397295fi
    7040 rm -f conftest.err conftest.$ac_ext
     7296rm -f conftest.err conftest.i conftest.$ac_ext
    70417297
    70427298done
    70437299# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    7044 rm -f conftest.err conftest.$ac_ext
     7300rm -f conftest.i conftest.err conftest.$ac_ext
    70457301if $ac_preproc_ok; then :
    70467302
    … …  
    70487304  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    70497305$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    7050 as_fn_error "C++ preprocessor \"$CXXCPP\" fails sanity check
    7051 See \`config.log' for more details." "$LINENO" 5; }
     7306as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
     7307See \`config.log' for more details" "$LINENO" 5; }
    70527308fi
    70537309
    … …  
    70747330{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    70757331$as_echo_n "checking for $ac_word... " >&6; }
    7076 if test "${ac_cv_prog_CXX+set}" = set; then :
     7332if ${ac_cv_prog_CXX+:} false; then :
    70777333  $as_echo_n "(cached) " >&6
    70787334else
    … …  
    71187374{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    71197375$as_echo_n "checking for $ac_word... " >&6; }
    7120 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
     7376if ${ac_cv_prog_ac_ct_CXX+:} false; then :
    71217377  $as_echo_n "(cached) " >&6
    71227378else
    … …  
    71967452{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
    71977453$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
    7198 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
     7454if ${ac_cv_cxx_compiler_gnu+:} false; then :
    71997455  $as_echo_n "(cached) " >&6
    72007456else
    … …  
    72337489{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
    72347490$as_echo_n "checking whether $CXX accepts -g... " >&6; }
    7235 if test "${ac_cv_prog_cxx_g+set}" = set; then :
     7491if ${ac_cv_prog_cxx_g+:} false; then :
    72367492  $as_echo_n "(cached) " >&6
    72377493else
    … …  
    73257581 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
    73267582$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
    7327 if test "${ac_cv_c_bigendian+set}" = set; then :
     7583if ${ac_cv_c_bigendian+:} false; then :
    73287584  $as_echo_n "(cached) " >&6
    73297585else
    … …  
    75437799     ;; #(
    75447800   *)
    7545      as_fn_error "unknown endianness
     7801     as_fn_error $? "unknown endianness
    75467802 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
    75477803 esac
    … …  
    75537809{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
    75547810$as_echo_n "checking size of int... " >&6; }
    7555 if test "${ac_cv_sizeof_int+set}" = set; then :
     7811if ${ac_cv_sizeof_int+:} false; then :
    75567812  $as_echo_n "(cached) " >&6
    75577813else
    … …  
    75627818     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    75637819$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    7564 { as_fn_set_status 77
    7565 as_fn_error "cannot compute sizeof (int)
    7566 See \`config.log' for more details." "$LINENO" 5; }; }
     7820as_fn_error 77 "cannot compute sizeof (int)
     7821See \`config.log' for more details" "$LINENO" 5; }
    75677822   else
    75687823     ac_cv_sizeof_int=0
    … …  
    75877842{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
    75887843$as_echo_n "checking size of long... " >&6; }
    7589 if test "${ac_cv_sizeof_long+set}" = set; then :
     7844if ${ac_cv_sizeof_long+:} false; then :
    75907845  $as_echo_n "(cached) " >&6
    75917846else
    … …  
    75967851     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    75977852$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    7598 { as_fn_set_status 77
    7599 as_fn_error "cannot compute sizeof (long)
    7600 See \`config.log' for more details." "$LINENO" 5; }; }
     7853as_fn_error 77 "cannot compute sizeof (long)
     7854See \`config.log' for more details" "$LINENO" 5; }
    76017855   else
    76027856     ac_cv_sizeof_long=0
    … …  
    76217875{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
    76227876$as_echo_n "checking size of long long... " >&6; }
    7623 if test "${ac_cv_sizeof_long_long+set}" = set; then :
     7877if ${ac_cv_sizeof_long_long+:} false; then :
    76247878  $as_echo_n "(cached) " >&6
    76257879else
    … …  
    76307884     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    76317885$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    7632 { as_fn_set_status 77
    7633 as_fn_error "cannot compute sizeof (long long)
    7634 See \`config.log' for more details." "$LINENO" 5; }; }
     7886as_fn_error 77 "cannot compute sizeof (long long)
     7887See \`config.log' for more details" "$LINENO" 5; }
    76357888   else
    76367889     ac_cv_sizeof_long_long=0
    … …  
    76557908{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
    76567909$as_echo_n "checking size of void *... " >&6; }
    7657 if test "${ac_cv_sizeof_void_p+set}" = set; then :
     7910if ${ac_cv_sizeof_void_p+:} false; then :
    76587911  $as_echo_n "(cached) " >&6
    76597912else
    … …  
    76647917     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    76657918$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    7666 { as_fn_set_status 77
    7667 as_fn_error "cannot compute sizeof (void *)
    7668 See \`config.log' for more details." "$LINENO" 5; }; }
     7919as_fn_error 77 "cannot compute sizeof (void *)
     7920See \`config.log' for more details" "$LINENO" 5; }
    76697921   else
    76707922     ac_cv_sizeof_void_p=0
    … …  
    76897941{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float" >&5
    76907942$as_echo_n "checking size of float... " >&6; }
    7691 if test "${ac_cv_sizeof_float+set}" = set; then :
     7943if ${ac_cv_sizeof_float+:} false; then :
    76927944  $as_echo_n "(cached) " >&6
    76937945else
    … …  
    76987950     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    76997951$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    7700 { as_fn_set_status 77
    7701 as_fn_error "cannot compute sizeof (float)
    7702 See \`config.log' for more details." "$LINENO" 5; }; }
     7952as_fn_error 77 "cannot compute sizeof (float)
     7953See \`config.log' for more details" "$LINENO" 5; }
    77037954   else
    77047955     ac_cv_sizeof_float=0
    … …  
    77347985LD_RPATH="";
    77357986
    7736 SUBDIRS="nanoscale nanovis pymolproxy"
    7737 
    7738 
    7739 
    7740 # Check whether --with-tcllib was given.
    7741 if test "${with_tcllib+set}" = set; then :
    7742   withval=$with_tcllib; with_tcllib=$withval
    7743 else
    7744   with_tcllib=""
    7745 fi
     7987SUBDIRS="nanoscale nanovis pymolproxy vtkvis"
    77467988
    77477989
    … …  
    77908032
    77918033
    7792 
    7793 # Check whether --with-rappture was given.
    7794 if test "${with_rappture+set}" = set; then :
    7795   withval=$with_rappture; with_rappture=$withval
    7796 else
    7797   with_rappture=/usr
    7798 fi
    7799 
    7800 
    78018034RP2_INCL_DIR=""
    78028035RP_DIR=""
    … …  
    78098042            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    78108043$as_echo "no" >&6; }
    7811             as_fn_error "please provide --with-rappture with directory" "$LINENO" 5
     8044            as_fn_error $? "please provide --with-rappture with directory" "$LINENO" 5
    78128045        else
    78138046            if test -d "$with_rappture"
    … …  
    78228055                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    78238056$as_echo "no" >&6; }
    7824                     as_fn_error "cannot find rappture2.h and librappture2.a, try using --with-rappture" "$LINENO" 5
     8057                    as_fn_error $? "cannot find rappture2.h and librappture2.a, try using --with-rappture" "$LINENO" 5
    78258058                fi
    78268059            else
    78278060                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    78288061$as_echo "no" >&6; }
    7829                 as_fn_error "cannot find rappture2.h and librappture2.a inside $with_rappture, try using --with-rappture" "$LINENO" 5
     8062                as_fn_error $? "cannot find rappture2.h and librappture2.a inside $with_rappture, try using --with-rappture" "$LINENO" 5
    78308063            fi
    78318064        fi
    … …  
    78418074do :
    78428075  ac_fn_cxx_check_header_mongrel "$LINENO" "rappture.h" "ac_cv_header_rappture_h" "$ac_includes_default"
    7843 if test "x$ac_cv_header_rappture_h" = x""yes; then :
     8076if test "x$ac_cv_header_rappture_h" = xyes; then :
    78448077  cat >>confdefs.h <<_ACEOF
    78458078#define HAVE_RAPPTURE_H 1
    … …  
    78478080
    78488081else
    7849   as_fn_error "cannot find rappture.h, try using --with-rappture" "$LINENO" 5
     8082  as_fn_error $? "cannot find rappture.h, try using --with-rappture" "$LINENO" 5
    78508083fi
    78518084
    … …  
    78608093
    78618094
     8095if test "x$with_vtk_includes" != "x"; then
     8096   VTK_INC_SPEC=-I$with_vtk_includes
     8097fi
     8098
     8099save_CPPFLAGS=$CPPFLAGS
     8100CPPFLAGS=$VTK_INC_SPEC
     8101for ac_header in vtkSmartPointer.h
     8102do :
     8103  ac_fn_cxx_check_header_mongrel "$LINENO" "vtkSmartPointer.h" "ac_cv_header_vtkSmartPointer_h" "$ac_includes_default"
     8104if test "x$ac_cv_header_vtkSmartPointer_h" = xyes; then :
     8105  cat >>confdefs.h <<_ACEOF
     8106#define HAVE_VTKSMARTPOINTER_H 1
     8107_ACEOF
     8108
     8109else
     8110  as_fn_error $? "cannot find VTK includes" "$LINENO" 5
     8111fi
     8112
     8113done
     8114
     8115CPPFLAGS=$save_CPPFLAGS
     8116
     8117if test "x$with_vtk_libs" != "x"; then
     8118   VTK_LIB_DIR=$with_vtk_libs
     8119fi
     8120
     8121
     8122
     8123
    78628124ac_fn_cxx_check_header_mongrel "$LINENO" "GL/glui.h" "ac_cv_header_GL_glui_h" "$ac_includes_default"
    7863 if test "x$ac_cv_header_GL_glui_h" = x""yes; then :
     8125if test "x$ac_cv_header_GL_glui_h" = xyes; then :
    78648126
    78658127fi
    … …  
    78678129
    78688130ac_fn_cxx_check_header_mongrel "$LINENO" "glui.h" "ac_cv_header_glui_h" "$ac_includes_default"
    7869 if test "x$ac_cv_header_glui_h" = x""yes; then :
     8131if test "x$ac_cv_header_glui_h" = xyes; then :
    78708132
    78718133fi
    … …  
    78738135
    78748136ac_fn_cxx_check_header_mongrel "$LINENO" "GL/glut.h" "ac_cv_header_GL_glut_h" "$ac_includes_default"
    7875 if test "x$ac_cv_header_GL_glut_h" = x""yes; then :
     8137if test "x$ac_cv_header_GL_glut_h" = xyes; then :
    78768138
    78778139fi
    … …  
    78798141
    78808142ac_fn_cxx_check_header_mongrel "$LINENO" "GL/glew.h" "ac_cv_header_GL_glew_h" "$ac_includes_default"
    7881 if test "x$ac_cv_header_GL_glew_h" = x""yes; then :
     8143if test "x$ac_cv_header_GL_glew_h" = xyes; then :
    78828144
    78838145fi
    … …  
    78858147
    78868148ac_fn_cxx_check_header_mongrel "$LINENO" "Cg/cgGL.h" "ac_cv_header_Cg_cgGL_h" "$ac_includes_default"
    7887 if test "x$ac_cv_header_Cg_cgGL_h" = x""yes; then :
     8149if test "x$ac_cv_header_Cg_cgGL_h" = xyes; then :
    78888150
    78898151fi
    … …  
    78958157  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
    78968158ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
    7897 eval as_val=\$$as_ac_Header
    7898    if test "x$as_val" = x""yes; then :
     8159if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    78998160  cat >>confdefs.h <<_ACEOF
    79008161#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    … …  
    79098170  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
    79108171ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
    7911 eval as_val=\$$as_ac_Header
    7912    if test "x$as_val" = x""yes; then :
     8172if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    79138173  cat >>confdefs.h <<_ACEOF
    79148174#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    … …  
    79348194done
    79358195if test "x${DX_INC_DIR}" = "x" ; then
    7936   as_fn_error "can't find OpenDX include files" "$LINENO" 5
     8196  as_fn_error $? "can't find OpenDX include files" "$LINENO" 5
    79378197fi
    79388198
    … …  
    79468206$as_echo "${DX_INC_DIR}" >&6; }
    79478207
    7948 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenDX libraries" >&5
    7949 $as_echo_n "checking for OpenDX libraries... " >&6; }
    79508208DX_LIB_DIR=""
     8209found=no
    79518210for dir in \
    7952  /apps/rappture/lib \
     8211 /usr/lib \
     8212 /usr/lib64 \
     8213 /usr/dx/lib_linux \
    79538214 /usr/lib/dx/lib_linux \
    7954  /usr/dx/lib_linux \
    7955  /usr/lib
     8215 /usr/lib64/dx/lib_linux \
     8216 /apps/rappture/lib
    79568217do
    7957   if test -r "${dir}/libDXcallm.a" ; then
     8218  saveLDFLAGS=$LDFLAGS
     8219  LDFLAGS="-L$dir $LDFLAGS"
     8220  unset ac_cv_lib_DXcallm_DXGetComponentValue
     8221  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DXGetComponentValue in -lDXcallm" >&5
     8222$as_echo_n "checking for DXGetComponentValue in -lDXcallm... " >&6; }
     8223if ${ac_cv_lib_DXcallm_DXGetComponentValue+:} false; then :
     8224  $as_echo_n "(cached) " >&6
     8225else
     8226  ac_check_lib_save_LIBS=$LIBS
     8227LIBS="-lDXcallm -lX11 $LIBS"
     8228cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     8229/* end confdefs.h.  */
     8230
     8231/* Override any GCC internal prototype to avoid an error.
     8232   Use char because int might match the return type of a GCC
     8233   builtin and then its argument prototype would still apply.  */
     8234#ifdef __cplusplus
     8235extern "C"
     8236#endif
     8237char DXGetComponentValue ();
     8238int
     8239main ()
     8240{
     8241return DXGetComponentValue ();
     8242  ;
     8243  return 0;
     8244}
     8245_ACEOF
     8246if ac_fn_cxx_try_link "$LINENO"; then :
     8247  ac_cv_lib_DXcallm_DXGetComponentValue=yes
     8248else
     8249  ac_cv_lib_DXcallm_DXGetComponentValue=no
     8250fi
     8251rm -f core conftest.err conftest.$ac_objext \
     8252    conftest$ac_exeext conftest.$ac_ext
     8253LIBS=$ac_check_lib_save_LIBS
     8254fi
     8255{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_DXcallm_DXGetComponentValue" >&5
     8256$as_echo "$ac_cv_lib_DXcallm_DXGetComponentValue" >&6; }
     8257if test "x$ac_cv_lib_DXcallm_DXGetComponentValue" = xyes; then :
     8258  found=yes
     8259else
     8260  found=no
     8261fi
     8262
     8263  LDFLAGS=$saveLDFLAGS
     8264  if test "$found" = "yes" ; then
    79588265    DX_LIB_DIR="$dir"
    79598266    break
    79608267  fi
    79618268done
    7962 if test "x${DX_LIB_DIR}" = "x" ; then
    7963   as_fn_error "can't find OpenDX libraries" "$LINENO" 5
    7964 fi
    7965 
    7966 if test "${DX_LIB_DIR}" = "/usr" ; then
     8269if test "x{$DX_LIB_DIR}" = "x" ; then
     8270  as_fn_error $? "cant find OpenDX libraries" "$LINENO" 5
     8271fi
     8272
     8273{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libDXcallm library" >&5
     8274$as_echo_n "checking for libDXcallm library... " >&6; }
     8275if test "${DX_LIB_DIR}" = "/usr/lib" -o "${DX_LIB_DIR}" = "/usr/lib64"; then
    79678276  DX_LIB_SPEC=""
    79688277else
    79698278  DX_LIB_SPEC="-L${DX_LIB_DIR}"
    79708279fi
    7971 
    7972 
    7973 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${DX_LIB_DIR}" >&5
    7974 $as_echo "${DX_LIB_DIR}" >&6; }
     8280{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_LIB_SPEC" >&5
     8281$as_echo "$DX_LIB_SPEC" >&6; }
     8282
     8283
     8284for ac_header in opencv/cv.h opencv/highgui.h
     8285do :
     8286  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
     8287ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
     8288if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     8289  cat >>confdefs.h <<_ACEOF
     8290#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
     8291_ACEOF
     8292
     8293fi
     8294
     8295done
     8296
     8297{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cvLoadImage in -lcv" >&5
     8298$as_echo_n "checking for cvLoadImage in -lcv... " >&6; }
     8299if ${ac_cv_lib_cv_cvLoadImage+:} false; then :
     8300  $as_echo_n "(cached) " >&6
     8301else
     8302  ac_check_lib_save_LIBS=$LIBS
     8303LIBS="-lcv  $LIBS"
     8304cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     8305/* end confdefs.h.  */
     8306
     8307/* Override any GCC internal prototype to avoid an error.
     8308   Use char because int might match the return type of a GCC
     8309   builtin and then its argument prototype would still apply.  */
     8310#ifdef __cplusplus
     8311extern "C"
     8312#endif
     8313char cvLoadImage ();
     8314int
     8315main ()
     8316{
     8317return cvLoadImage ();
     8318  ;
     8319  return 0;
     8320}
     8321_ACEOF
     8322if ac_fn_cxx_try_link "$LINENO"; then :
     8323  ac_cv_lib_cv_cvLoadImage=yes
     8324else
     8325  ac_cv_lib_cv_cvLoadImage=no
     8326fi
     8327rm -f core conftest.err conftest.$ac_objext \
     8328    conftest$ac_exeext conftest.$ac_ext
     8329LIBS=$ac_check_lib_save_LIBS
     8330fi
     8331{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cv_cvLoadImage" >&5
     8332$as_echo "$ac_cv_lib_cv_cvLoadImage" >&6; }
     8333if test "x$ac_cv_lib_cv_cvLoadImage" = xyes; then :
     8334  cat >>confdefs.h <<_ACEOF
     8335#define HAVE_LIBCV 1
     8336_ACEOF
     8337
     8338  LIBS="-lcv $LIBS"
     8339
     8340fi
     8341
     8342
     8343save_CPPFLAGS=$CPPFLAGS
     8344# Test for redhat-specific location of ffmpeg headers.
     8345if test -d "/usr/include/ffmpeg" ; then
     8346  CPPFLAGS="$CPPFLAGS -I/usr/include/ffmpeg"
     8347  FF_INC_SPEC="-I/usr/include/ffmpeg"
     8348fi
     8349
    79758350
    79768351for ac_header in ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h
    … …  
    79888363
    79898364"
    7990 eval as_val=\$$as_ac_Header
    7991    if test "x$as_val" = x""yes; then :
     8365if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    79928366  cat >>confdefs.h <<_ACEOF
    79938367#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    … …  
    79988372done
    79998373
    8000 
    8001 oldLIBS=$LIBS
    8002 LIBS=-lavcodec
     8374CPPFLAGS=$save_CPPFLAGS
     8375
     8376{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcodec_alloc_frame in -lavcodec" >&5
     8377$as_echo_n "checking for avcodec_alloc_frame in -lavcodec... " >&6; }
     8378if ${ac_cv_lib_avcodec_avcodec_alloc_frame+:} false; then :
     8379  $as_echo_n "(cached) " >&6
     8380else
     8381  ac_check_lib_save_LIBS=$LIBS
     8382LIBS="-lavcodec  $LIBS"
     8383cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     8384/* end confdefs.h.  */
     8385
     8386/* Override any GCC internal prototype to avoid an error.
     8387   Use char because int might match the return type of a GCC
     8388   builtin and then its argument prototype would still apply.  */
     8389#ifdef __cplusplus
     8390extern "C"
     8391#endif
     8392char avcodec_alloc_frame ();
     8393int
     8394main ()
     8395{
     8396return avcodec_alloc_frame ();
     8397  ;
     8398  return 0;
     8399}
     8400_ACEOF
     8401if ac_fn_cxx_try_link "$LINENO"; then :
     8402  ac_cv_lib_avcodec_avcodec_alloc_frame=yes
     8403else
     8404  ac_cv_lib_avcodec_avcodec_alloc_frame=no
     8405fi
     8406rm -f core conftest.err conftest.$ac_objext \
     8407    conftest$ac_exeext conftest.$ac_ext
     8408LIBS=$ac_check_lib_save_LIBS
     8409fi
     8410{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_avcodec_alloc_frame" >&5
     8411$as_echo "$ac_cv_lib_avcodec_avcodec_alloc_frame" >&6; }
     8412if test "x$ac_cv_lib_avcodec_avcodec_alloc_frame" = xyes; then :
     8413  cat >>confdefs.h <<_ACEOF
     8414#define HAVE_LIBAVCODEC 1
     8415_ACEOF
     8416
     8417  LIBS="-lavcodec $LIBS"
     8418
     8419fi
     8420
     8421# Fallback to deprecated av_alloc_format_context if avformat_alloc_context isn't found
     8422{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avformat_alloc_context in -lavformat" >&5
     8423$as_echo_n "checking for avformat_alloc_context in -lavformat... " >&6; }
     8424if ${ac_cv_lib_avformat_avformat_alloc_context+:} false; then :
     8425  $as_echo_n "(cached) " >&6
     8426else
     8427  ac_check_lib_save_LIBS=$LIBS
     8428LIBS="-lavformat  $LIBS"
     8429cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     8430/* end confdefs.h.  */
     8431
     8432/* Override any GCC internal prototype to avoid an error.
     8433   Use char because int might match the return type of a GCC
     8434   builtin and then its argument prototype would still apply.  */
     8435#ifdef __cplusplus
     8436extern "C"
     8437#endif
     8438char avformat_alloc_context ();
     8439int
     8440main ()
     8441{
     8442return avformat_alloc_context ();
     8443  ;
     8444  return 0;
     8445}
     8446_ACEOF
     8447if ac_fn_cxx_try_link "$LINENO"; then :
     8448  ac_cv_lib_avformat_avformat_alloc_context=yes
     8449else
     8450  ac_cv_lib_avformat_avformat_alloc_context=no
     8451fi
     8452rm -f core conftest.err conftest.$ac_objext \
     8453    conftest$ac_exeext conftest.$ac_ext
     8454LIBS=$ac_check_lib_save_LIBS
     8455fi
     8456{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_avformat_alloc_context" >&5
     8457$as_echo "$ac_cv_lib_avformat_avformat_alloc_context" >&6; }
     8458if test "x$ac_cv_lib_avformat_avformat_alloc_context" = xyes; then :
     8459  cat >>confdefs.h <<_ACEOF
     8460#define HAVE_LIBAVFORMAT 1
     8461_ACEOF
     8462
     8463  LIBS="-lavformat $LIBS"
     8464
     8465else
     8466  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_alloc_format_context in -lavformat" >&5
     8467$as_echo_n "checking for av_alloc_format_context in -lavformat... " >&6; }
     8468if ${ac_cv_lib_avformat_av_alloc_format_context+:} false; then :
     8469  $as_echo_n "(cached) " >&6
     8470else
     8471  ac_check_lib_save_LIBS=$LIBS
     8472LIBS="-lavformat  $LIBS"
     8473cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     8474/* end confdefs.h.  */
     8475
     8476/* Override any GCC internal prototype to avoid an error.
     8477   Use char because int might match the return type of a GCC
     8478   builtin and then its argument prototype would still apply.  */
     8479#ifdef __cplusplus
     8480extern "C"
     8481#endif
     8482char av_alloc_format_context ();
     8483int
     8484main ()
     8485{
     8486return av_alloc_format_context ();
     8487  ;
     8488  return 0;
     8489}
     8490_ACEOF
     8491if ac_fn_cxx_try_link "$LINENO"; then :
     8492  ac_cv_lib_avformat_av_alloc_format_context=yes
     8493else
     8494  ac_cv_lib_avformat_av_alloc_format_context=no
     8495fi
     8496rm -f core conftest.err conftest.$ac_objext \
     8497    conftest$ac_exeext conftest.$ac_ext
     8498LIBS=$ac_check_lib_save_LIBS
     8499fi
     8500{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_alloc_format_context" >&5
     8501$as_echo "$ac_cv_lib_avformat_av_alloc_format_context" >&6; }
     8502if test "x$ac_cv_lib_avformat_av_alloc_format_context" = xyes; then :
     8503  cat >>confdefs.h <<_ACEOF
     8504#define HAVE_LIBAVFORMAT 1
     8505_ACEOF
     8506
     8507  LIBS="-lavformat $LIBS"
     8508
     8509else
     8510  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libavformat not usable" >&5
     8511$as_echo "$as_me: WARNING: libavformat not usable" >&2;}
     8512fi
     8513
     8514fi
     8515
     8516{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_free in -lavutil" >&5
     8517$as_echo_n "checking for av_free in -lavutil... " >&6; }
     8518if ${ac_cv_lib_avutil_av_free+:} false; then :
     8519  $as_echo_n "(cached) " >&6
     8520else
     8521  ac_check_lib_save_LIBS=$LIBS
     8522LIBS="-lavutil  $LIBS"
     8523cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     8524/* end confdefs.h.  */
     8525
     8526/* Override any GCC internal prototype to avoid an error.
     8527   Use char because int might match the return type of a GCC
     8528   builtin and then its argument prototype would still apply.  */
     8529#ifdef __cplusplus
     8530extern "C"
     8531#endif
     8532char av_free ();
     8533int
     8534main ()
     8535{
     8536return av_free ();
     8537  ;
     8538  return 0;
     8539}
     8540_ACEOF
     8541if ac_fn_cxx_try_link "$LINENO"; then :
     8542  ac_cv_lib_avutil_av_free=yes
     8543else
     8544  ac_cv_lib_avutil_av_free=no
     8545fi
     8546rm -f core conftest.err conftest.$ac_objext \
     8547    conftest$ac_exeext conftest.$ac_ext
     8548LIBS=$ac_check_lib_save_LIBS
     8549fi
     8550{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avutil_av_free" >&5
     8551$as_echo "$ac_cv_lib_avutil_av_free" >&6; }
     8552if test "x$ac_cv_lib_avutil_av_free" = xyes; then :
     8553  cat >>confdefs.h <<_ACEOF
     8554#define HAVE_LIBAVUTIL 1
     8555_ACEOF
     8556
     8557  LIBS="-lavutil $LIBS"
     8558
     8559fi
     8560
    80038561for ac_func in img_convert
    80048562do :
    80058563  ac_fn_cxx_check_func "$LINENO" "img_convert" "ac_cv_func_img_convert"
    8006 if test "x$ac_cv_func_img_convert" = x""yes; then :
     8564if test "x$ac_cv_func_img_convert" = xyes; then :
    80078565  cat >>confdefs.h <<_ACEOF
    80088566#define HAVE_IMG_CONVERT 1
    … …  
    80128570done
    80138571
    8014 LIBS=-lavformat
    8015 for ac_func in avformat_alloc_context
    8016 do :
    8017   ac_fn_cxx_check_func "$LINENO" "avformat_alloc_context" "ac_cv_func_avformat_alloc_context"
    8018 if test "x$ac_cv_func_avformat_alloc_context" = x""yes; then :
    8019   cat >>confdefs.h <<_ACEOF
    8020 #define HAVE_AVFORMAT_ALLOC_CONTEXT 1
    8021 _ACEOF
    8022 
    8023 fi
    8024 done
    8025 
    8026 LIBS=$oldLIBS
    80278572
    80288573{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nVidia Cg installation" >&5
    … …  
    80408585done
    80418586if test "x${CG_DIR}" = "x" ; then
    8042   as_fn_error "can't find nVidia Cg installation" "$LINENO" 5
     8587  as_fn_error $? "can't find nVidia Cg installation" "$LINENO" 5
    80438588fi
    80448589
    … …  
    80568601
    80578602
    8058 ac_config_files="$ac_config_files Makefile nanoscale/Makefile nanovis/Makefile nanovis/newmat11/Makefile nanovis/R2/src/Makefile nanovis/vrutil/Makefile nanovis/vrmath/Makefile nanovis/vr3d/Makefile nanovis/imgLoaders/Makefile nanovis/transfer-function/Makefile pymolproxy/Makefile start_viz.sh"
     8603ac_config_files="$ac_config_files Makefile nanoscale/Makefile nanovis/Makefile nanovis/newmat11/Makefile nanovis/R2/src/Makefile nanovis/vrutil/Makefile nanovis/vrmath/Makefile nanovis/vr3d/Makefile nanovis/imgLoaders/Makefile nanovis/transfer-function/Makefile pymolproxy/Makefile vtkvis/Doxyfile vtkvis/Makefile start_viz.sh"
    80598604
    80608605cat >confcache <<\_ACEOF
    … …  
    81228667if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
    81238668  if test -w "$cache_file"; then
    8124     test "x$cache_file" != "x/dev/null" &&
     8669    if test "x$cache_file" != "x/dev/null"; then
    81258670      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
    81268671$as_echo "$as_me: updating cache $cache_file" >&6;}
    8127     cat confcache >$cache_file
     8672      if test ! -f "$cache_file" || test -h "$cache_file"; then
     8673        cat confcache >"$cache_file"
     8674      else
     8675        case $cache_file in #(
     8676        */* | ?:*)
     8677          mv -f confcache "$cache_file"$$ &&
     8678          mv -f "$cache_file"$$ "$cache_file" ;; #(
     8679        *)
     8680          mv -f confcache "$cache_file" ;;
     8681        esac
     8682      fi
     8683    fi
    81288684  else
    81298685    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
    … …  
    81418697ac_libobjs=
    81428698ac_ltlibobjs=
     8699U=
    81438700for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    81448701  # 1. Remove the extension, and $U if already installed.
    … …  
    81578714
    81588715
    8159 : ${CONFIG_STATUS=./config.status}
     8716: "${CONFIG_STATUS=./config.status}"
    81608717ac_write_fail=0
    81618718ac_clean_files_save=$ac_clean_files
    … …  
    82588815
    82598816# Find who we are.  Look in the path if we contain no directory separator.
     8817as_myself=
    82608818case $0 in #((
    82618819  *[\\/]* ) as_myself=$0 ;;
    … …  
    83038861
    83048862
    8305 # as_fn_error ERROR [LINENO LOG_FD]
    8306 # ---------------------------------
     8863# as_fn_error STATUS ERROR [LINENO LOG_FD]
     8864# ----------------------------------------
    83078865# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    83088866# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
    8309 # script with status $?, using 1 if that was 0.
     8867# script with STATUS, using 1 if that was 0.
    83108868as_fn_error ()
    83118869{
    8312   as_status=$?; test $as_status -eq 0 && as_status=1
    8313   if test "$3"; then
    8314     as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    8315     $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
     8870  as_status=$1; test $as_status -eq 0 && as_status=1
     8871  if test "$4"; then
     8872    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     8873    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
    83168874  fi
    8317   $as_echo "$as_me: error: $1" >&2
     8875  $as_echo "$as_me: error: $2" >&2
    83188876  as_fn_exit $as_status
    83198877} # as_fn_error
    … …  
    85119069    done
    85129070    test -z "$as_dirs" || eval "mkdir $as_dirs"
    8513   } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
     9071  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
    85149072
    85159073
    … …  
    85659123ac_log="
    85669124This file was extended by vizservers $as_me 0.1, which was
    8567 generated by GNU Autoconf 2.65.  Invocation command line was
     9125generated by GNU Autoconf 2.68.  Invocation command line was
    85689126
    85699127  CONFIG_FILES    = $CONFIG_FILES
    … …  
    86279185ac_cs_version="\\
    86289186vizservers config.status 0.1
    8629 configured by $0, generated by GNU Autoconf 2.65,
     9187configured by $0, generated by GNU Autoconf 2.68,
    86309188  with options \\"\$ac_cs_config\\"
    86319189
    8632 Copyright (C) 2009 Free Software Foundation, Inc.
     9190Copyright (C) 2010 Free Software Foundation, Inc.
    86339191This config.status script is free software; the Free Software Foundation
    86349192gives unlimited permission to copy, distribute and modify it."
    … …  
    86479205do
    86489206  case $1 in
    8649   --*=*)
     9207  --*=?*)
    86509208    ac_option=`expr "X$1" : 'X\([^=]*\)='`
    86519209    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     9210    ac_shift=:
     9211    ;;
     9212  --*=)
     9213    ac_option=`expr "X$1" : 'X\([^=]*\)='`
     9214    ac_optarg=
    86529215    ac_shift=:
    86539216    ;;
    … …  
    86739236    case $ac_optarg in
    86749237    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     9238    '') as_fn_error $? "missing file argument" ;;
    86759239    esac
    86769240    as_fn_append CONFIG_FILES " '$ac_optarg'"
    … …  
    86859249  --he | --h)
    86869250    # Conflict between --help and --header
    8687     as_fn_error "ambiguous option: \`$1'
     9251    as_fn_error $? "ambiguous option: \`$1'
    86889252Try \`$0 --help' for more information.";;
    86899253  --help | --hel | -h )
    … …  
    86949258
    86959259  # This is an error.
    8696   -*) as_fn_error "unrecognized option: \`$1'
     9260  -*) as_fn_error $? "unrecognized option: \`$1'
    86979261Try \`$0 --help' for more information." ;;
    86989262
    … …  
    87569320    "nanovis/transfer-function/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/transfer-function/Makefile" ;;
    87579321    "pymolproxy/Makefile") CONFIG_FILES="$CONFIG_FILES pymolproxy/Makefile" ;;
     9322    "vtkvis/Doxyfile") CONFIG_FILES="$CONFIG_FILES vtkvis/Doxyfile" ;;
     9323    "vtkvis/Makefile") CONFIG_FILES="$CONFIG_FILES vtkvis/Makefile" ;;
    87589324    "start_viz.sh") CONFIG_FILES="$CONFIG_FILES start_viz.sh" ;;
    87599325
    8760   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
     9326  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
    87619327  esac
    87629328done
    … …  
    87809346$debug ||
    87819347{
    8782   tmp=
     9348  tmp= ac_tmp=
    87839349  trap 'exit_status=$?
    8784   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
     9350  : "${ac_tmp:=$tmp}"
     9351  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
    87859352' 0
    87869353  trap 'as_fn_exit 1' 1 2 13 15
    … …  
    87909357{
    87919358  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
    8792   test -n "$tmp" && test -d "$tmp"
     9359  test -d "$tmp"
    87939360}  ||
    87949361{
    87959362  tmp=./conf$$-$RANDOM
    87969363  (umask 077 && mkdir "$tmp")
    8797 } || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
     9364} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
     9365ac_tmp=$tmp
    87989366
    87999367# Set up the scripts for CONFIG_FILES section.
    … …  
    88129380ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
    88139381if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
    8814   ac_cs_awk_cr='\r'
     9382  ac_cs_awk_cr='\\r'
    88159383else
    88169384  ac_cs_awk_cr=$ac_cr
    88179385fi
    88189386
    8819 echo 'BEGIN {' >"$tmp/subs1.awk" &&
     9387echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
    88209388_ACEOF
    88219389
    … …  
    88269394  echo "_ACEOF"
    88279395} >conf$$subs.sh ||
    8828   as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    8829 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
     9396  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
     9397ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
    88309398ac_delim='%!_!# '
    88319399for ac_last_try in false false false false false :; do
    88329400  . ./conf$$subs.sh ||
    8833     as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
     9401    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
    88349402
    88359403  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
    … …  
    88379405    break
    88389406  elif $ac_last_try; then
    8839     as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
     9407    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
    88409408  else
    88419409    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    … …  
    88459413
    88469414cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
    8847 cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
     9415cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
    88489416_ACEOF
    88499417sed -n '
    … …  
    88939461cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
    88949462_ACAWK
    8895 cat >>"\$tmp/subs1.awk" <<_ACAWK &&
     9463cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
    88969464  for (key in S) S_is_set[key] = 1
    88979465  FS = ""
    … …  
    89259493else
    89269494  cat
    8927 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
    8928   || as_fn_error "could not setup config files machinery" "$LINENO" 5
    8929 _ACEOF
    8930 
    8931 # VPATH may cause trouble with some makes, so we remove $(srcdir),
    8932 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
     9495fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
     9496  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
     9497_ACEOF
     9498
     9499# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
     9500# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
    89339501# trailing colons and then remove the whole line if VPATH becomes empty
    89349502# (actually we leave an empty line to preserve line numbers).
    89359503if test "x$srcdir" = x.; then
    8936   ac_vpsub='/^[  ]*VPATH[        ]*=/{
    8937 s/:*\$(srcdir):*/:/
    8938 s/:*\${srcdir}:*/:/
    8939 s/:*@srcdir@:*/:/
    8940 s/^\([^=]*=[     ]*\):*/\1/
     9504  ac_vpsub='/^[  ]*VPATH[        ]*=[    ]*/{
     9505h
     9506s///
     9507s/^/:/
     9508s/[      ]*$/:/
     9509s/:\$(srcdir):/:/g
     9510s/:\${srcdir}:/:/g
     9511s/:@srcdir@:/:/g
     9512s/^:*//
    89419513s/:*$//
     9514x
     9515s/\(=[   ]*\).*/\1/
     9516G
     9517s/\n//
    89429518s/^[^=]*=[       ]*$//
    89439519}'
    … …  
    89519527# This happens for instance with `./config.status Makefile'.
    89529528if test -n "$CONFIG_HEADERS"; then
    8953 cat >"$tmp/defines.awk" <<\_ACAWK ||
     9529cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
    89549530BEGIN {
    89559531_ACEOF
    … …  
    89639539ac_delim='%!_!# '
    89649540for ac_last_try in false false :; do
    8965   ac_t=`sed -n "/$ac_delim/p" confdefs.h`
    8966   if test -z "$ac_t"; then
     9541  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
     9542  if test -z "$ac_tt"; then
    89679543    break
    89689544  elif $ac_last_try; then
    8969     as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
     9545    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
    89709546  else
    89719547    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    … …  
    90529628_ACEOF
    90539629cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
    9054   as_fn_error "could not setup config headers machinery" "$LINENO" 5
     9630  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
    90559631fi # test -n "$CONFIG_HEADERS"
    90569632
    … …  
    90659641  case $ac_mode$ac_tag in
    90669642  :[FHL]*:*);;
    9067   :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
     9643  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
    90689644  :[FH]-) ac_tag=-:-;;
    90699645  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    … …  
    90849660    do
    90859661      case $ac_f in
    9086       -) ac_f="$tmp/stdin";;
     9662      -) ac_f="$ac_tmp/stdin";;
    90879663      *) # Look for the file first in the build tree, then in the source tree
    90889664         # (if the path is not absolute).  The absolute path cannot be DOS-style,
    … …  
    90939669           *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
    90949670           esac ||
    9095            as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
     9671           as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
    90969672      esac
    90979673      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
    … …  
    91199695
    91209696    case $ac_tag in
    9121     *:-:* | *:-) cat >"$tmp/stdin" \
    9122       || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
     9697    *:-:* | *:-) cat >"$ac_tmp/stdin" \
     9698      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
    91239699    esac
    91249700    ;;
    … …  
    92569832$ac_datarootdir_hack
    92579833"
    9258 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
    9259   || as_fn_error "could not create $ac_file" "$LINENO" 5
     9834eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
     9835  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
    92609836
    92619837test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
    9262   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
    9263   { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
     9838  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
     9839  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' \
     9840      "$ac_tmp/out"`; test -z "$ac_out"; } &&
    92649841  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
    9265 which seems to be undefined.  Please make sure it is defined." >&5
     9842which seems to be undefined.  Please make sure it is defined" >&5
    92669843$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
    9267 which seems to be undefined.  Please make sure it is defined." >&2;}
    9268 
    9269   rm -f "$tmp/stdin"
     9844which seems to be undefined.  Please make sure it is defined" >&2;}
     9845
     9846  rm -f "$ac_tmp/stdin"
    92709847  case $ac_file in
    9271   -) cat "$tmp/out" && rm -f "$tmp/out";;
    9272   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
     9848  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
     9849  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
    92739850  esac \
    9274   || as_fn_error "could not create $ac_file" "$LINENO" 5
     9851  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
    92759852 ;;
    92769853  :H)
    … …  
    92819858    {
    92829859      $as_echo "/* $configure_input  */" \
    9283       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
    9284     } >"$tmp/config.h" \
    9285       || as_fn_error "could not create $ac_file" "$LINENO" 5
    9286     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
     9860      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     9861    } >"$ac_tmp/config.h" \
     9862      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     9863    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
    92879864      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
    92889865$as_echo "$as_me: $ac_file is unchanged" >&6;}
    92899866    else
    92909867      rm -f "$ac_file"
    9291       mv "$tmp/config.h" "$ac_file" \
    9292         || as_fn_error "could not create $ac_file" "$LINENO" 5
     9868      mv "$ac_tmp/config.h" "$ac_file" \
     9869        || as_fn_error $? "could not create $ac_file" "$LINENO" 5
    92939870    fi
    92949871  else
    92959872    $as_echo "/* $configure_input  */" \
    9296       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
    9297       || as_fn_error "could not create -" "$LINENO" 5
     9873      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
     9874      || as_fn_error $? "could not create -" "$LINENO" 5
    92989875  fi
    92999876 ;;
    … …  
    93109887
    93119888test $ac_write_fail = 0 ||
    9312   as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
     9889  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
    93139890
    93149891
    … …  
    93319908  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    93329909  # would make configure fail if this is the last instruction.
    9333   $ac_cs_success || as_fn_exit $?
     9910  $ac_cs_success || as_fn_exit 1
    93349911fi
    93359912if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then

  • branches/blt4/packages/vizservers/configure.in

    r2098 r2120  
     1AC_PREREQ([2.60])
    12AC_INIT(vizservers, 0.1, rappture@nanohub.org)
    23AC_CONFIG_HEADER(nanovis/nvconf.h nanoscale/config.h)
     4
     5AC_ARG_WITH(
     6    [tcllib],
     7    [AS_HELP_STRING([--with-tcllib[=DIR]],
     8        [location of Tcl binary library libtclstubs.a @<:@default=/usr/lib@:>@])],
     9    [with_tcllib=$withval],
     10    [with_tcllib=""])
     11
     12AC_ARG_WITH(
     13    [rappture],
     14    [AS_HELP_STRING([--with-rappture[=DIR]],
     15        [location of rappture files lib/librappture2.a and include/rappture2/rappture2.h @<:@default=/usr@:>@])],
     16    [with_rappture=$withval],
     17    [with_rappture=/usr])
     18
     19AC_ARG_WITH(
     20    [vtk-includes],
     21    [AS_HELP_STRING([--with-vtk-includes=DIR],
     22        [VTK include files are in DIR])],
     23    [with_vtk_includes=$withval],
     24    [with_vtk_includes=/usr/include/vtk-5.6])
     25
     26AC_ARG_WITH(
     27    [vtk-libs],
     28    [AS_HELP_STRING([--with-vtk-libs=DIR],
     29        [VTK libraries are in DIR])],
     30    [with_vtk_libs=$withval],
     31    [with_vtk_libs=/usr/lib/vtk-5.6])
    332
    433VERSION=0.0.1
    … …  
    3261AC_SUBST(SHLIB_SUFFIX)
    3362
     63AC_PATH_X
     64
    3465AC_PROG_INSTALL
    3566AC_PROG_RANLIB
    … …  
    6293LD_RPATH="";
    6394
    64 SUBDIRS="nanoscale nanovis pymolproxy"
     95SUBDIRS="nanoscale nanovis pymolproxy vtkvis"
    6596AC_SUBST(SUBDIRS)
    66 
    67 AC_ARG_WITH(
    68     [tcllib],
    69     [AS_HELP_STRING([--with-tcllib[=DIR]],
    70         [location of Tcl binary library libtclstubs.a @<:@default=/usr/lib@:>@])],
    71     [with_tcllib=$withval],
    72     [with_tcllib=""])
    7397
    7498#
    … …  
    115139AC_SUBST(TCL_INC_SPEC)
    116140AC_SUBST(TCL_LIB_SPEC)
    117 
    118 AC_ARG_WITH(
    119     [rappture],
    120     [AS_HELP_STRING([--with-rappture[=DIR]],
    121         [location of rappture files lib/librappture2.a and include/rappture2/rappture2.h @<:@default=/usr@:>@])],
    122     [with_rappture=$withval],
    123     [with_rappture=/usr])
    124141
    125142RP2_INCL_DIR=""
    … …  
    164181AC_SUBST(RP_DIR)
    165182
     183if test "x$with_vtk_includes" != "x"; then
     184   VTK_INC_SPEC=-I$with_vtk_includes
     185fi
     186
     187save_CPPFLAGS=$CPPFLAGS
     188CPPFLAGS=$VTK_INC_SPEC
     189AC_CHECK_HEADERS([vtkSmartPointer.h], [], [AC_MSG_ERROR([cannot find VTK includes])])
     190CPPFLAGS=$save_CPPFLAGS
     191
     192if test "x$with_vtk_libs" != "x"; then
     193   VTK_LIB_DIR=$with_vtk_libs
     194fi
     195
     196AC_SUBST(VTK_INC_SPEC)
     197AC_SUBST(VTK_LIB_DIR)
     198
    166199AC_CHECK_HEADER([GL/glui.h])
    167200AC_CHECK_HEADER([glui.h])
    … …  
    197230AC_MSG_RESULT([${DX_INC_DIR}])
    198231
    199 AC_MSG_CHECKING([for OpenDX libraries])
    200232DX_LIB_DIR=""
    201233found=no
    202234for dir in \
    203  /apps/rappture/lib \
     235 /usr/lib \
     236 /usr/lib64 \
     237 /usr/dx/lib_linux \
    204238 /usr/lib/dx/lib_linux \
    205  /usr/dx/lib_linux \
    206  /usr/lib
    207239 /usr/lib64/dx/lib_linux \
    208  /usr/lib64
     240 /apps/rappture/lib
    209241do
    210   saveLIBS=$LIBS
    211   LIBS=-L$dir
    212   AC_CHECK_LIB([DXCallm], [], [found=yes], [found=no])
    213   LIBS=$saveLIBS
    214   if test "found" = "yes" ; then
     242  saveLDFLAGS=$LDFLAGS
     243  LDFLAGS="-L$dir $LDFLAGS"
     244  unset ac_cv_lib_DXcallm_DXGetComponentValue
     245  AC_CHECK_LIB([DXcallm], [DXGetComponentValue], [found=yes], [found=no], [-lX11])
     246  LDFLAGS=$saveLDFLAGS
     247  if test "$found" = "yes" ; then
    215248    DX_LIB_DIR="$dir"
    216249    break
    … …  
    218251done
    219252if test "x{$DX_LIB_DIR}" = "x" ; then
    220   AC_MSG_ERROR([can't find OpenDX libraries])
    221 fi
    222 
     253  AC_MSG_ERROR([cant find OpenDX libraries])
     254fi
     255
     256AC_MSG_CHECKING([for libDXcallm library])
    223257if test "${DX_LIB_DIR}" = "/usr/lib" -o "${DX_LIB_DIR}" = "/usr/lib64"; then
    224258  DX_LIB_SPEC=""
    … …  
    226260  DX_LIB_SPEC="-L${DX_LIB_DIR}"
    227261fi
    228 
     262AC_MSG_RESULT([$DX_LIB_SPEC])
    229263AC_SUBST(DX_LIB_SPEC)
    230 AC_MSG_RESULT([${DX_LIB_DIR}])
     264
     265AC_CHECK_HEADERS([opencv/cv.h opencv/highgui.h])
     266AC_CHECK_LIB([cv], [cvLoadImage])
     267
     268save_CPPFLAGS=$CPPFLAGS
     269# Test for redhat-specific location of ffmpeg headers.
     270if test -d "/usr/include/ffmpeg" ; then
     271  CPPFLAGS="$CPPFLAGS -I/usr/include/ffmpeg"
     272  FF_INC_SPEC="-I/usr/include/ffmpeg"
     273fi
     274AC_SUBST(FF_INC_SPEC)
    231275
    232276AC_CHECK_HEADERS([ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h],,,[
    … …  
    240284#endif
    241285])
    242 
    243 oldLIBS=$LIBS
    244 LIBS=-lavcodec
    245 AC_CHECK_FUNCS(img_convert)
    246 LIBS=-lavformat
    247 AC_CHECK_FUNCS(avformat_alloc_context)
    248 LIBS=$oldLIBS
     286CPPFLAGS=$save_CPPFLAGS
     287
     288AC_CHECK_LIB([avcodec], [avcodec_alloc_frame])
     289# Fallback to deprecated av_alloc_format_context if avformat_alloc_context isn't found
     290AC_CHECK_LIB([avformat], [avformat_alloc_context], [],
     291    AC_CHECK_LIB([avformat], [av_alloc_format_context], [],
     292        [AC_MSG_WARN([libavformat not usable])]))
     293AC_CHECK_LIB([avutil], [av_free])
     294AC_CHECK_FUNCS([img_convert])
    249295
    250296AC_MSG_CHECKING([for nVidia Cg installation])
    … …  
    269315  LD_RPATH="$loader_run_path:${CG_DIR}/lib"
    270316fi
    271 
     317AC_SUBST(LIBS)
    272318AC_SUBST(CG_DIR)
    273319AC_MSG_RESULT([${CG_DIR}])
    … …  
    297343            nanovis/transfer-function/Makefile \
    298344            pymolproxy/Makefile \
     345            vtkvis/Doxyfile \
     346            vtkvis/Makefile \
    299347            start_viz.sh    )

  • branches/blt4/packages/vizservers/nanoscale/server.c

    r2098 r2120  
    1 
    21#include <stdio.h>
    32#include <unistd.h>
    … …  
    105104    return index;
    106105}
     106#endif
    107107
    108108static void
    … …  
    119119    }
    120120}
    121 #endif
    122121
    123122static void
    … …  
    162161}
    163162
    164 #ifdef notdef
    165163static void
    166164update_load_average(void)
    … …  
    191189    sigalarm_set = 1;
    192190}
    193 #endif
    194191
    195192static void
    … …  
    386383    send_addr.sin_port = htons(recv_port);
    387384
    388 #ifdef notdef
    389385    // Set up a signal handler for the alarm interrupt.
    390386    // It doesn't do anything other than interrupt select() below.
    … …  
    392388        perror("signal SIGALRM");
    393389    }
     390
    394391    struct itimerval itvalue = {
    395392        {1, 0}, {1, 0}
    … …  
    399396        perror("setitimer");
    400397    }
    401 #endif
    402398
    403399    // We're ready to go.  Before going into the main loop,
    … …  
    431427        status = select(maxfd+1, &rfds, NULL, NULL, 0);
    432428        if (status <= 0) {
    433 #ifdef notdef
    434429            if (sigalarm_set) {
    435430                update_load_average();
    436431                sigalarm_set = 0;
    437432            }
    438 #endif
    439433            continue;
    440434        }
    … …  
    660654                 
    661655                    children++;
    662 #ifdef notdef
    663656                    broadcast_load();
    664 #endif
    665657                }
    666658             

  • branches/blt4/packages/vizservers/nanovis/DataLoader.cpp

    r1816 r2120  
    286286        int size = width * height * depth;
    287287        float* srcdata = (float*) malloc(size * sizeof(float) * 4);
    288         size_t sz = fread(srcdata, size * 4 * sizeof(float), 1, fp);
     288        fread(srcdata, size * 4 * sizeof(float), 1, fp);
    289289        fclose(fp);
    290290
    … …  
    314314
    315315        int size = width * height * depth;
    316         size_t sz = fread(data, size * 4 * sizeof(float), 1, fp);
     316        fread(data, size * 4 * sizeof(float), 1, fp);
    317317        fclose(fp);
    318318}
    … …  
    347347        int index = 0;
    348348
    349         union {
    350                 char ch[4];
    351                 int v;
    352         } value;
    353 
    354349        int size = width * height * depth;
    355350        srcdata = (float*) malloc(size * sizeof(float) * 3);
    356351        memset(srcdata, 0, size * sizeof(float) * 3);
    357         size_t sz;
    358         if (skipByte != 0) sz = fread(srcdata, skipByte, 1, fp);
    359         sz = fread(srcdata, size * 3 * sizeof(float), 1, fp);
     352        if (skipByte != 0) fread(srcdata, skipByte, 1, fp);
     353        fread(srcdata, size * 3 * sizeof(float), 1, fp);
    360354        fclose(fp);
    361355

  • branches/blt4/packages/vizservers/nanovis/FlowCmd.cpp

    r2098 r2120  
    11#include <nvconf.h>
    2 #if defined(HAVE_FFMPEG_AVFORMAT_H) || defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
     2#if defined(HAVE_LIBAVCODEC) || defined(HAVE_LIBAVFORMAT)
    33#define HAVE_FFMPEG 1
    44#endif

  • branches/blt4/packages/vizservers/nanovis/Makefile.in

    r2098 r2120  
    3636DX_LIB_SPEC      = @DX_LIB_SPEC@ -lDXcallm
    3737FF_LIB_SPEC     = @LIBS@
     38FF_INC_SPEC     = @FF_INC_SPEC@
    3839
    3940GL_INC_SPEC     = -I/usr/include/GL
    … …  
    100101                $(VR3D_INC_SPEC) \
    101102                $(TCL_INC_SPEC) \
     103                $(FF_INC_SPEC) \
    102104                $(CG_INC_SPEC) \
    103105                $(GL_INC_SPEC) \
    … …  
    105107
    106108CC              = @CC@
     109CXX             = @CXX@
    107110CFLAGS          = @CFLAGS@
    108111EXTRA_CFLAGS    = -Wall
    109112DEFINES         =
    110 CC_SWITCHES     = $(CFLAGS) $(EXTRA_CFLAGS) $(DEFINES) $(INCLUDES)
     113CXX_SWITCHES     = $(CFLAGS) $(EXTRA_CFLAGS) $(DEFINES) $(INCLUDES)
    111114
    112115OBJS            = \
    … …  
    181184resources       = \
    182185                $(srcdir)/resources/Font.bmp \
    183                 $(srcdir)/resource/arrows_flip2.png \
    184                 $(srcdir)/resource/arrows_red_bg.bmp \
    185                 $(srcdir)/resource/arrows.bmp \
     186                $(srcdir)/resources/arrows_flip2.png \
     187                $(srcdir)/resources/arrows_red_bg.bmp \
     188                $(srcdir)/resources/arrows.bmp \
    186189                $(srcdir)/resources/particle2.bmp \
    187190                $(srcdir)/resources/verdana.fnt \
    … …  
    217220                $(srcdir)/shaders/velocity.cg
    218221
    219 .PHONY: newmat11 R2 imgloaders vrmath vrutil vr3d transfer-function nanovis
     222.PHONY: newmat11 R2 imgloaders vrmath vrutil vr3d transfer-function
    220223
    221224all: newmat11 R2 imgloaders vrmath vrutil vr3d transfer-function nanovis
    … …  
    249252
    250253nanovis: $(MAT_LIB) $(R2_LIB) $(IMG_LIB) $(VRMATH_LIB) $(VRUTIL_LIB) $(VR3D_LIB) $(OBJS)
    251         $(CC) $(CC_SWITCHES) -o $@ $^ $(LIBS)
     254        $(CXX) $(CXX_SWITCHES) -o $@ $^ $(LIBS)
    252255
    253256.cpp.o:
    254         $(CC) $(CC_SWITCHES) -o $@ -c $<
     257        $(CXX) $(CXX_SWITCHES) -o $@ -c $<
    255258
    256259dxReader2.o: $(srcdir)/dxReader2.cpp
    257         $(CC) -c $(CC_SWITCHES) $(DX_INC_SPEC) $?
     260        $(CXX) -c $(CXX_SWITCHES) $(DX_INC_SPEC) $?
    258261RpDX.o: $(srcdir)/RpDX.cpp
    259         $(CC) -c $(CC_SWITCHES) $(DX_INC_SPEC) $?
     262        $(CXX) -c $(CXX_SWITCHES) $(DX_INC_SPEC) $?
    260263RpAVTranslate.o: $(srcdir)/RpAVTranslate.cpp
    261         $(CC) -c $(CC_SWITCHES) $(FF_INC_SPEC) $?
     264        $(CXX) -c $(CXX_SWITCHES) $(FF_INC_SPEC) $?
    262265
    263266client: Socket.o ClientSocket.o RenderClient.o Event.o
    264         $(CC) $(CC_SWITCHES) -o $@ $^ $(LIBS)
     267        $(CXX) $(CXX_SWITCHES) -o $@ $^ $(LIBS)
    265268
    266269Socket.o: socket/Socket.cpp socket/Socket.h
    267         $(CC) $(CC_SWITCHES) -o $@ -c $<
     270        $(CXX) $(CXX_SWITCHES) -o $@ -c $<
    268271ClientSocket.o: socket/ClientSocket.cpp socket/ClientSocket.h
    269         $(CC) $(CC_SWITCHES) -o $@ -c $<
     272        $(CXX) $(CXX_SWITCHES) -o $@ -c $<
    270273RenderClient.o: socket/RenderClient.cpp socket/RenderClient.h
    271         $(CC) $(CC_SWITCHES) -o $@ -c $<
     274        $(CXX) $(CXX_SWITCHES) -o $@ -c $<
    272275
    273276install-resources:
    274         $(MKDIR_P) -m 0755 $(libdir)/resources
     277        $(MKDIR_P) $(libdir)/resources
    275278        @for i in $(resources) ; do \
    276279            echo "installing $$i..." ; \
    … …  
    279282
    280283install-shaders:
    281         $(MKDIR_P) -m 0755 $(libdir)/shaders
     284        $(MKDIR_P) $(libdir)/shaders
    282285        @for i in $(shaders) ; do \
    283286            echo "installing $$i..." ; \

  • branches/blt4/packages/vizservers/nanovis/NvEventLog.cpp

    r1994 r2120  
    1616
    1717#ifdef XINETD
    18 void
    19 NvInitService()
     18void NvInitService()
    2019{
    2120    const char* user = getenv("USER");
    … …  
    3534    }
    3635
    37     // Open log and map stderr to log file.
     36    //open log and map stderr to log file
    3837    NanoVis::logfile = fopen(logName, "w");
    3938    close(2);
    4039    dup2(fileno(NanoVis::logfile), 2);
    4140    dup2(2,1);
    42     // Flush junk
     41    //flush junk
    4342    fflush(stdout);
    4443    fflush(stderr);
    4544
     45    // clean up malloc'd memory
    4646    if (logName != NULL) {
    4747        free(logName);
    … …  
    4949}
    5050
    51 void
    52 NvExitService()
     51void NvExitService()
    5352{
     53    //close log file
    5454    if (NanoVis::logfile != NULL) {
    5555        fclose(NanoVis::logfile);

  • branches/blt4/packages/vizservers/nanovis/ParticleSystem.cpp

    r2098 r2120  
    1313#include <GL/glaux.h>
    1414#else
    15 #ifdef HAVE_OPENVC_CV_H
    1615#include <opencv/cv.h>
    17 #endif
    18 #ifdef HAVE_OPENCV_HIGHGUI_H
    1916#include <opencv/highgui.h>
    20 #endif
    2117#endif
    2218

  • branches/blt4/packages/vizservers/nanovis/R2/src/Makefile.in

    r951 r2120  
    2222RANLIB          = @RANLIB@
    2323CC              = @CC@
     24CXX             = @CXX@
    2425VPATH           = $(srcdir)
    2526
    … …  
    2930EXTRA_CFLAGS    = -Wall
    3031DEFINES         = @DEFINES@
    31 CC_SWITCHES     = $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDES)
     32CXX_SWITCHES    = $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDES)
    3233
    3334OBJS            = \
    … …  
    5253
    5354.cpp.o:
    54         $(CC) $(CC_SWITCHES) -o $@ -c $<
     55        $(CXX) $(CXX_SWITCHES) -o $@ -c $<
    5556
    5657clean:

  • branches/blt4/packages/vizservers/nanovis/R2/src/R2Geometry.cpp

    r1982 r2120  
    1313}
    1414
    15 R2Geometry::R2Geometry(
    16     int primitive,
    17     R2VertexBuffer* vertexBuffer,
    18     R2VertexBuffer* colorBuffer,
    19     R2IndexBuffer* indexBuffer) :
     15R2Geometry::R2Geometry(int primitive, R2VertexBuffer* vertexBuffer,
     16                       R2VertexBuffer* colorBuffer, R2IndexBuffer* indexBuffer) :
    2017    _vertexBuffer(vertexBuffer),
    2118    _colorBuffer(colorBuffer),
    … …  
    2825R2Geometry::~R2Geometry()
    2926{
    30     if (_indexBuffer != NULL) {
    31         delete _indexBuffer;
    32     }
    33     if (_colorBuffer != NULL) {
    34         delete _colorBuffer;
    35     }
    36     if (_vertexBuffer != NULL) {
    37         delete _vertexBuffer;
    38     }
    3927}
    4028

  • branches/blt4/packages/vizservers/nanovis/R2/src/R2VertexBuffer.cpp

    r1982 r2120  
    55#include <stdlib.h>
    66
    7 R2VertexBuffer::R2VertexBuffer(int type, int vertexCount, int byteSize,
    8                                void* data, bool copy) :
    9     _graphicObjectID(0),
    10     _byteSize(byteSize),
    11     _vertexCount(vertexCount)
     7R2VertexBuffer::R2VertexBuffer(int type, int vertexCount, int byteSize, void* data, bool copy)
     8: _graphicObjectID(0), _byteSize(byteSize), _vertexCount(vertexCount)
    129{
    13     if (copy) {
    14         _data = malloc(byteSize);
    15     } else {
    16         _data = data;
    17     }
    18     glGenBuffers(1, &_graphicObjectID);
    19     glBindBuffer(GL_ARRAY_BUFFER, _graphicObjectID);
    20     glBufferData(GL_ARRAY_BUFFER, _byteSize, data, GL_STATIC_DRAW);
     10        if (copy)
     11        {
     12                _data = (void*) malloc(byteSize);
     13        }
     14        else
     15        {
     16                _data = data;
     17        }
     18
     19        glGenBuffers(1, &_graphicObjectID);
     20        glBindBuffer(GL_ARRAY_BUFFER, _graphicObjectID);
     21    glBufferData(GL_ARRAY_BUFFER,
     22                  _byteSize,
     23                  data,
     24                  GL_STATIC_DRAW);
    2125    glBindBuffer(GL_ARRAY_BUFFER, 0);
    2226}
    … …  
    2428R2VertexBuffer::~R2VertexBuffer()
    2529{
    26     if (_graphicObjectID != 0) {
    27         glDeleteBuffers(1, &_graphicObjectID);
    28     }
    29     if (_data) {
    30         free(_data);
    31     }
     30        if (_graphicObjectID != 0)
     31        {
     32                glDeleteBuffers(1, &_graphicObjectID);
     33        }
     34
     35        if (_data)
     36        {
     37                free(_data);
     38        }
    3239}

  • branches/blt4/packages/vizservers/nanovis/RpAVTranslate.cpp

    r1571 r2120  
    1616#include "nvconf.h"
    1717
     18#if defined(HAVE_LIBAVCODEC) || defined(HAVE_LIBAVFORMAT)
    1819#include <cstdlib>
    1920#include <cstdio>
    … …  
    436437*/
    437438
     439#endif /* HAVE_LIBAVCODEC && HAVE_LIBAVFORMAT */

  • branches/blt4/packages/vizservers/nanovis/VelocityArrowsSlice.cpp

    r2098 r2120  
    88#include <GL/glaux.h>
    99#else
    10 #ifdef HAVE_OPENCV_CV_H
    1110//#include <opencv/cv.h>
    12 #endif
    13 #ifdef HAVE_OPENCV_HIGHGUI_H
    1411//#include <opencv/highgui.h>
    15 #endif
    1612#endif
    1713

  • branches/blt4/packages/vizservers/nanovis/nvconf.h.in

    r1874 r2120  
    66/* Define to 1 if you have the <arpa/inet.h> header file. */
    77#undef HAVE_ARPA_INET_H
    8 
    9 /* Define to 1 if you have the `avformat_alloc_context' function. */
    10 #undef HAVE_AVFORMAT_ALLOC_CONTEXT
    118
    129/* Define to 1 if you have the <ffmpeg/avcodec.h> header file. */
    … …  
    2522#undef HAVE_INTTYPES_H
    2623
     24/* Define to 1 if you have the `avcodec' library (-lavcodec). */
     25#undef HAVE_LIBAVCODEC
     26
    2727/* Define to 1 if you have the <libavcodec/avcodec.h> header file. */
    2828#undef HAVE_LIBAVCODEC_AVCODEC_H
     29
     30/* Define to 1 if you have the `avformat' library (-lavformat). */
     31#undef HAVE_LIBAVFORMAT
    2932
    3033/* Define to 1 if you have the <libavformat/avformat.h> header file. */
    3134#undef HAVE_LIBAVFORMAT_AVFORMAT_H
    3235
     36/* Define to 1 if you have the `avutil' library (-lavutil). */
     37#undef HAVE_LIBAVUTIL
     38
    3339/* Define to 1 if you have the <libavutil/avutil.h> header file. */
    3440#undef HAVE_LIBAVUTIL_AVUTIL_H
     41
     42/* Define to 1 if you have the `cv' library (-lcv). */
     43#undef HAVE_LIBCV
    3544
    3645/* Define to 1 if you have the <memory.h> header file. */
    … …  
    4251/* Define to 1 if you have the <netinet/in.h> header file. */
    4352#undef HAVE_NETINET_IN_H
     53
     54/* Define to 1 if you have the <opencv/cv.h> header file. */
     55#undef HAVE_OPENCV_CV_H
     56
     57/* Define to 1 if you have the <opencv/highgui.h> header file. */
     58#undef HAVE_OPENCV_HIGHGUI_H
    4459
    4560/* Define to 1 if you have the <rappture.h> header file. */

  • branches/blt4/packages/vizservers/nanovis/vr3d/Makefile.in

    r1822 r2120  
    2222RANLIB          = @RANLIB@
    2323CC              = @CC@
     24CXX             = @CXX@
    2425VPATH           = $(srcdir)
    2526
    … …  
    2930EXTRA_CFLAGS    = -Wall
    3031DEFINES         = @DEFINES@
    31 CC_SWITCHES     = $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDES)
     32CXX_SWITCHES    = $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDES)
    3233
    3334VR3DLIB         = vr3d.a
    … …  
    5051
    5152.cpp.o:
    52         $(CC) $(CC_SWITCHES) -o $@ -c $<
     53        $(CXX) $(CXX_SWITCHES) -o $@ -c $<
    5354
    5455clean:

  • branches/blt4/packages/vizservers/nanovis/vr3d/include/vr3d/vrTexture.h

    r1822 r2120  
    6161         */
    6262        TEXFILTER               _magFilter;
    63 
    64         /**
    65          * @brief image data
    66          * @brief Default value is NULL
    67          */
    68         void*                   _pixels;
    6963
    7064        /**

  • branches/blt4/packages/vizservers/nanovis/vr3d/vrTexture.cpp

    r1822 r2120  
    99  _minFilter(TF_LINEAR),
    1010  _magFilter(TF_LINEAR),
    11   _pixels(0),
    1211  _compCount(4)
    1312{

  • branches/blt4/packages/vizservers/nanovis/vr3d/vrTexture1D.cpp

    r1822 r2120  
    4646        }
    4747
    48         if (_pixels)
    49         {
    50                 delete [] _pixels;
    51         }
    52 
    5348        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
    5449        glGenTextures(1, &_objectID);

  • branches/blt4/packages/vizservers/nanovis/vr3d/vrTexture2D.cpp

    r1822 r2120  
    7070        }
    7171
    72         if (_pixels)
    73         {
    74                 delete [] _pixels;
    75         }
    76 
    7772        //glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
    7873        glGenTextures(1, &_objectID);

  • branches/blt4/packages/vizservers/nanovis/vr3d/vrTexture3D.cpp

    r1822 r2120  
    5050        }
    5151
    52         if (_pixels)
    53         {
    54                 delete [] _pixels;
    55         }
    56 
    5752        //glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
    5853        glGenTextures(1, &_objectID);

  • branches/blt4/packages/vizservers/nanovis/vrmath/Makefile.in

    r1822 r2120  
    2222RANLIB          = @RANLIB@
    2323CC              = @CC@
     24CXX             = @CXX@
    2425VPATH           = $(srcdir)
    2526
    … …  
    2930EXTRA_CFLAGS    = -Wall
    3031DEFINES         = @DEFINES@
    31 CC_SWITCHES     = $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDES)
     32CXX_SWITCHES    = $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDES)
    3233
    3334VRMATHLIB       = vrmath.a
    … …  
    5960
    6061.cpp.o:
    61         $(CC) $(CC_SWITCHES) -o $@ -c $<
     62        $(CXX) $(CXX_SWITCHES) -o $@ -c $<
    6263
    6364clean:

  • branches/blt4/packages/vizservers/nanovis/vrmath/vrPlane.cpp

    r1822 r2120  
    1111
    1212    distance = m[12]*v.x + m[13]*v.y + m[14]*v.z + m[15]*v.w;
    13  }
     13}

  • branches/blt4/packages/vizservers/nanovis/vrutil/Makefile.in

    r1822 r2120  
    2222RANLIB          = @RANLIB@
    2323CC              = @CC@
     24CXX             = @CXX@
    2425VPATH           = $(srcdir)
    2526
    … …  
    2930EXTRA_CFLAGS    = -Wall
    3031DEFINES         = @DEFINES@
    31 CC_SWITCHES     = $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDES)
     32CXX_SWITCHES    = $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDES)
    3233
    3334VRUTILLIB       = vrutil.a
    … …  
    5152
    5253.cpp.o:
    53         $(CC) $(CC_SWITCHES) -o $@ -c $<
     54        $(CXX) $(CXX_SWITCHES) -o $@ -c $<
    5455
    5556clean:

  • branches/blt4/packages/vizservers/start_viz.sh.in

    r1278 r2120  
    1313
    1414render_dir="@prefix@"
     15vtk_lib_dir="@VTK_LIB_DIR@"
    1516nanoscale_port=2000
    1617nanovis_port=2000
     18vtkvis_port=2010
    1719pymol_port=2020
    1820
    … …  
    2224dir="/tmp/`basename $render_dir`"
    2325
     26# Get the versioned VTK library directory (e.g. "vtk-5.6")
     27vtkdir="`basename $vtk_lib_dir`"
    2428
    2529PATH=${dir}/bin:$PATH
    26 LD_LIBRARY_PATH=${dir}/lib:$LD_LIBRARY_PATH
     30LD_LIBRARY_PATH=${dir}/lib:${dir}/lib/${vtkdir}:$LD_LIBRARY_PATH
    2731PYMOL_PATH=${dir}/lib/pymol
    2832
    … …  
    3034
    3135# Determine the number of video cards we have.  The new render server
    32 # motherboards have the useless XGI Volaria onboard video controllers (no 3D
     36# motherboards have the useless XGI Volari onboard video controllers (no 3D
    3337# capabilities) so we have to make sure we count only the nVidia cards.
    3438
    … …  
    3741nanoscale="${dir}/bin/nanoscale -x ${nvideo} -b $nanoscale_port -s $broadcast"
    3842nanovis="${dir}/bin/nanovis -p ${dir}/lib/shaders:${dir}/lib/resources"
     43vtkvis="${dir}/bin/vtkvis"
    3944pymolproxy="${dir}/bin/pymolproxy ${dir}/bin/pymol -p -q -i -x -X 0 -Y 0"
    4045
    … …  
    6065
    6166echo "$nanoscale -l $nanovis_port -c \"$nanovis\" -l $pymol_port -c \"$pymolproxy\""
    62 $nanoscale -l $nanovis_port -c "$nanovis" -l $pymol_port -c "$pymolproxy"
     67$nanoscale -l $nanovis_port -c "$nanovis" -l $vtkvis_port -c "$vtkvis" -l $pymol_port -c "$pymolproxy"
    6368
Note: See TracChangeset for help on using the changeset viewer.