Changeset 1111 for trunk/packages

Timestamp:

Aug 13, 2008, 1:33:28 PM (16 years ago)

Author:

gah

Message:

nanovis/heightmap update

Location:

trunk/packages/vizservers

Files:

• Makefile.in (modified) (1 diff)
• configure (modified) (277 diffs)
• configure.in (modified) (1 diff)
• nanoscale/client.c (modified) (1 diff)
• nanovis/Axis.cpp (modified) (19 diffs)
• nanovis/Axis.h (modified) (15 diffs)
• nanovis/AxisRange.h (modified) (1 diff)
• nanovis/Command.cpp (modified) (17 diffs)
• nanovis/Grid.cpp (modified) (4 diffs)
• nanovis/HeightMap.cpp (modified) (12 diffs)
• nanovis/HeightMap.h (modified) (4 diffs)
• nanovis/Lic.cpp (modified) (1 diff)
• nanovis/NvColorTableShader.cpp (modified) (2 diffs)
• nanovis/NvEventLog.cpp (modified) (2 diffs)
• nanovis/NvLIC.cpp (modified) (2 diffs)
• nanovis/NvParticleAdvectionShader.cpp (modified) (2 diffs)
• nanovis/NvParticleRenderer.cpp (modified) (1 diff)
• nanovis/NvRegularVolumeShader.cpp (modified) (2 diffs)
• nanovis/NvShader.cpp (modified) (3 diffs)
• nanovis/NvStdVertexShader.cpp (modified) (2 diffs)
• nanovis/NvZincBlendeVolumeShader.cpp (modified) (2 diffs)
• nanovis/PlaneRenderer.cpp (modified) (2 diffs)
• nanovis/PointSetRenderer.cpp (modified) (2 diffs)
• nanovis/PointShader.cpp (modified) (2 diffs)
• nanovis/R2/include/R2/R2FilePath.h (modified) (2 diffs)
• nanovis/R2/include/R2/R2Fonts.h (modified) (1 diff)
• nanovis/R2/src/R2FilePath.cpp (modified) (2 diffs)
• nanovis/R2/src/R2Fonts.cpp (modified) (3 diffs)
• nanovis/VolumeInterpolator.cpp (modified) (1 diff)
• nanovis/VolumeRenderer.cpp (modified) (1 diff)
• nanovis/global.h (modified) (2 diffs)
• nanovis/nanovis.cpp (modified) (13 diffs)
• nanovis/nanovis.h (modified) (2 diffs)
• pymolproxy/pymolproxy.c (modified) (7 diffs)
• start_viz.sh.in (modified) (3 diffs)

trunk/packages/vizservers/Makefile.in

@@ -34 +34 @@
           $(MAKE) -C $$i install || exit 1 ; \
         done
-        $(INSTALL) -m 555 start_viz.sh $(prefix)/start_viz.sh
+        $(INSTALL) -m 555 start_viz.sh $(bindir)/start_viz.sh
 
 clean:

trunk/packages/vizservers/configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for vizservers 0.1.
+# Generated by GNU Autoconf 2.62 for vizservers 0.1.
 #
 # Report bugs to <rappture@nanohub.org>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
@@ -18 +18 @@
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
@@ -40 +40 @@
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+        expr "X$arg" : "X\\(.*\\)$as_nl";
+        arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
@@ -66 +94 @@
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""        $as_nl"
 
@@ -90 +116 @@
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
@@ -103 +129 @@
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
@@ -135 +154 @@
          X"$0" : 'X\(//\)$' \| \
          X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
             s//\1/
@@ -161 +180 @@
 fi
 
-  if test $as_have_required = yes &&     (eval ":
+  if test $as_have_required = yes &&     (eval ":
 (as_func_return () {
   (exit \$1)
@@ -243 +262 @@
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
@@ -264 +283 @@
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
@@ -344 +363 @@
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+        done
+        export CONFIG_SHELL
+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
@@ -416 +435 @@
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf@gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
@@ -454 +474 @@
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
@@ -482 +502 @@
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
@@ -495 +514 @@
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
@@ -532 +554 @@
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+        test -d "$1/.";
       else
         case $1 in
-        -*)set "./$1";;
+        -*)set "./$1";;
         esac;
         case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
@@ -657 +679 @@
 INSTALL_SCRIPT
 INSTALL_DATA
-SET_MAKE
+RANLIB
+LN_S
+MKDIR_P
 CC
 CFLAGS
@@ -665 +689 @@
 EXEEXT
 OBJEXT
-RANLIB
 CXX
 CXXFLAGS
@@ -683 +706 @@
 LTLIBOBJS'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+with_tcllib
+with_tclinclude
+with_rappture
+'
       ac_precious_vars='build_alias
 host_alias
@@ -700 +729 @@
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
@@ -798 +829 @@
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+         ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
@@ -817 +856 @@
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+         ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
@@ -1014 +1061 @@
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+         ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+         ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
@@ -1049 +1112 @@
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
@@ -1058 +1121 @@
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
@@ -1065 +1128 @@
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
@@ -1076 +1139 @@
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in   exec_prefix prefix bindir sbindir libexecdir datarootdir \
                 datadir sysconfdir sharedstatedir localstatedir includedir \
@@ -1087 +1159 @@
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
@@ -1106 +1185 @@
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
@@ -1122 +1201 @@
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: Working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
@@ -1133 +1212 @@
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$0" : 'X\(//\)[^/]' \| \
-         X"$0" : 'X\(//\)$' \| \
-         X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$as_myself" : 'X\(//\)[^/]' \| \
+         X"$as_myself" : 'X\(//\)$' \| \
+         X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
             s//\1/
@@ -1165 +1244 @@
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-        cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+        cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
         pwd)`
@@ -1219 +1298 @@
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
@@ -1231 +1310 @@
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/vizservers]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/vizservers]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
@@ -1294 +1373 @@
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
@@ -1300 +1381 @@
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
@@ -1338 +1419 @@
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
@@ -1348 +1429 @@
   cat <<\_ACEOF
 vizservers configure 0.1
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
@@ -1362 +1443 @@
 
 It was created by vizservers $as_me 0.1, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
@@ -1398 +1479 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
@@ -1433 +1514 @@
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
@@ -1485 +1566 @@
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
@@ -1519 +1601 @@
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
@@ -1536 +1618 @@
         eval ac_val=\$$ac_var
         case $ac_val in
-        *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+        *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
         esac
-        echo "$ac_var='\''$ac_val'\''"
+        $as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
@@ -1554 +1636 @@
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
@@ -1597 +1679 @@
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
-  set x "$ac_default_prefix/share/config.site" \
-        "$ac_default_prefix/etc/config.site"
-fi
-shift
-for ac_site_file
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
@@ -1621 +1706 @@
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -1629 +1714 @@
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1644 +1729 @@
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-        ac_cache_corrupted=:
+        # differences in whitespace do not lead to failure.
+        ac_old_val_w=`echo x $ac_old_val`
+        ac_new_val_w=`echo x $ac_new_val`
+        if test "$ac_old_val_w" != "$ac_new_val_w"; then
+          { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+          ac_cache_corrupted=:
+        else
+          { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+          eval $ac_var=\$ac_old_val
+        fi
+        { $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+        { $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
@@ -1666 +1760 @@
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
@@ -1676 +1770 @@
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1754 +1848 @@
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1781 +1875 @@
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -1814 +1909 @@
             :
           else
-            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-            break 3
+            rm -rf conftest.one conftest.two conftest.dir
+            echo one > conftest.one
+            echo two > conftest.two
+            mkdir conftest.dir
+            if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+              test -s conftest.one && test -s conftest.two &&
+              test -s conftest.dir/conftest.one &&
+              test -s conftest.dir/conftest.two
+            then
+              ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+              break 3
+            fi
           fi
         fi
@@ -1822 +1927 @@
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
@@ -1837 +1944 @@
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -1848 +1955 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-        @echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+         for ac_exec_ext in '' $ac_executable_extensions; do
+           { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+           case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+             'mkdir (GNU coreutils) '* | \
+             'mkdir (coreutils) '* | \
+             'mkdir (fileutils) '4.1*)
+               ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+               break 3;;
+           esac
+         done
+       done
+done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
 
 
@@ -1887 +2113 @@
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -1903 +2129 @@
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -1914 +2140 @@
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
@@ -1927 +2153 @@
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -1943 +2169 @@
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -1954 +2180 @@
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
@@ -1966 +2192 @@
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
@@ -1984 +2210 @@
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2000 +2226 @@
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -2011 +2237 @@
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
@@ -2024 +2250 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2045 +2271 @@
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -2068 +2294 @@
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
@@ -2083 +2309 @@
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2099 +2325 @@
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -2110 +2336 @@
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
@@ -2127 +2353 @@
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -2143 +2369 @@
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -2154 +2380 @@
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
@@ -2170 +2396 @@
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
@@ -2185 +2411 @@
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
@@ -2199 +2426 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
@@ -2209 +2437 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
@@ -2219 +2448 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
@@ -2241 +2471 @@
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
@@ -2272 +2497 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
@@ -2286 +2512 @@
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
         ;;
     [ab].out )
@@ -2313 +2539 @@
 fi
 
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
@@ -2330 +2556 @@
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
@@ -2340 +2566 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
@@ -2350 +2577 @@
         cross_compiling=yes
     else
-        { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+        { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
@@ -2360 +2587 @@
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
-
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
@@ -2379 +2606 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
@@ -2391 +2619 @@
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
           break;;
@@ -2398 +2626 @@
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
@@ -2406 +2634 @@
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -2438 +2666 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
@@ -2452 +2681 @@
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
@@ -2464 +2693 @@
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -2497 +2726 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
@@ -2503 +2733 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
          test -z "$ac_c_werror_flag" ||
@@ -2510 +2740 @@
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -2520 +2750 @@
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -2555 +2789 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
@@ -2561 +2796 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
          test -z "$ac_c_werror_flag" ||
@@ -2568 +2803 @@
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -2593 +2828 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
@@ -2599 +2835 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
          test -z "$ac_c_werror_flag" ||
@@ -2606 +2842 @@
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -2632 +2868 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
@@ -2638 +2875 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
          test -z "$ac_c_werror_flag" ||
@@ -2645 +2882 @@
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -2660 +2897 @@
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -2677 +2914 @@
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -2751 +2988 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
@@ -2757 +2995 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
          test -z "$ac_c_werror_flag" ||
@@ -2764 +3002 @@
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -2780 +3018 @@
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
@@ -2803 +3041 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
 
 
@@ -2916 +3057 @@
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -2932 +3073 @@
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -2943 +3084 @@
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
@@ -2960 +3101 @@
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
@@ -2976 +3117 @@
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -2987 +3128 @@
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
@@ -3003 +3144 @@
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
@@ -3018 +3159 @@
 fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
@@ -3025 +3167 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
@@ -3035 +3178 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
@@ -3045 +3189 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -3080 +3225 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
@@ -3086 +3232 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
          test -z "$ac_cxx_werror_flag" ||
@@ -3093 +3239 @@
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -3103 +3249 @@
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -3138 +3288 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
@@ -3144 +3295 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
          test -z "$ac_cxx_werror_flag" ||
@@ -3151 +3302 @@
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -3176 +3327 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
@@ -3182 +3334 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
          test -z "$ac_cxx_werror_flag" ||
@@ -3189 +3341 @@
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -3215 +3367 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
@@ -3221 +3374 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
          test -z "$ac_cxx_werror_flag" ||
@@ -3228 +3381 @@
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -3243 +3396 @@
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
@@ -3279 +3432 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
@@ -3315 +3468 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
@@ -3321 +3475 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
          test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
@@ -3328 +3482 @@
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -3352 +3506 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
@@ -3358 +3513 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
          test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
@@ -3366 +3521 @@
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -3391 +3546 @@
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -3420 +3575 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
@@ -3426 +3582 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
          test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
@@ -3433 +3589 @@
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -3457 +3613 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
@@ -3463 +3620 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
          test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
@@ -3471 +3628 @@
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -3487 +3644 @@
   :
 else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
@@ -3501 +3658 @@
 
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
@@ -3520 +3672 @@
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -3530 +3682 @@
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
@@ -3536 +3688 @@
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3551 +3703 @@
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
@@ -3602 +3740 @@
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -3612 +3750 @@
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
@@ -3618 +3756 @@
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3633 +3771 @@
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -3693 +3822 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
@@ -3699 +3829 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
          test -z "$ac_cxx_werror_flag" ||
@@ -3706 +3836 @@
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -3798 +3928 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
@@ -3807 +3938 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -3821 +3953 @@
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
@@ -3827 +3960 @@
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
@@ -3850 +3983 @@
                   inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -3872 +4005 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
@@ -3878 +4012 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
          test -z "$ac_cxx_werror_flag" ||
@@ -3885 +4019 @@
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -3893 +4027 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-               { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+                 $as_echo "$as_val"'`
+               { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Header'}
+                 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
@@ -3906 +4042 @@
 
 
-{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 if test "${ac_cv_c_bigendian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # See if sys/param.h defines the BYTE_ORDER macro.
@@ -3939 +4075 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
@@ -3945 +4082 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
          test -z "$ac_cxx_werror_flag" ||
@@ -3977 +4114 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
@@ -3983 +4121 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
          test -z "$ac_cxx_werror_flag" ||
@@ -3990 +4128 @@
   ac_cv_c_bigendian=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -3998 +4136 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -4031 +4169 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
@@ -4037 +4176 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
          test -z "$ac_cxx_werror_flag" ||
@@ -4054 +4193 @@
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -4092 +4231 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
@@ -4101 +4241 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=no
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -4115 +4256 @@
 ac_cv_c_bigendian=yes
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
@@ -4123 +4265 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
 case $ac_cv_c_bigendian in
   yes)
@@ -4135 +4277 @@
      ;;
   *)
-    { { echo "$as_me:$LINENO: error: unknown endianness
+    { { $as_echo "$as_me:$LINENO: error: unknown endianness
 presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-echo "$as_me: error: unknown endianness
+$as_echo "$as_me: error: unknown endianness
 presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -4155 +4297 @@
 
 
+#
+# Need to check for the following dependencies:
+#       Rappture headers and library (done)
+#       Tcl headers and library (done)
+#       GL headers and library
+#       GLuT headers and library
+#       GLui header and library
+#       GLEW header and library
+#       Cg headers and library
+#       CgGL headers and library
+#       pthread library
+#       DX headers and library (done, sort of)
+#
+
 TCL_LIB_DIR=""
 TCL_LIB=""
 TCL_LIB_VERSION=""
-{ echo "$as_me:$LINENO: checking for tcl binary libraries" >&5
-echo $ECHO_N "checking for tcl binary libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for tcl binary libraries" >&5
+$as_echo_n "checking for tcl binary libraries... " >&6; }
 if test "x$with_tcllib" != "x" ; then
     if test -f "$with_tcllib"
@@ -4174 +4330 @@
                 TCL_LIB_DIR="$with_tcllib"
             else
-                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                { { echo "$as_me:$LINENO: error: cannot find tcl binary libraries, try using --with-tcllib" >&5
-echo "$as_me: error: cannot find tcl binary libraries, try using --with-tcllib" >&2;}
+                { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+                { { $as_echo "$as_me:$LINENO: error: cannot find tcl binary libraries, try using --with-tcllib" >&5
+$as_echo "$as_me: error: cannot find tcl binary libraries, try using --with-tcllib" >&2;}
    { (exit 1); exit 1; }; }
             fi
         else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-            { { echo "$as_me:$LINENO: error: cannot find tcl binary libraries inside $with_tcllib, try using --with-tcllib" >&5
-echo "$as_me: error: cannot find tcl binary libraries inside $with_tcllib, try using --with-tcllib" >&2;}
+            { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+            { { $as_echo "$as_me:$LINENO: error: cannot find tcl binary libraries inside $with_tcllib, try using --with-tcllib" >&5
+$as_echo "$as_me: error: cannot find tcl binary libraries inside $with_tcllib, try using --with-tcllib" >&2;}
    { (exit 1); exit 1; }; }
         fi
@@ -4192 +4348 @@
 for ac_header in tcl.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-               { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+                 $as_echo "$as_val"'`
+               { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4221 +4378 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
@@ -4227 +4385 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
          test -z "$ac_cxx_werror_flag" ||
@@ -4234 +4392 @@
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -4241 +4399 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4260 +4418 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
@@ -4266 +4425 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
          test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
@@ -4273 +4432 @@
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -4280 +4439 @@
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------- ##
@@ -4313 +4472 @@
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-               { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+                 $as_echo "$as_val"'`
+               { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+if test `eval 'as_val=${'$as_ac_Header'}
+                 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  { { echo "$as_me:$LINENO: error: cannot find tcl.h, try using --with-tclinclude" >&5
-echo "$as_me: error: cannot find tcl.h, try using --with-tclinclude" >&2;}
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+else
+  { { $as_echo "$as_me:$LINENO: error: cannot find tcl.h, try using --with-tclinclude" >&5
+$as_echo "$as_me: error: cannot find tcl.h, try using --with-tclinclude" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -4343 +4504 @@
 # TCL_LIB=`ls ${TCL_LIB_DIR} | sed -e '/libtcl([0-9]\.?[0-9])?\.so$/ {p}'`
 # TCL_LIB_VERSION=$(echo ${TCL_LIB} | sed -e s/libtcl// -e s/\.so//)
-{ echo "$as_me:$LINENO: result: ${TCL_LIB_DIR}/${TCL_LIB}" >&5
-echo "${ECHO_T}${TCL_LIB_DIR}/${TCL_LIB}" >&6; }
+{ $as_echo "$as_me:$LINENO: result: ${TCL_LIB_DIR}/${TCL_LIB}" >&5
+$as_echo "${TCL_LIB_DIR}/${TCL_LIB}" >&6; }
 # echo TCL_LIB_DIR = ${TCL_LIB_DIR}
 # echo TCL_LIB = ${TCL_LIB}
@@ -4362 +4523 @@
 
 TCL_INCL_DIR=""
-{ echo "$as_me:$LINENO: checking for tcl.h" >&5
-echo $ECHO_N "checking for tcl.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for tcl.h" >&5
+$as_echo_n "checking for tcl.h... " >&6; }
 if test "x$with_tclinclude" != "x" ; then
     if test -f "$with_tclinclude"
@@ -4382 +4543 @@
                     TCL_INCL_DIR="$with_tclinclude/tcl${TCL_LIB_VERSION}"
                 else
-                    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                    { { echo "$as_me:$LINENO: error: cannot find tcl.h, try using --with-tclinclude" >&5
-echo "$as_me: error: cannot find tcl.h, try using --with-tclinclude" >&2;}
+                    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+                    { { $as_echo "$as_me:$LINENO: error: cannot find tcl.h, try using --with-tclinclude" >&5
+$as_echo "$as_me: error: cannot find tcl.h, try using --with-tclinclude" >&2;}
    { (exit 1); exit 1; }; }
                 fi
             fi
         else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-            { { echo "$as_me:$LINENO: error: cannot find tcl.h inside $with_tclinclude, try using --with-tclinclude" >&5
-echo "$as_me: error: cannot find tcl.h inside $with_tclinclude, try using --with-tclinclude" >&2;}
+            { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+            { { $as_echo "$as_me:$LINENO: error: cannot find tcl.h inside $with_tclinclude, try using --with-tclinclude" >&5
+$as_echo "$as_me: error: cannot find tcl.h inside $with_tclinclude, try using --with-tclinclude" >&2;}
    { (exit 1); exit 1; }; }
         fi
@@ -4401 +4562 @@
 for ac_header in tcl.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-               { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+                 $as_echo "$as_val"'`
+               { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4430 +4592 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
@@ -4436 +4599 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
          test -z "$ac_cxx_werror_flag" ||
@@ -4443 +4606 @@
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -4450 +4613 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4469 +4632 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
@@ -4475 +4639 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
          test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
@@ -4482 +4646 @@
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -4489 +4653 @@
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------- ##
@@ -4522 +4686 @@
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-               { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+                 $as_echo "$as_val"'`
+               { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+if test `eval 'as_val=${'$as_ac_Header'}
+                 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  { { echo "$as_me:$LINENO: error: cannot find tcl.h, try using --with-tclinclude" >&5
-echo "$as_me: error: cannot find tcl.h, try using --with-tclinclude" >&2;}
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+else
+  { { $as_echo "$as_me:$LINENO: error: cannot find tcl.h, try using --with-tclinclude" >&5
+$as_echo "$as_me: error: cannot find tcl.h, try using --with-tclinclude" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -4548 +4714 @@
 
 fi
-{ echo "$as_me:$LINENO: result: ${TCL_INCL_DIR}" >&5
-echo "${ECHO_T}${TCL_INCL_DIR}" >&6; }
+{ $as_echo "$as_me:$LINENO: result: ${TCL_INCL_DIR}" >&5
+$as_echo "${TCL_INCL_DIR}" >&6; }
 
 
@@ -4563 +4729 @@
 RP2_INCL_DIR=""
 RP_DIR=""
-{ echo "$as_me:$LINENO: checking for rappture" >&5
-echo $ECHO_N "checking for rappture... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for rappture" >&5
+$as_echo_n "checking for rappture... " >&6; }
 if test "x$with_rappture" != "x" ; then
     if test "x$with_rappture" != "xprefix" ; then
         if test -f "$with_rappture"
         then
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-            { { echo "$as_me:$LINENO: error: please provide --with-rappture with directory" >&5
-echo "$as_me: error: please provide --with-rappture with directory" >&2;}
+            { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+            { { $as_echo "$as_me:$LINENO: error: please provide --with-rappture with directory" >&5
+$as_echo "$as_me: error: please provide --with-rappture with directory" >&2;}
    { (exit 1); exit 1; }; }
         else
@@ -4581 +4747 @@
                     RP2_INCL_DIR="$with_rappture/include/rappture2"
                     RP_DIR="$with_rappture"
-                    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+                    { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
                 else
-                    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                    { { echo "$as_me:$LINENO: error: cannot find rappture2.h and librappture2.a, try using --with-rappture" >&5
-echo "$as_me: error: cannot find rappture2.h and librappture2.a, try using --with-rappture" >&2;}
+                    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+                    { { $as_echo "$as_me:$LINENO: error: cannot find rappture2.h and librappture2.a, try using --with-rappture" >&5
+$as_echo "$as_me: error: cannot find rappture2.h and librappture2.a, try using --with-rappture" >&2;}
    { (exit 1); exit 1; }; }
                 fi
             else
-                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                { { echo "$as_me:$LINENO: error: cannot find rappture2.h and librappture2.a inside $with_rappture, try using --with-rappture" >&5
-echo "$as_me: error: cannot find rappture2.h and librappture2.a inside $with_rappture, try using --with-rappture" >&2;}
+                { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+                { { $as_echo "$as_me:$LINENO: error: cannot find rappture2.h and librappture2.a inside $with_rappture, try using --with-rappture" >&5
+$as_echo "$as_me: error: cannot find rappture2.h and librappture2.a inside $with_rappture, try using --with-rappture" >&2;}
    { (exit 1); exit 1; }; }
             fi
@@ -4601 +4767 @@
         RP2_INCL_DIR="$prefix/include/rappture2"
         RP_DIR="$prefix"
-        { echo "$as_me:$LINENO: result: set to prefix" >&5
-echo "${ECHO_T}set to prefix" >&6; }
+        { $as_echo "$as_me:$LINENO: result: set to prefix" >&5
+$as_echo "set to prefix" >&6; }
     fi
 else
@@ -4608 +4774 @@
 for ac_header in rappture.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-               { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+                 $as_echo "$as_val"'`
+               { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4637 +4804 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
@@ -4643 +4811 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
          test -z "$ac_cxx_werror_flag" ||
@@ -4650 +4818 @@
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -4657 +4825 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4676 +4844 @@
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
@@ -4682 +4851 @@
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
          test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
@@ -4689 +4858 @@
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -4696 +4865 @@
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------- ##
@@ -4729 +4898 @@
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-               { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+                 $as_echo "$as_val"'`
+               { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+if test `eval 'as_val=${'$as_ac_Header'}
+                 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  { { echo "$as_me:$LINENO: error: cannot find rappture.h, try using --with-rappture" >&5
-echo "$as_me: error: cannot find rappture.h, try using --with-rappture" >&2;}
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+else
+  { { $as_echo "$as_me:$LINENO: error: cannot find rappture.h, try using --with-rappture" >&5
+$as_echo "$as_me: error: cannot find rappture.h, try using --with-rappture" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -4757 +4928 @@
 
 fi
-{ echo "$as_me:$LINENO: result: ${RP_DIR}/include" >&5
-echo "${ECHO_T}${RP_DIR}/include" >&6; }
-
-
-
-{ echo "$as_me:$LINENO: checking for DX installation" >&5
-echo $ECHO_N "checking for DX installation... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: result: ${RP_DIR}/include" >&5
+$as_echo "${RP_DIR}/include" >&6; }
+
+
+
+if test "${ac_cv_header_GL_glui_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for GL/glui.h" >&5
+$as_echo_n "checking for GL/glui.h... " >&6; }
+if test "${ac_cv_header_GL_glui_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_glui_h" >&5
+$as_echo "$ac_cv_header_GL_glui_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking GL/glui.h usability" >&5
+$as_echo_n "checking GL/glui.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <GL/glui.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+         test -z "$ac_cxx_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+        ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking GL/glui.h presence" >&5
+$as_echo_n "checking GL/glui.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <GL/glui.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+         test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+         test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: GL/glui.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: GL/glui.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: GL/glui.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: GL/glui.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: GL/glui.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: GL/glui.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: GL/glui.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: GL/glui.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: GL/glui.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: GL/glui.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: GL/glui.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: GL/glui.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: GL/glui.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: GL/glui.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: GL/glui.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: GL/glui.h: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ----------------------------------- ##
+## Report this to rappture@nanohub.org ##
+## ----------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for GL/glui.h" >&5
+$as_echo_n "checking for GL/glui.h... " >&6; }
+if test "${ac_cv_header_GL_glui_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_GL_glui_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_glui_h" >&5
+$as_echo "$ac_cv_header_GL_glui_h" >&6; }
+
+fi
+
+
+if test "${ac_cv_header_glui_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for glui.h" >&5
+$as_echo_n "checking for glui.h... " >&6; }
+if test "${ac_cv_header_glui_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_glui_h" >&5
+$as_echo "$ac_cv_header_glui_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking glui.h usability" >&5
+$as_echo_n "checking glui.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <glui.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+         test -z "$ac_cxx_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+        ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking glui.h presence" >&5
+$as_echo_n "checking glui.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <glui.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+         test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+         test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: glui.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: glui.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: glui.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: glui.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: glui.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: glui.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: glui.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: glui.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: glui.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: glui.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: glui.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: glui.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: glui.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: glui.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: glui.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: glui.h: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ----------------------------------- ##
+## Report this to rappture@nanohub.org ##
+## ----------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for glui.h" >&5
+$as_echo_n "checking for glui.h... " >&6; }
+if test "${ac_cv_header_glui_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_glui_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_glui_h" >&5
+$as_echo "$ac_cv_header_glui_h" >&6; }
+
+fi
+
+
+if test "${ac_cv_header_GL_glut_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for GL/glut.h" >&5
+$as_echo_n "checking for GL/glut.h... " >&6; }
+if test "${ac_cv_header_GL_glut_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_glut_h" >&5
+$as_echo "$ac_cv_header_GL_glut_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking GL/glut.h usability" >&5
+$as_echo_n "checking GL/glut.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <GL/glut.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+         test -z "$ac_cxx_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+        ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking GL/glut.h presence" >&5
+$as_echo_n "checking GL/glut.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <GL/glut.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+         test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+         test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: GL/glut.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: GL/glut.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: GL/glut.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: GL/glut.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: GL/glut.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: GL/glut.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: GL/glut.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: GL/glut.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: GL/glut.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: GL/glut.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: GL/glut.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: GL/glut.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: GL/glut.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: GL/glut.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: GL/glut.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: GL/glut.h: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ----------------------------------- ##
+## Report this to rappture@nanohub.org ##
+## ----------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for GL/glut.h" >&5
+$as_echo_n "checking for GL/glut.h... " >&6; }
+if test "${ac_cv_header_GL_glut_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_GL_glut_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_glut_h" >&5
+$as_echo "$ac_cv_header_GL_glut_h" >&6; }
+
+fi
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for DX installation" >&5
+$as_echo_n "checking for DX installation... " >&6; }
 DX_DIR=""
 for dir in \
@@ -4776 +5350 @@
 done
 if test "x${DX_DIR}" = "x" ; then
-  { { echo "$as_me:$LINENO: error: can't find OpenDX installation" >&5
-echo "$as_me: error: can't find OpenDX installation" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: can't find OpenDX installation" >&5
+$as_echo "$as_me: error: can't find OpenDX installation" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -4784 +5358 @@
 fi
 
-{ echo "$as_me:$LINENO: result: ${DX_DIR}" >&5
-echo "${ECHO_T}${DX_DIR}" >&6; }
+{ $as_echo "$as_me:$LINENO: result: ${DX_DIR}" >&5
+$as_echo "${DX_DIR}" >&6; }
 
 
@@ -4818 +5392 @@
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
@@ -4855 +5430 @@
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -4877 +5452 @@
 # look for a macro that doesn't take arguments.
 ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
 t clear
 :clear
@@ -4906 +5487 @@
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
@@ -4919 +5500 @@
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
@@ -4936 +5518 @@
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
@@ -4946 +5528 @@
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
@@ -4968 +5550 @@
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+        expr "X$arg" : "X\\(.*\\)$as_nl";
+        arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
@@ -4994 +5604 @@
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""        $as_nl"
 
@@ -5018 +5626 @@
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
@@ -5031 +5639 @@
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
@@ -5063 +5664 @@
          X"$0" : 'X\(//\)$' \| \
          X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
             s//\1/
@@ -5114 +5715 @@
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
@@ -5142 +5743 @@
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
@@ -5155 +5755 @@
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
@@ -5192 +5795 @@
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+        test -d "$1/.";
       else
         case $1 in
-        -*)set "./$1";;
+        -*)set "./$1";;
         esac;
         case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
@@ -5218 +5821 @@
 ac_log="
 This file was extended by vizservers $as_me 0.1, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5231 +5834 @@
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
-config_files="$ac_config_files"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
+config_files="`echo $ac_config_files`"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
@@ -5250 +5853 @@
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
+                   instantiate the configuration file FILE
 
 Configuration files:
@@ -5258 +5861 @@
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 vizservers config.status 0.1
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2006 Free Software Foundation, Inc.
+configured by $0, generated by GNU Autoconf 2.62,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
@@ -5271 +5874 @@
 srcdir='$srcdir'
 INSTALL='$INSTALL'
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+MKDIR_P='$MKDIR_P'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
@@ -5297 +5901 @@
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h |  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
@@ -5311 +5918 @@
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
@@ -5330 +5937 @@
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
@@ -5346 +5955 @@
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
@@ -5369 +5978 @@
     "start_viz.sh") CONFIG_FILES="$CONFIG_FILES start_viz.sh" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -5409 +6018 @@
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
-
-
-
+
+ac_cr='
+'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-VERSION!$VERSION$ac_delim
-LIB_SEARCH_DIRS!$LIB_SEARCH_DIRS$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-RANLIB!$RANLIB$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-CXXCPP!$CXXCPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-SUBDIRS!$SUBDIRS$ac_delim
-TCL_LIB_DIR!$TCL_LIB_DIR$ac_delim
-TCL_LIB!$TCL_LIB$ac_delim
-TCL_LIB_VERSION!$TCL_LIB_VERSION$ac_delim
-TCL_INCL_DIR!$TCL_INCL_DIR$ac_delim
-RP2_INCL_DIR!$RP2_INCL_DIR$ac_delim
-RP_DIR!$RP_DIR$ac_delim
-DX_DIR!$DX_DIR$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
@@ -5507 +6067 @@
   fi
 done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
-_ACEOF
-
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
+_ACEOF
 
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -5550 +6171 @@
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 
-for ac_tag in  :F $CONFIG_FILES
+eval set X "  :F $CONFIG_FILES      "
+shift
+for ac_tag
 do
   case $ac_tag in
@@ -5561 +6184 @@
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
@@ -5591 +6214 @@
            *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
            esac ||
-           { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+           { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
@@ -5601 +6225 @@
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-          echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+          $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+        `' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
@@ -5620 +6255 @@
          X"$ac_file" : 'X\(//\)$' \| \
          X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
             s//\1/
@@ -5646 +6281 @@
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
@@ -5655 +6290 @@
          X"$as_dir" : 'X\(//\)$' \| \
          X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
             s//\1/
@@ -5676 +6311 @@
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
@@ -5684 +6319 @@
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
@@ -5724 +6359 @@
   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
@@ -5740 +6381 @@
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
@@ -5760 +6402 @@
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
@@ -5777 +6420 @@
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
 
@@ -5806 +6457 @@
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
 
 
@@ -5828 +6484 @@
   $ac_cs_success || { (exit 1); exit 1; }
 fi
-
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+

trunk/packages/vizservers/configure.in

@@ -24 +24 @@
 
 AC_PROG_INSTALL
-AC_PROG_MAKE_SET
+AC_PROG_RANLIB
+AC_PROG_LN_S
+AC_PROG_MKDIR_P
 
 dnl find and test the C compiler
 AC_PROG_CC
 AC_LANG_C
-
-AC_PROG_RANLIB
 
 AC_PROG_CXX

trunk/packages/vizservers/nanoscale/client.c

@@ -19 +19 @@
  * "unnecessary" pointer comparison.
  */
-#define min(x,y) ({ \
-        typeof(x) _x = (x);     \
-        typeof(y) _y = (y);     \
-        (void) (&_x == &_y);            \
-        _x < _y ? _x : _y; })
+#define min(x,y) ({                             \
+            typeof(x) _x = (x);                 \
+            typeof(y) _y = (y);                 \
+            (void) (&_x == &_y);                \
+            _x < _y ? _x : _y; })
 
-#define max(x,y) ({ \
-        typeof(x) _x = (x);     \
-        typeof(y) _y = (y);     \
-        (void) (&_x == &_y);            \
-        _x > _y ? _x : _y; })
+#define max(x,y) ({                             \
+            typeof(x) _x = (x);                 \
+            typeof(y) _y = (y);                 \
+            (void) (&_x == &_y);                \
+            _x > _y ? _x : _y; })
 
 void help(const char *argv0)
 {
-  fprintf(stderr,
-          "Syntax: %s addr:port load\n",
-          argv0);
-  exit(1);
+    fprintf(stderr,
+            "Syntax: %s addr:port load\n",
+            argv0);
+    exit(1);
 }
 
 int connect_fd = -1;
 
-void activity(int signum)
+void 
+activity(int signum)
 {
-  write(connect_fd, "hello\n\r", 7);
-  write(1,".",1);
+    write(connect_fd, "hello\n\r", 7);
+    write(1,".",1);
 }
 
 
-int main(int argc, char *argv[])
+int 
+main(int argc, char *argv[])
 {
-  int val;
-  int status;
-  struct sockaddr_in connect_addr;
-  int connect_port = -1;
+    int status;
+    int connect_port = -1;
 
-  if (argc != 3) {
-    help(argv[0]);
-  }
+    if (argc != 3) {
+        help(argv[0]);
+    }
 
-  char addr[100];
-  if (sscanf(argv[1], "%100[^:\n]:%d\n", addr, &connect_port) != 2) {
-    help(argv[0]);
-  }
-  int memory = strtoul(argv[2],0,0);
+    char addr[100];
+    if (sscanf(argv[1], "%100[^:\n]:%d\n", addr, &connect_port) != 2) {
+        help(argv[0]);
+    }
+    int memory = strtoul(argv[2],0,0);
 
-  connect_fd = connect_renderer(addr, connect_port, memory);
+    connect_fd = connect_renderer(addr, connect_port, memory);
 
-  if (connect_fd == -1) {
-    return 1;
-  }
+    if (connect_fd == -1) {
+        return 1;
+    }
 
-  printf("Connection accepted.\n");
+    printf("Connection accepted.\n");
 
 #ifdef DEBUGGING
-  if (signal(SIGALRM, activity) == SIG_ERR) {
-    perror("signal");
-  }
+    if (signal(SIGALRM, activity) == SIG_ERR) {
+        perror("signal");
+    }
 
-  struct itimerval itvalue = {
-    {0,500000}, {0,500000}
-  };
-  status = setitimer(ITIMER_REAL, &itvalue, NULL);
+    struct itimerval itvalue = {
+        {0,500000}, {0,500000}
+    };
+    status = setitimer(ITIMER_REAL, &itvalue, NULL);
 #endif
 
-  fd_set rfds;
-  FD_ZERO(&rfds);
-  while(1) {
-    char buffer[100];
-    FD_SET(0,&rfds);
-    FD_SET(connect_fd,&rfds);
-    status = select(connect_fd+1, &rfds, NULL, NULL, NULL);
-    if (FD_ISSET(0,&rfds)) {
-      status = read(0,buffer,sizeof(buffer));
-      if (status <= 0) {
-        fprintf(stderr,"Goodbye\n");
-        exit(0);
-      } else {
-        status = write(connect_fd, buffer, status);
-        if (status < 0) {
-          perror("write");
-        }
-      }
+    fd_set rfds;
+    FD_ZERO(&rfds);
+    while(1) {
+        char buffer[100];
+        FD_SET(0,&rfds);
+        FD_SET(connect_fd,&rfds);
+        status = select(connect_fd+1, &rfds, NULL, NULL, NULL);
+        if (FD_ISSET(0,&rfds)) {
+            status = read(0,buffer,sizeof(buffer));
+            if (status <= 0) {
+                fprintf(stderr,"Goodbye\n");
+                exit(0);
+            } else {
+                status = write(connect_fd, buffer, status);
+                if (status < 0) {
+                    perror("write");
+                }
+            }
+        } else if (FD_ISSET(connect_fd,&rfds)) {
+            status = read(connect_fd,buffer,sizeof(buffer));
+            if (status <= 0) {
+                fprintf(stderr,"Server closed connection\n");
+                exit(0);
+            } else {
+                status = write(1, buffer, status);
+                if (status < 0) {
+                    perror("write");
+                }
+            }
+        } else {
+            fprintf(stderr,"Strange case for select: %d\n", status);
+            exit(1);
+        }
     }
 
-    else if (FD_ISSET(connect_fd,&rfds)) {
-      status = read(connect_fd,buffer,sizeof(buffer));
-      if (status <= 0) {
-        fprintf(stderr,"Server closed connection\n");
-        exit(0);
-      } else {
-        status = write(1, buffer, status);
-        if (status < 0) {
-          perror("write");
-        }
-      }
-    }
-
-    else {
-      fprintf(stderr,"Strange case for select: %d\n", status);
-      exit(1);
-    }
-  }
-
-  return 0;
+    return 0;
 }
 

trunk/packages/vizservers/nanovis/Axis.cpp

@@ -83 +83 @@
 Ticks::SetTicks(void)
 {
-    _nTicks = 0;
-    _ticks = new float[_nSteps];
-    if (_step == 0.0) { 
+    numTicks_ = 0;
+    ticks_ = new float[nSteps_];
+    if (step_ == 0.0) { 
         /* Hack: A zero step indicates to use log values. */
         unsigned int i;
@@ -101 +101 @@
             1.0
         };
-        for (i = 0; i < _nSteps; i++) {
-            _ticks[i] = logTable[i];
+        for (i = 0; i < nSteps_; i++) {
+            ticks_[i] = logTable[i];
         }
     } else {
@@ -108 +108 @@
         unsigned int i;
     
-        value = _initial;       /* Start from smallest axis tick */
-        for (i = 0; i < _nSteps; i++) {
-            value = _initial + (_step * i);
-            _ticks[i] = UROUND(value, _step);
-        }
-    }
-    _nTicks = _nSteps;
-}
-
-Axis::Axis(const char *name) :
-    _major(5), _minor(2) 
-{
-    _name = NULL;
-    SetName(name);
-    _units = NULL;
-    _title = NULL;
-    _valueMin = DBL_MAX, _valueMax = -DBL_MAX;
-    _min = DBL_MAX, _max = -DBL_MAX;
-    _reqMin = _reqMax = _NaN;
-    _range = 0.0, _scale = 0.0;
-    _reqStep = 0.0;
-    _flags = AUTOSCALE;
+        value = initial_;       /* Start from smallest axis tick */
+        for (i = 0; i < nSteps_; i++) {
+            value = initial_ + (step_ * i);
+            ticks_[i] = UROUND(value, step_);
+        }
+    }
+    numTicks_ = nSteps_;
+}
+
+Axis::Axis(const char *axisName) :
+    major_(5), minor_(2) 
+{
+    name_ = NULL;
+    name(axisName);
+    units_ = NULL;
+    title_ = NULL;
+    valueMin_ = DBL_MAX, valueMax_ = -DBL_MAX;
+    min_ = DBL_MAX, max_ = -DBL_MAX;
+    reqMin_ = reqMax_ = _NaN;
+    range_ = 0.0, scale_ = 0.0;
+    reqStep_ = 0.0;
+    flags_ = AUTOSCALE;
 }
 
@@ -156 +156 @@
 Axis::InRange(double x)
 {
-    if (_range < DBL_EPSILON) {
-        return (fabs(_max - x) >= DBL_EPSILON);
+    if (range_ < DBL_EPSILON) {
+        return (fabs(max_ - x) >= DBL_EPSILON);
     } else {
-        x = (x - _min) * _scale;
+        x = (x - min_) * scale_;
         return ((x >= -DBL_EPSILON) && ((x - 1.0) < DBL_EPSILON));
     }
@@ -168 +168 @@
 {
     if (min == DBL_MAX) {
-        if (DEFINED(_reqMin)) {
-            min = _reqMin;
-        } else {
-            min = (_flags & LOGSCALE) ? 0.001 : 0.0;
+        if (DEFINED(reqMin_)) {
+            min = reqMin_;
+        } else {
+            min = (flags_ & LOGSCALE) ? 0.001 : 0.0;
         }
     }
     if (max == -DBL_MAX) {
-        if (DEFINED(_reqMax)) {
-            max = _reqMax;
+        if (DEFINED(reqMax_)) {
+            max = reqMax_;
         } else {
             max = 1.0;
@@ -197 +197 @@
      * values selected by the user with the -min or -max options.
      */
-    _valueMin = (DEFINED(_reqMin)) ? _reqMin : min;
-    _valueMax = (DEFINED(_reqMax)) ? _reqMax : max;
-    if (_valueMax < _valueMin) {
+    valueMin_ = (DEFINED(reqMin_)) ? reqMin_ : min;
+    valueMax_ = (DEFINED(reqMax_)) ? reqMax_ : max;
+    if (valueMax_ < valueMin_) {
         /*   
          * If the limits still don't make sense, it's because one limit
@@ -206 +206 @@
          * up a new min or max from the user-defined limit.
          */
-        if (!DEFINED(_reqMin)) {
-            _valueMin = _valueMax - (fabs(_valueMax) * 0.1);
-        }
-        if (!DEFINED(_reqMax)) {
-            _valueMax = _valueMin + (fabs(_valueMax) * 0.1);
+        if (!DEFINED(reqMin_)) {
+            valueMin_ = valueMax_ - (fabs(valueMax_) * 0.1);
+        }
+        if (!DEFINED(reqMax_)) {
+            valueMax_ = valueMin_ + (fabs(valueMax_) * 0.1);
         }
     }
@@ -301 +301 @@
     majorStep = minorStep = 0.0;
     tickMin = tickMax = _NaN;
-    min = _valueMin, max = _valueMax;
+    min = valueMin_, max = valueMax_;
     if (min < max) {
         min = (min != 0.0) ? log10(fabs(min)) : 0.0;
@@ -314 +314 @@
              * decade.  Instead, treat the axis as a linear scale.  */
             range = NiceNum(range, 0);
-            majorStep = NiceNum(range / _major.reqNumTicks, 1);
+            majorStep = NiceNum(range / major_.reqNumTicks, 1);
             tickMin = UFLOOR(tickMin, majorStep);
             tickMax = UCEIL(tickMax, majorStep);
@@ -339 +339 @@
             nMinor = 10;
         }
-        if ((_flags & TIGHT_MIN) || (DEFINED(_reqMin))) {
+        if ((flags_ & TIGHT_MIN) || (DEFINED(reqMin_))) {
             tickMin = min;
             nMajor++;
         }
-        if ((_flags & TIGHT_MAX) || (DEFINED(_reqMax))) {
+        if ((flags_ & TIGHT_MAX) || (DEFINED(reqMax_))) {
             tickMax = max;
         }
     }
-    _major.SetValues(majorStep, nMajor, floor(tickMin));
-    _minor.SetValues(minorStep, nMinor, minorStep);
-    _min = tickMin;
-    _max = tickMax;
-    _range = _max - _min;
-    _scale = 1.0 / _range;
+    major_.SetValues(majorStep, nMajor, floor(tickMin));
+    minor_.SetValues(minorStep, nMinor, minorStep);
+    min_ = tickMin;
+    max_ = tickMax;
+    range_ = max_ - min_;
+    scale_ = 1.0 / range_;
 }
 
@@ -427 +427 @@
     /* Suppress compiler warning. */
     tickMin = tickMax = 0.0;
-    if (_valueMin < _valueMax) {
+    if (valueMin_ < valueMax_) {
         double range;
 
-        range = _valueMax - _valueMin;
+        range = valueMax_ - valueMin_;
         /* Calculate the major tick stepping. */
-        if (_reqStep > 0.0) {
+        if (reqStep_ > 0.0) {
             /* An interval was designated by the user.  Keep scaling it until
              * it fits comfortably within the current range of the axis.  */
-            step = _reqStep;
+            step = reqStep_;
             while ((2 * step) >= range) {
                 step *= 0.5;
@@ -441 +441 @@
         } else {
             range = NiceNum(range, 0);
-            step = NiceNum(range / _major.reqNumTicks, 1);
+            step = NiceNum(range / major_.reqNumTicks, 1);
         }
         
         /* Find the outer tick values. Add 0.0 to prevent getting -0.0. */
-        tickMin = floor(_valueMin / step) * step + 0.0;
-        tickMax = ceil(_valueMax / step) * step + 0.0;
+        tickMin = floor(valueMin_ / step) * step + 0.0;
+        tickMax = ceil(valueMax_ / step) * step + 0.0;
         
         nTicks = ROUND((tickMax - tickMin) / step) + 1;
     } 
-    _major.SetValues(tickMin, step, nTicks);
+    major_.SetValues(tickMin, step, nTicks);
 
     /*
@@ -460 +460 @@
      * assume that user would have picked a different number).
      */
-    _min = ((_flags & TIGHT_MIN)||(DEFINED(_reqMin))) ? _valueMin : tickMin;
-    _max = ((_flags & TIGHT_MAX)||(DEFINED(_reqMax))) ? _valueMax : tickMax;
-    _range = _max - _min;
-    _scale = 1.0 / _range;
+    min_ = ((flags_ & TIGHT_MIN)||(DEFINED(reqMin_))) ? valueMin_ : tickMin;
+    max_ = ((flags_ & TIGHT_MAX)||(DEFINED(reqMax_))) ? valueMax_ : tickMax;
+    range_ = max_ - min_;
+    scale_ = 1.0 / range_;
 
     /* Now calculate the minor tick step and number. */
 
-    if ((_minor.reqNumTicks > 0) && (_minor.IsAutoScale())) {
-        nTicks = _minor.reqNumTicks - 1;
+    if ((minor_.reqNumTicks > 0) && (minor_.autoscale())) {
+        nTicks = minor_.reqNumTicks - 1;
         step = 1.0 / (nTicks + 1);
     } else {
@@ -476 +476 @@
                                  * create minor log-scale tick marks.  */
     }
-    _minor.SetValues(step, step, nTicks);
+    minor_.SetValues(step, step, nTicks);
 }
 
@@ -484 +484 @@
 {
     FixRange(min, max);
-    if (_flags & LOGSCALE) {
+    if (flags_ & LOGSCALE) {
         LogScale();
     } else {
         LinearScale();
     }
-    _major.SweepTicks();
-    _minor.SweepTicks();
+    major_.SweepTicks();
+    minor_.SweepTicks();
     MakeTicks();
 }
@@ -497 +497 @@
 Axis::MakeTicks(void)
 {
-    _major.Reset();
-    _minor.Reset();
+    major_.Reset();
+    minor_.Reset();
     int i;
-    for (i = 0; i < _major.NumTicks(); i++) {
+    for (i = 0; i < major_.numTicks(); i++) {
         double t1, t2;
         int j;
         
-        t1 = _major.GetTick(i);
+        t1 = major_.tick(i);
         /* Minor ticks */
-        for (j = 0; j < _minor.NumTicks(); j++) {
-            t2 = t1 + (_major.Step() * _minor.GetTick(j));
+        for (j = 0; j < minor_.numTicks(); j++) {
+            t2 = t1 + (major_.step() * minor_.tick(j));
             if (!InRange(t2)) {
                 continue;
@@ -514 +514 @@
                 continue;       // Don't add duplicate minor ticks.
             }
-            _minor.Append(t2);
+            minor_.Append(t2);
         }
         if (!InRange(t1)) {
             continue;
         }
-        _major.Append(t1);
+        major_.Append(t1);
     }
 }
@@ -526 +526 @@
 Axis::Map(double x)
 {
-    if ((_flags & LOGSCALE) && (x != 0.0)) {
+    if ((flags_ & LOGSCALE) && (x != 0.0)) {
         x = log10(fabs(x));
     }
     /* Map graph coordinate to normalized coordinates [0..1] */
-    x = (x - _min) * _scale;
-    if (_flags & DESCENDING) {
+    x = (x - min_) * scale_;
+    if (flags_ & DESCENDING) {
         x = 1.0 - x;
     }
@@ -540 +540 @@
 Axis::InvMap(double x)
 {
-    if (_flags & DESCENDING) {
+    if (flags_ & DESCENDING) {
         x = 1.0 - x;
     }
-    x = (x * _range) + _min;
-    if (_flags & LOGSCALE) {
+    x = (x * range_) + min_;
+    if (flags_ & LOGSCALE) {
         x = EXP10(x);
     }

trunk/packages/vizservers/nanovis/Axis.h

@@ -8 +8 @@
 class NaN {
 private:
-    double _x;
+    double x_;
 public:
     NaN(void) {
@@ -23 +23 @@
         result.words[1] = 0x7ff80000;
 #endif
-        _x = result.value;
+        x_ = result.value;
     }
     operator const double() {
-        return _x;
+        return x_;
     }
 };
@@ -33 +33 @@
 
 class TickIter {
-    ChainLink *_linkPtr;
+    ChainLink *linkPtr_;
 public:
     void SetStartingLink(ChainLink *linkPtr) {
-        _linkPtr = linkPtr;
+        linkPtr_ = linkPtr;
     }
     bool Next(void) {
-        if (_linkPtr == NULL) {
+        if (linkPtr_ == NULL) {
             return false;
         }
-        _linkPtr = _linkPtr->Next();
-        return (_linkPtr != NULL);
+        linkPtr_ = linkPtr_->Next();
+        return (linkPtr_ != NULL);
     }
     float GetValue(void) {
@@ -50 +50 @@
             void *clientData;
         } value;
-        value.clientData = _linkPtr->GetValue();
+        value.clientData = linkPtr_->GetValue();
         return value.x;
     }
@@ -66 +66 @@
  */
 class Ticks {
-    bool _autoscale;            /* Indicates if the ticks are autoscaled. */
+    bool autoscale_;            /* Indicates if the ticks are autoscaled. */
     /* 
      * Tick locations may be generated in two fashions
      */
     /*   1. an array of values provided by the user. */
-    int _nTicks;                /* # of ticks on axis */
-    float *_ticks;              /* Array of tick values (alloc-ed).  Right now
+    int numTicks_;              /* # of ticks on axis */
+    float *ticks_;              /* Array of tick values (alloc-ed).  Right now
                                  * it's a float so we don't have to allocate
                                  * store for the list of ticks generated.  In
@@ -83 +83 @@
      *      will generate the an array of values.
      */
-    double _initial;            /* Initial value */
-    double _step;               /* Size of interval */
-    unsigned int _nSteps;       /* Number of intervals. */
+    double initial_;            /* Initial value */
+    double step_;               /* Size of interval */
+    unsigned int nSteps_;       /* Number of intervals. */
 
     /* 
@@ -93 +93 @@
      * the chain.
      */
-    Chain _chain;               
+    Chain chain_;               
 
     void SetTicks(void);        /* Routine used internally to create the array
@@ -111 +111 @@
     Ticks(int numTicks) {
         reqNumTicks = numTicks;
-        _ticks = NULL;
-        _nTicks = 0;
-        _autoscale = true;
+        ticks_ = NULL;
+        numTicks_ = 0;
+        autoscale_ = true;
     }
     ~Ticks(void) {
-        if (_ticks != NULL) {
-            delete [] _ticks;
-        }
-        _chain.Reset();
+        if (ticks_ != NULL) {
+            delete [] ticks_;
+        }
+        chain_.Reset();
         
     }
     void SetTicks(float *ticks, int nTicks) {
-        _ticks = ticks, _nTicks = nTicks;
-    }
-    int NumTicks(void) {
-        return _nTicks;
-    }
-    double GetTick(int i) {
-        if ((i < 0) || (i >= _nTicks)) {
+        ticks_ = ticks, numTicks_ = nTicks;
+    }
+    int numTicks(void) {
+        return numTicks_;
+    }
+    double tick(int i) {
+        if ((i < 0) || (i >= numTicks_)) {
             return _NaN;
         }
-        return _ticks[i];
+        return ticks_[i];
     }
     void Reset(void) {
-        _chain.Reset();
-    }
-    float Step() {
-        return _step;
+        chain_.Reset();
+    }
+    float step() {
+        return step_;
     }
     void Append (float x) {
-        _chain.Append(GetClientData(x));
+        chain_.Append(GetClientData(x));
     }    
     void SetValues(double initial, double step, unsigned int nSteps) {
-        _initial = initial, _step = step, _nSteps = nSteps;
-    }
-    bool IsAutoScale(void) {
-        return _autoscale;
+        initial_ = initial, step_ = step, nSteps_ = nSteps;
+    }
+    bool autoscale(void) {
+        return autoscale_;
     }
     void SweepTicks(void) {
-        if (_autoscale) {
-            if (_ticks != NULL) {
-                delete [] _ticks;
+        if (autoscale_) {
+            if (ticks_ != NULL) {
+                delete [] ticks_;
             }
             SetTicks();
@@ -160 +160 @@
         ChainLink *linkPtr;
 
-        linkPtr = _chain.FirstLink();
+        linkPtr = chain_.FirstLink();
         iter.SetStartingLink(linkPtr);
         return (linkPtr != NULL);
@@ -187 +187 @@
     };
 
-    const char *_name;          /* Name of the axis. Malloc-ed */
-
-    unsigned int _flags;
-
-    const char *_title;         /* Title of the axis. */
-
-    const char *_units;         /* Units of the axis. */
-
-    double _valueMin, _valueMax; /* The limits of the data. */
-
-    double _reqMin, _reqMax;    /* Requested axis bounds. Consult the
+    const char *name_;          /* Name of the axis. Malloc-ed */
+
+    unsigned int flags_;
+
+    const char *title_;         /* Title of the axis. */
+
+    const char *units_;         /* Units of the axis. */
+
+    double valueMin_, valueMax_; /* The limits of the data. */
+
+    double reqMin_, reqMax_;    /* Requested axis bounds. Consult the
                                  * axisPtr->flags field for
                                  * Axis::CONFIG_MIN and Axis::CONFIG_MAX
@@ -205 +205 @@
                                  * (determined by auto-scaling). */
 
-    double _min, _max;          /* Smallest and largest major tick values for
+    double min_, max_;          /* Smallest and largest major tick values for
                                  * the axis.  If loose, the tick values lie
                                  * outside the range of data values.  If
@@ -211 +211 @@
                                  * the data. */
 
-    double _range;              /* Range of values on axis (_max - _min) */
-    double _scale;              /* Scale factor for axis (1.0/_range) */
-
-    double _reqStep;            /* If > 0.0, overrides the computed major tick
+    double range_;              /* Range of values on axis (max_ - min_) */
+    double scale_;              /* Scale factor for axis (1.0/_range) */
+
+    double reqStep_;            /* If > 0.0, overrides the computed major tick
                                  * interval.  Otherwise a stepsize is
                                  * automatically calculated, based upon the
@@ -220 +220 @@
                                  * default value is 0.0. */
 
-    Ticks _major, _minor;
+    Ticks major_, minor_;
 
     void LogScale(void);
@@ -230 +230 @@
     Axis(const char *name);
     ~Axis(void) {
-        if (_name != NULL) {
-            free((void *)_name);
-        }
-        if (_units != NULL) {
-            free((void *)_units);
-        }
-        if (_title != NULL) {
-            free((void *)_title);
+        if (name_ != NULL) {
+            free((void *)name_);
+        }
+        if (units_ != NULL) {
+            free((void *)units_);
+        }
+        if (title_ != NULL) {
+            free((void *)title_);
         }
     }
@@ -244 +244 @@
     void FixRange(double min, double max);
     void SetScale(double min, double max);
-    double Scale(void) {
-        return _scale;
-    }
-    double Range(void) {
-        return _range;
+    double scale(void) {
+        return scale_;
+    }
+    double range(void) {
+        return range_;
     }
     bool FirstMajor(TickIter &iter) {
-        return _major.FirstTick(iter);
+        return major_.FirstTick(iter);
     }
     bool FirstMinor(TickIter &iter) {
-        return _minor.FirstTick(iter);
+        return minor_.FirstTick(iter);
     }
     void GetDataLimits(double &min, double &max) {
-        min = _valueMin, max = _valueMax;
+        min = valueMin_, max = valueMax_;
     }
     double Map(double x);
     double InvMap(double x);
-    const char *GetName(void) {
-        return (_name == NULL) ? "???" : _name;
-    }
-    void SetName(const char *name) {
-        if (_name != NULL) {
-            free((void *)_name);
-        }
-        _name = strdup(name);
-    }
-    const char *GetUnits(void) {
-        return (_units == NULL) ? "???" : _units;
-    }
-    void SetUnits(const char *units) {
-        if (_units != NULL) {
-            free((void *)_units);
-        }
-        _units = strdup(units);
-    }
-    const char *GetTitle(void) {
-        return (_title == NULL) ? "???" : _title;
-    }
-    void SetTitle(const char *title) {
-        if (_title != NULL) {
-            free((void *)_title);
-        }
-        _title = strdup(title);
-    }
-    void SetMin(double min) {
-        _reqMin = min;          // Setting to NaN resets min to "auto"
-    }
-    void SetMax(double min) {
-        _reqMin = min;          // Setting to NaN resets max to "auto"
+    const char *name(void) {
+        return (name_ == NULL) ? "???" : name_;
+    }
+    void name(const char *name) {
+        if (name_ != NULL) {
+            free((void *)name_);
+        }
+        name_ = strdup(name);
+    }
+    const char *units(void) {
+        return (units_ == NULL) ? "???" : units_;
+    }
+    void units(const char *units) {
+        if (units_ != NULL) {
+            free((void *)units_);
+        }
+        units_ = strdup(units);
+    }
+    const char *title(void) {
+        return (title_ == NULL) ? "???" : title_;
+    }
+    void title(const char *title) {
+        if (title_ != NULL) {
+            free((void *)title_);
+        }
+        title_ = strdup(title);
+    }
+    double min(void) {
+        return min_;            
+    }
+    void min(double min) {
+        reqMin_ = min;  
+    }
+    double max(void) {
+        return max_;            
+    }
+    void max(double max) {
+        reqMax_ = max;  
     }
     void SetLimits(double min, double max) {
-        SetMin(min), SetMax(max);
+        reqMin_ = min, reqMax_ = max;
     }
     void UnsetLimits() {
-        SetMin(_NaN), SetMax(_NaN);
+        min(_NaN), max(_NaN);
     }
     void SetDescendingOption(bool value) {
         if (value) {
-            _flags |= DESCENDING;
+            flags_ |= DESCENDING;
         } else {
-            _flags &= ~DESCENDING;
+            flags_ &= ~DESCENDING;
         }
     }
     void SetTightMinOption(bool value) {
         if (value) {
-            _flags |= TIGHT_MIN;
+            flags_ |= TIGHT_MIN;
         } else {
-            _flags &= ~TIGHT_MIN;
+            flags_ &= ~TIGHT_MIN;
         }
     }
     void SetTightMaxOption(bool value) {
         if (value) {
-            _flags |= TIGHT_MAX;
+            flags_ |= TIGHT_MAX;
         } else {
-            _flags &= ~TIGHT_MAX;
+            flags_ &= ~TIGHT_MAX;
         }
     }
     void SetLogScaleOption(bool value) {
         if (value) {
-            _flags |= LOGSCALE;
+            flags_ |= LOGSCALE;
         } else {
-            _flags &= ~LOGSCALE;
+            flags_ &= ~LOGSCALE;
         }
     }
     void SetMajorStepOption(double value) {
-        _reqStep = value;       // Setting to 0.0 resets step to "auto"
+        reqStep_ = value;       // Setting to 0.0 resets step to "auto"
     }
     void SetNumMinorTicksOption(int n) {
-        _minor.reqNumTicks = n;
+        minor_.reqNumTicks = n;
     }
     void SetNumMajorTicksOption(int n) {
-        _major.reqNumTicks = n;
+        major_.reqNumTicks = n;
     }
 };

trunk/packages/vizservers/nanovis/AxisRange.h

@@ -3 +3 @@
 
 class AxisRange {
-    double _min, _max;
+    double min_, max_;
 public:
     AxisRange(void) {
-        SetRange(0.0, 1.0);
+        min(0.0), max(1.0);
     }
     void SetRange(double min, double max) {
-        _min = min, _max = max;
+        min_ = min, max_ = max;
     }
-    double Min(void) {
-        return _min;
+    double min(void) {
+        return min_;
     }
-    double Max(void) {
-        return _max;
+    void min(double min) {
+        min_ = min;
+    }
+    double max(void) {
+        return max_;
+    }
+    void max(double max) {
+        max_ = max;
     }
 };

trunk/packages/vizservers/nanovis/Command.cpp

@@ -33 +33 @@
  *          the vector. 1) Use a list instead of a vector. 2) carry
  *          an id field that's a number that gets incremented each new volume.
- *        x Create R2, matrix, etc. libraries. (done)
- *        o Add bookkeeping for volumes, heightmaps, flows, etc. to track
+ *        x Create R2, matrix, etc. libraries. (done) *        o Add bookkeeping for volumes, heightmaps, flows, etc. to track
  *          1) id #  2) simulation # 3) include/exclude.  The include/exclude
  *          is to indicate whether the item should contribute to the overall
@@ -90 +89 @@
 // in nanovis.cpp
 extern vector<PointSet*> g_pointSet;
+extern int debug_flag;
 
 extern PlaneRenderer* plane_render;
@@ -655 +655 @@
     char buffer[8096];
 
-    clearerr(stdin);
+    clearerr(NanoVis::stdin);
     while (nBytes > 0) {
         unsigned int chunk;
@@ -662 +662 @@
         chunk = (sizeof(buffer) < (unsigned int) nBytes) ?
             sizeof(buffer) : nBytes;
-        nRead = fread(buffer, sizeof(char), chunk, stdin);
-        if (ferror(stdin)) {
+        nRead = fread(buffer, sizeof(char), chunk, NanoVis::stdin);
+        if (ferror(NanoVis::stdin)) {
             Tcl_AppendResult(interp, "while reading data stream: ",
                              Tcl_PosixError(interp), (char*)NULL);
             return TCL_ERROR;
         }
-        if (feof(stdin)) {
+        if (feof(NanoVis::stdin)) {
             Tcl_AppendResult(interp, "premature EOF while reading data stream",
                              (char*)NULL);
@@ -925 +925 @@
         NanoVis::SetVolumeRanges();
     }
-    NanoVis::render_legend(tf, Volume::valueMin, Volume::valueMax, w, h, label);
+    NanoVis::render_legend(tf, 
+                           NanoVis::grid->yAxis.min(), 
+                           NanoVis::grid->yAxis.max(), w, h, label);
     return TCL_OK;
 }
@@ -1332 +1334 @@
         volPtr = NanoVis::volume[n];
         sprintf(info, "nv>data id %d min %g max %g vmin %g vmax %g\n",
-                n, volPtr->wAxis.Min(), volPtr->wAxis.Max(),
+                n, volPtr->wAxis.min(), volPtr->wAxis.max(),
                 Volume::valueMin, Volume::valueMax);
         write(0, info, strlen(info));
@@ -1715 +1717 @@
                 volPtr->height / (float)volPtr->width,
                 volPtr->depth  / (float)volPtr->width,
-                volPtr->wAxis.Max());
+                volPtr->wAxis.max());
             NanoVis::initParticle();
         }
@@ -1723 +1725 @@
                 1.0f / volPtr->aspect_ratio_height,
                 1.0f / volPtr->aspect_ratio_depth,
-                volPtr->wAxis.Max());
+                volPtr->wAxis.max());
             NanoVis::licRenderer->set_offset(NanoVis::lic_slice_z);
         }
@@ -1930 +1932 @@
     result = Tcl_Eval(interp, buf.bytes());
     if (result != TCL_OK) {
-        fprintf(stderr, "error in command: %s\n", Tcl_GetStringResult(interp));
-        fflush(stderr);
+        fprintf(NanoVis::logfile, "error in command: %s\n", 
+                Tcl_GetStringResult(interp));
+        fflush(NanoVis::logfile);
     }
     return result;
@@ -2234 +2237 @@
         case 2: axisPtr = &NanoVis::grid->zAxis; break;
         }
-        axisPtr->SetName(Tcl_GetString(objv[3]));
-        axisPtr->SetUnits(Tcl_GetString(objv[4]));
+        axisPtr->name(Tcl_GetString(objv[3]));
+        axisPtr->units(Tcl_GetString(objv[4]));
     }
     return TCL_OK;
@@ -2528 +2531 @@
     HeightMap* hmPtr;
     hmPtr = new HeightMap();
+
     hmPtr->setHeight(xMin, yMin, xMax, yMax, xNum, yNum, zValues);
     hmPtr->setColorMap(NanoVis::get_transfunc("default"));
@@ -2533 +2537 @@
     hmPtr->setLineContourVisible(true);
     NanoVis::heightMap.push_back(hmPtr);
-    delete [] zValues;
     return TCL_OK;
 }
@@ -2572 +2575 @@
     // create a default transfer function
     if (Tcl_Eval(interp, def_transfunc) != TCL_OK) {
-        fprintf(stdin, "WARNING: bad default transfer function\n");
-        fprintf(stdin, Tcl_GetStringResult(interp));
+        fprintf(NanoVis::logfile, "WARNING: bad default transfer function\n");
+        fprintf(NanoVis::logfile, Tcl_GetStringResult(interp));
     }
 }
@@ -2601 +2604 @@
         //
         while (1) {
-            char c = getchar();
+            int c = fgetc(NanoVis::stdin);
+            char ch;
             if (c <= 0) {
                 if (npass == 0) {
@@ -2609 +2613 @@
                 }
             }
-            Tcl_DStringAppend(&cmdbuffer, &c, 1);
-
-            if (c=='\n' && Tcl_CommandComplete(Tcl_DStringValue(&cmdbuffer))) {
+            ch = (char)c;
+            Tcl_DStringAppend(&cmdbuffer, &ch, 1);
+
+            if (ch=='\n' && Tcl_CommandComplete(Tcl_DStringValue(&cmdbuffer))) {
                 break;
             }
         }
-
         // no command? then we're done for now
         if (Tcl_DStringLength(&cmdbuffer) == 0) {
@@ -2623 +2627 @@
         // back to original flags during command evaluation...
         fcntl(0, F_SETFL, flags & ~O_NONBLOCK);
+        if (debug_flag) {
+            fprintf(NanoVis::logfile, "%s\n", Tcl_DStringValue(&cmdbuffer));
+        }
         status = Tcl_Eval(interp, Tcl_DStringValue(&cmdbuffer));
         Tcl_DStringSetLength(&cmdbuffer, 0);
@@ -2635 +2642 @@
         const char *string;
         int nBytes;
-        string = Tcl_GetStringFromObj(Tcl_GetObjResult(_interp), &nBytes);
-
+
+        string = Tcl_GetStringFromObj(Tcl_GetObjResult(interp), &nBytes);
         struct iovec iov[3];
-        iov[0].iov_base = "NanoVis Server Error: ";
-        iov[0].iov_len = strlen(iov[0].iov_base);
-        iov[1].iov_base = string;
+        iov[0].iov_base = (char *)"NanoVis Server Error: ";
+        iov[0].iov_len = strlen((char *)iov[0].iov_base);
+        iov[1].iov_base = (char *)string;
         iov[1].iov_len = nBytes;
-        iov[2].iov_base = '\n';
+        iov[2].iov_base = (char *)'\n';
         iov[2].iov_len = 1;
         writev(0, iov, 3);

trunk/packages/vizservers/nanovis/Grid.cpp

@@ -32 +32 @@
 #endif
 #ifdef notdef
-    glScalef(xAxis.Scale(), 
-             yAxis.Range() / xAxis.Range(), 
-             zAxis.Range() / xAxis.Range());
+    glScalef(xAxis.scale(), 
+             yAxis.range() / xAxis.range(), 
+             zAxis.range() / xAxis.range());
 #endif
     glScalef(1.0, 1.0, 1.0);
@@ -141 +141 @@
             glLoadIdentity();
             glTranslatef((int) wx, viewport[3] - (int) wy, 0);
-            _font->draw(xAxis.GetName());
+            _font->draw(xAxis.name());
         }
         
@@ -147 +147 @@
             glLoadIdentity();
             glTranslatef((int) wx, viewport[3] - (int)wy, 0);
-            _font->draw(yAxis.GetName());
+            _font->draw(yAxis.name());
         }
         
@@ -153 +153 @@
             glLoadIdentity();
             glTranslatef((int) wx, (int) viewport[3] - (int)wy, 0.0f);
-            _font->draw(zAxis.GetName());
+            _font->draw(zAxis.name());
         }
         

trunk/packages/vizservers/nanovis/HeightMap.cpp

@@ -1 +1 @@
  
-#include <GL/glew.h>
-#include <GL/gl.h>
-#include "HeightMap.h"
-#include "ContourLineFilter.h"
-#include "TypeDefs.h"
-#include <Texture1D.h>
+#include <memory.h>
 #include <stdlib.h>
-#include <memory.h>
-#include <R2/R2FilePath.h>
-#include "RpField1D.h"
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <RenderContext.h>
+#include <stdlib.h>
+#include <GL/glew.h>
+#include <GL/gl.h>
+#include "Grid.h"
+#include "HeightMap.h"
+#include "ContourLineFilter.h"
+#include "TypeDefs.h"
+#include "Texture1D.h"
+#include "R2/R2FilePath.h"
+#include "RpField1D.h"
+#include "RenderContext.h"
 
 bool HeightMap::update_pending = false;
@@ -35 +37 @@
     _visible(false),
     _scale(1.0f, 1.0f, 1.0f), 
-    _centerPoint(0.0f, 0.0f, 0.0f)
+    _centerPoint(0.0f, 0.0f, 0.0f),
+    heights_(NULL)
 {
     _shader = new NvShader();
-
-    R2string path = R2FilePath::getInstance()->getPath("heightcolor.cg");
-    if (path.getLength() == 0) {
-        printf("ERROR : file not found %s\n", "heightcolor.cg");
-    }
-    _shader->loadFragmentProgram(path, "main");
+    _shader->loadFragmentProgram("heightcolor.cg", "main");
     _tf = _shader->getNamedParameterFromFP("tf");
 }
@@ -73 +71 @@
     glPushMatrix();
 
+#ifndef notdef
     if (_scale.x != 0.0) {
-        glScalef(1 / _scale.x, 1 / _scale.x , 1 / _scale.x);
-    }
-
+        glScalef(1 / _scale.x, 1 / _scale.y , 1 / _scale.z);
+    }
+#endif
     glTranslatef(-_centerPoint.x, -_centerPoint.y, -_centerPoint.z);
 
-    if (_contour) {
+    if (_contour != NULL) {
         glDepthRange (0.001, 1.0);
     }
@@ -140 +139 @@
     glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
     
-    if (_contour) {
+    if (_contour != NULL) {
         if (_contourVisible) {
             glDisable(GL_BLEND);
@@ -176 +175 @@
     int boundaryHeight = zCount - 1;
     int* ptr = indexBuffer;
-        int index1, index2, index3, index4;
+    int index1, index2, index3, index4;
     bool index1Valid, index2Valid, index3Valid, index4Valid;
     index1Valid = index2Valid = index3Valid = index4Valid = true;
@@ -257 +256 @@
     reset();
     
+    heights_ = (float *)heights; 
     float min, max;
     min = heights[0].y, max = heights[0].y;
@@ -325 +325 @@
 
 void 
-HeightMap::setHeight(float startX, float startY, float endX, float endY, 
-                     int xCount, int yCount, float* heights)
-{
-    _vertexCount = xCount * yCount;
-    
+HeightMap::setHeight(float xMin, float yMin, float xMax, float yMax, 
+                     int xNum, int yNum, float* heights)
+{
+    _vertexCount = xNum * yNum;
+    xNum_ = xNum, yNum_ = yNum;
+    heights_ = heights; 
     reset();
-
+    
+    // Get the min/max of the heights. */
     float min, max;
-    min = heights[0], max = heights[0];
-    int count = xCount * yCount;
-    for (int i = 0; i < count; ++i) {
+    min = max = heights[0];
+    for (int i = 0; i < _vertexCount; ++i) {
         if (min > heights[i]) {
             min = heights[i];
@@ -342 +343 @@
         }
     }
-    _scale.x = endX - startX;
-    _scale.y = max - min;
-    _scale.z = endY - startY;
-
     wAxis.SetRange(min, max);
-    xAxis.SetRange(startX, endX);
     yAxis.SetRange(min, max);
-    zAxis.SetRange(startY, endY);
+    xAxis.SetRange(xMin, xMax);
+    zAxis.SetRange(yMin, yMax);
+    
+    
+    min = 0.0, max = 1.0;
+    xMin = yMin = min = 0.0; 
+    xMax = yMax = max = 1.0;
+    // Save the scales.
+    _scale.x = _scale.y = _scale.z = 1.0;
+
     update_pending = true;
 
-    _centerPoint.set(_scale.x * 0.5 + startX, _scale.y * 0.5 + min, 
-        _scale.z * 0.5 + startY);
-    
-    Vector3* texcoord = new Vector3[count];
-    for (int i = 0; i < count; ++i) {
+    _centerPoint.set(0.5, 0.5, 0.5);
+    
+#ifndef notdef
+    Vector3* texcoord = new Vector3[_vertexCount];
+    for (int i = 0; i < _vertexCount; ++i) {
         texcoord[i].set(0, 0, heights[i]);
     }
     
-    Vector3* heightMap = createHeightVertices(startX, startY, endX, endY, xCount, yCount, heights);
+    Vector3* heightMap = createHeightVertices(xMin, yMin, xMax, yMax, xNum, yNum, heights);
     
     glGenBuffers(1, &_vertexBufferObjectID);
@@ -377 +382 @@
     ContourLineFilter lineFilter;
     //lineFilter.setColorMap(_colorMap);
-    _contour = lineFilter.create(0.0f, 1.0f, 10, heightMap, xCount, yCount);
+    _contour = lineFilter.create(0.0f, 1.0f, 10, heightMap, xNum, yNum);
     
 #if TOPCONTOUR
     ContourLineFilter topLineFilter;
     topLineFilter.setHeightTop(true);
-    _topContour = topLineFilter.create(0.0f, 1.0f, 10, heightMap, xCount, yCount);
+    _topContour = topLineFilter.create(0.0f, 1.0f, 10, heightMap, xNum, yNum);
 #endif
 
@@ -388 +393 @@
     //if (heightMap)
     //{
-    //  VertexBuffer* vertexBuffer = new VertexBuffer(VertexBuffer::POSITION3, xCount * yCount, 
-    // sizeof(Vector3) * xCount * yCount, heightMap, false);
+    //  VertexBuffer* vertexBuffer = new VertexBuffer(VertexBuffer::POSITION3, xNum * yNum, 
+    // sizeof(Vector3) * xNum * yNum, heightMap, false);
     if (_indexBuffer) {
         free(_indexBuffer);
     }
-    this->createIndexBuffer(xCount, yCount, _indexBuffer, _indexCount, heights);
+    this->createIndexBuffer(xNum, yNum, _indexBuffer, _indexCount, heights);
     //}
     //else
@@ -399 +404 @@
     //printf("ERROR - HeightMap::setHeight\n");
     //}
-}
-
-Vector3* HeightMap::createHeightVertices(float startX, float startY, float endX, float endY, int xCount, int yCount, float* height)
-{
-    Vector3* vertices = (Vector3*) malloc(sizeof(Vector3) * xCount * yCount);
+#endif
+}
+
+Vector3* 
+HeightMap::createHeightVertices(float xMin, float yMin, float xMax, 
+                                float yMax, int xNum, int yNum, float* height)
+{
+    Vector3* vertices = (Vector3*) malloc(sizeof(Vector3) * xNum * yNum);
 
     Vector3* dstDataPtr = vertices;
     float* srcDataPtr = height;
     
-    for (int y = 0; y < yCount; ++y) {
+    for (int y = 0; y < yNum; ++y) {
         float yCoord;
 
-        yCoord = startY + ((endY - startY) * y) / (yCount - 1); 
-        for (int x = 0; x < xCount; ++x) {
+        yCoord = yMin + ((yMax - yMin) * y) / (yNum - 1); 
+        for (int x = 0; x < xNum; ++x) {
             float xCoord;
 
-            xCoord = startX + ((endX - startX) * x) / (xCount - 1); 
+            xCoord = xMin + ((xMax - xMin) * x) / (xNum - 1); 
             dstDataPtr->set(xCoord, *srcDataPtr, yCoord);
 
@@ -432 +440 @@
 }
 
+// Maps the data coordinates of the surface into the grid's axes.
+void 
+HeightMap::MapToGrid(Grid *gridPtr)
+{
+    int count = xNum_ * yNum_;
+
+    reset();
+
+    // The range of the grid's y-axis 0..1 represents the distance between the
+    // smallest and largest major ticks for all surfaces plotted.  Translate 
+    // this surface's y-values (heights) into the grid's axis coordinates.
+
+    float yScale = 1.0 / (gridPtr->yAxis.max() - gridPtr->yAxis.min());
+    float *p, *q, *pend;
+    float *normHeights = new float[count];
+    for (p = heights_, pend = p + count, q = normHeights; p < pend; p++, q++) {
+        *q = (*p - gridPtr->yAxis.min()) * yScale;
+    }
+    Vector3 *t, *texcoord;
+    texcoord = new Vector3[count];
+    for (t = texcoord, p = normHeights, pend = p + count; p < pend; p++, t++) {
+        t->set(0, 0, *p);
+    }
+
+    // Normalize the mesh coordinates (x and z min/max) the range of 
+    // the major ticks for the x and z grid axes as well.
+
+    float xScale, zScale;
+    float xMin, xMax, zMin, zMax;
+
+    xScale = 1.0 / (gridPtr->xAxis.max() - gridPtr->xAxis.min());
+    xMin = (xAxis.min() - gridPtr->xAxis.min()) * xScale;
+    xMax = (xAxis.max() - gridPtr->xAxis.min()) * xScale;
+    zScale = 1.0 / (gridPtr->zAxis.max() - gridPtr->zAxis.min());
+    zMin = (zAxis.min() - gridPtr->zAxis.min()) * zScale;
+    zMax = (zAxis.max() - gridPtr->zAxis.min()) * zScale;
+
+    Vector3* vertices;
+    vertices = createHeightVertices(xMin, zMin, xMax, zMax, xNum_, yNum_, 
+        normHeights);
+    
+    glGenBuffers(1, &_vertexBufferObjectID);
+    glBindBuffer(GL_ARRAY_BUFFER, _vertexBufferObjectID);
+    glBufferData(GL_ARRAY_BUFFER, _vertexCount * sizeof(Vector3), vertices, 
+        GL_STATIC_DRAW);
+    glGenBuffers(1, &_textureBufferObjectID);
+    glBindBuffer(GL_ARRAY_BUFFER, _textureBufferObjectID);
+    glBufferData(GL_ARRAY_BUFFER, _vertexCount * sizeof(float) * 3, texcoord, 
+        GL_STATIC_DRAW);
+    glBindBuffer(GL_ARRAY_BUFFER, 0);
+    delete [] texcoord;
+
+    ContourLineFilter lineFilter;
+    //lineFilter.setColorMap(_colorMap);
+    _contour = lineFilter.create(0.0f, 1.0f, 10, vertices, xNum_, yNum_);
+    
+#if TOPCONTOUR
+    ContourLineFilter topLineFilter;
+    topLineFilter.setHeightTop(true);
+    _topContour = topLineFilter.create(0.0f, 1.0f, 10, vertices, xNum_, yNum_);
+#endif
+    if (_indexBuffer) {
+        free(_indexBuffer);
+    }
+    this->createIndexBuffer(xNum_, yNum_, _indexBuffer, _indexCount, 
+        normHeights);
+    delete [] normHeights;
+}

trunk/packages/vizservers/nanovis/HeightMap.h

@@ -15 +15 @@
 }
 
+class Grid;
+
 /**
  *@class HeightMap
  *@brief Create a surface from height map and line contour of the generated surface
  */
+
 class HeightMap {
     unsigned int _vertexBufferObjectID;
     unsigned int _textureBufferObjectID;
-    
+    int xNum_, yNum_;           // Number of elements x and y axes in grid.
+    float *heights_;            // Array of original (unscaled) heights
+                                // (y-values)
     int _vertexCount;
     CGparameter _tf;
@@ -59 +64 @@
         void reset();
 public :
-        void render(graphics::RenderContext* renderContext);
+    void render(graphics::RenderContext* renderContext);
     /**
      *@brief Create a height map with heigh values
@@ -70 +75 @@
      *@param height a pointer value adrressing xCount * yCount values of heights
      */
-        void setHeight(float startX, float startY, float endX, float endY, int xCount, int yCount, float* height);
+    void setHeight(float startX, float startY, float endX, float endY, 
+                   int xCount, int yCount, float* height);
 
     /**
@@ -77 +83 @@
      *@param yCount the number of rows of height values
      */
-        void setHeight(int xCount, int yCount, Vector3* heights);
+    void setHeight(int xCount, int yCount, Vector3* heights);
 
+    void MapToGrid(Grid *gridPtr);
     /**
      *@brief Define a color map for color shading of heightmap

trunk/packages/vizservers/nanovis/Lic.cpp

@@ -90 +90 @@
   assert(glGetError()==0);
 
-  R2string path = R2FilePath::getInstance()->getPath("render_vel.cg");
-  m_render_vel_fprog = loadProgram(m_g_context, CG_PROFILE_FP30, CG_SOURCE, path);
-  m_vel_tex_param_render_vel = cgGetNamedParameter(m_render_vel_fprog, "vel_tex");
-  m_plane_normal_param_render_vel = cgGetNamedParameter(m_render_vel_fprog, "plane_normal");
+  m_render_vel_fprog = LoadProgram(m_g_context, CG_PROFILE_FP30, CG_SOURCE, 
+        NULL, "render_vel.cg");
+  m_vel_tex_param_render_vel = cgGetNamedParameter(m_render_vel_fprog, 
+        "vel_tex");
+  m_plane_normal_param_render_vel = cgGetNamedParameter(m_render_vel_fprog, 
+        "plane_normal");
   cgGLSetTextureParameter(m_vel_tex_param_render_vel, _vector_field);
 

trunk/packages/vizservers/nanovis/NvColorTableShader.cpp

@@ -2 +2 @@
 #include "NvColorTableShader.h"
 #include <Trace.h>
+#include <global.h>
 
 NvColorTableShader::NvColorTableShader()
@@ -14 +15 @@
 void NvColorTableShader::init()
 {
-    R2string path = R2FilePath::getInstance()->getPath("one_plane.cg");
-    if (path.getLength() == 0)
-    {
-        Trace("%s is not found", (const char*) path); 
-    }
-    
-    _cgFP = cgCreateProgramFromFile(g_context, CG_SOURCE,
-            path, CG_PROFILE_FP30, "main", NULL);
-    cgGLLoadProgram(_cgFP);
-
+    _cgFP = LoadCgSourceProgram(g_context, "one_plane.cg", CG_PROFILE_FP30, 
+        "main"); 
     _dataParam = cgGetNamedParameter(_cgFP, "data");
     _tfParam = cgGetNamedParameter(_cgFP, "tf");

trunk/packages/vizservers/nanovis/NvEventLog.cpp

@@ -25 +25 @@
     char* logName = NULL;
     int logNameLen = 0;
+    extern int debug_flag;
 
     if (user == NULL) {
@@ -38 +39 @@
     }
 
-    //open log and map stderr to log file
-    xinetd_log = fopen(logName, "w");
-    close(2);
-    dup2(fileno(xinetd_log), 2);
-    dup2(2,1);
-
-    //flush junk
-    fflush(stdout);
-    fflush(stderr);
+    if (!debug_flag) {
+        //open log and map stderr to log file
+        xinetd_log = fopen(logName, "w");
+        close(2);
+        dup2(fileno(xinetd_log), 2);
+        dup2(2,1);
+        //flush junk
+        fflush(stdout);
+        fflush(stderr);
+    }
 
     // clean up malloc'd memory

trunk/packages/vizservers/nanovis/NvLIC.cpp

@@ -23 +23 @@
 #include "NvLIC.h"
 #include <Trace.h>
+#include "global.h"
 
 NvLIC::NvLIC(int _size, int _width, int _height, float _offset, 
@@ -110 +111 @@
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
 
-    R2string path = R2FilePath::getInstance()->getPath("render_vel.cg");
-    m_render_vel_fprog = loadProgram(m_g_context, CG_PROFILE_FP30, CG_SOURCE, path);
-    m_vel_tex_param_render_vel = cgGetNamedParameter(m_render_vel_fprog, "vel_tex");
-    m_plane_normal_param_render_vel = cgGetNamedParameter(m_render_vel_fprog, "plane_normal");
+    m_render_vel_fprog = LoadCgSourceProgram(m_g_context, "render_vel.cg", 
+        CG_PROFILE_FP30, "main");
+    m_vel_tex_param_render_vel = cgGetNamedParameter(m_render_vel_fprog, 
+        "vel_tex");
+    m_plane_normal_param_render_vel = cgGetNamedParameter(m_render_vel_fprog, 
+        "plane_normal");
     m_max_param = cgGetNamedParameter(m_render_vel_fprog, "vmax");
 

trunk/packages/vizservers/nanovis/NvParticleAdvectionShader.cpp

@@ -2 +2 @@
 #include <Trace.h>
 #include "NvParticleAdvectionShader.h"
+#include <global.h>
 
 NvParticleAdvectionShader::NvParticleAdvectionShader() : 
@@ -18 +19 @@
 void NvParticleAdvectionShader::init()
 {
-    R2string path = R2FilePath::getInstance()->getPath("update_pos.cg");
-    
-    if (path.getLength() == 0)
-    {
-        Trace("%s is not found\n", (const char*) path);
-    }
-
-    _cgFP= cgCreateProgramFromFile(g_context, CG_SOURCE, path,
-        CG_PROFILE_FP30, "main", NULL);
-
-
-    cgGLLoadProgram(_cgFP);
-
+    _cgFP = LoadCgSourceProgram(g_context, "update_pos.cg", CG_PROFILE_FP30, 
+        "main");
     _posTimestepParam  = cgGetNamedParameter(_cgFP, "timestep");
     _maxParam  = cgGetNamedParameter(_cgFP, "max");

trunk/packages/vizservers/nanovis/NvParticleRenderer.cpp

@@ -80 +80 @@
       m_g_context = context;
 
-      R2string path = R2FilePath::getInstance()->getPath("update_pos.cg");
-      m_pos_fprog = loadProgram(m_g_context, CG_PROFILE_FP30, CG_SOURCE, path);
+      m_pos_fprog = LoadCgSourceProgram(m_g_context, "update_pos.cg", 
+        CG_PROFILE_FP30, NULL);
       m_pos_timestep_param  = cgGetNamedParameter(m_pos_fprog, "timestep");
       m_vel_tex_param = cgGetNamedParameter(m_pos_fprog, "vel_tex");

trunk/packages/vizservers/nanovis/NvRegularVolumeShader.cpp

@@ -1 @@
-#include <R2/R2FilePath.h>
 #include "NvRegularVolumeShader.h"
+#include <global.h>
 
 NvRegularVolumeShader::NvRegularVolumeShader()
@@ -13 +13 @@
 void NvRegularVolumeShader::init()
 {
-    R2string path = R2FilePath::getInstance()->getPath("one_volume.cg");
-    _cgFP= cgCreateProgramFromFile(g_context, CG_SOURCE, path, CG_PROFILE_FP30, "main", NULL);
-    cgGLLoadProgram(_cgFP);
-
+    _cgFP = LoadCgSourceProgram(g_context, "one_volume.cg", CG_PROFILE_FP30, 
+        "main");
     m_mvi_one_volume_param = cgGetNamedParameter(_cgFP, "modelViewInv");
     m_mv_one_volume_param = cgGetNamedParameter(_cgFP, "modelView");

trunk/packages/vizservers/nanovis/NvShader.cpp

@@ +1 @@
+#include <stdio.h>
+#include "global.h"
 #include "NvShader.h"
-#include <stdio.h>
 
 CGcontext g_context = 0;
@@ -10 +11 @@
 
 NvShader::NvShader()
+
 : _cgVP(0), _cgFP(0)
 {
@@ -22 +24 @@
     resetPrograms();
 
-    printf("[%s] loading\n", fileName);
-    _cgVP = cgCreateProgramFromFile(g_context, CG_SOURCE, fileName, CG_PROFILE_VP30,
-                            entryPoint, NULL);
-
-    cgGLLoadProgram(_cgVP);
+    _cgFP = LoadCgSourceProgram(g_context, fileName, CG_PROFILE_VP30, entryPoint);
 }
 
 void NvShader::loadFragmentProgram(const char* fileName, const char* entryPoint)
 {
-    printf("[%s] loading\n", fileName);
-    _cgFP = cgCreateProgramFromFile(g_context, CG_SOURCE, fileName, CG_PROFILE_FP30,
-                            entryPoint, NULL);
-
-    cgGLLoadProgram(_cgFP);
+    _cgFP = LoadCgSourceProgram(g_context, fileName, CG_PROFILE_FP30, entryPoint);
 }
 

trunk/packages/vizservers/nanovis/NvStdVertexShader.cpp

@@ -1 @@
-#include <R2/R2FilePath.h>
+#include <stdio.h>
+#include "global.h"
 #include "NvStdVertexShader.h"
 
@@ -13 +14 @@
 void NvStdVertexShader::init()
 {
-    R2string path = R2FilePath::getInstance()->getPath("vertex_std.cg");
-    _cgVP= cgCreateProgramFromFile(g_context, CG_SOURCE,
-                (const char*) path, CG_PROFILE_VP30, "main", NULL);
-    cgGLLoadProgram(_cgVP);
-
+    _cgVP = LoadCgSourceProgram(g_context, "vertex_std.cg", CG_PROFILE_VP30, 
+        "main");
     _mvp_vert_std_param = cgGetNamedParameter(_cgVP, "modelViewProjMatrix");
     _mvi_vert_std_param = cgGetNamedParameter(_cgVP, "modelViewInv");

trunk/packages/vizservers/nanovis/NvZincBlendeVolumeShader.cpp

@@ -1 +1 @@
 
-#include <R2/R2string.h>
-#include <R2/R2FilePath.h>
+
+#include <string.h>
+#include "global.h"
 #include "Nv.h"
 #include "NvZincBlendeVolumeShader.h"
 
-#include <string.h>
 
 NvZincBlendeVolumeShader::NvZincBlendeVolumeShader()
@@ -18 +18 @@
 void NvZincBlendeVolumeShader::init()
 {
-    R2string path = R2FilePath::getInstance()->getPath("zincblende_volume.cg");
-    _cgFP = cgCreateProgramFromFile(g_context, CG_SOURCE, 
-        (const char*) path, CG_PROFILE_FP30, "main", NULL);
-
-    cgGLLoadProgram(_cgFP);
-
+    _cgFP = LoadCgSourceProgram(g_context, "zincblende_volume.cg", 
+        CG_PROFILE_FP30, "main");
     _tfParam = cgGetNamedParameter(_cgFP, "tf");
     _volumeAParam = cgGetNamedParameter(_cgFP, "volumeA");

trunk/packages/vizservers/nanovis/PlaneRenderer.cpp

@@ -15 +15 @@
  */
 
-#include <R2/R2FilePath.h>
+#include "global.h"
 #include "PlaneRenderer.h"
 
@@ -40 +40 @@
 {
     //plane rendering shader
-    R2string path = R2FilePath::getInstance()->getPath("one_plane.cg");
-    m_fprog = loadProgram(g_context, CG_PROFILE_FP30, CG_SOURCE, path);
+    m_fprog = LoadCgSourceProgram(g_context, "one_plane.cg", CG_PROFILE_FP30, 
+        NULL);
     m_data_param = cgGetNamedParameter(m_fprog, "data");
     m_tf_param = cgGetNamedParameter(m_fprog, "tf");

trunk/packages/vizservers/nanovis/PointSetRenderer.cpp

@@ -17 +17 @@
 {
     _shader = new PointShader();
-    R2string path = R2FilePath::getInstance()->getPath("particle2.bmp");
-    if (path.getLength() == 0) {
-        printf("ERROR : pointset file not found - %s\n", (const char*) path);
+    const char *path = R2FilePath::getInstance()->getPath("particle2.bmp");
+    if (path == NULL) {
+        fprintf(stderr, "ERROR : pointset file not found - %s\n", path);
         fflush(stdout);
         return;
@@ -26 +26 @@
     ImageLoader* loader = ImageLoaderFactory::getInstance()->createLoader("bmp");
     Image* image = loader->load(path, Image::IMG_RGBA);
-
+    delete [] path;
     unsigned char* bytes = (unsigned char*) image->getImageBuffer();
     if (bytes) {

trunk/packages/vizservers/nanovis/PointShader.cpp

@@ -2 +2 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "PointShader.h"
+#include <assert.h>
 #include <R2/R2FilePath.h>
 #include <R2/R2string.h>
+#include "PointShader.h"
 
-PointShader::PointShader()
-: NvShader(), _normal(0)
+PointShader::PointShader() : 
+    NvShader(), 
+    _normal(0)
 {
-        R2string path = R2FilePath::getInstance()->getPath("pointsvp.cg");
-        if (path.getLength() == 0)
-        {
-                path = R2FilePath::getInstance()->getPath("../examples/points/pointsvp.cg");
-                if (path.getLength() == 0)
-                {
-                        printf("ERROR : file not found [%s]\n", "pointsvp.cg");
-                        exit(1);
-                }
-
-        }
-    else
-    {
-        printf("point shader loaded...\n");
-        fflush(stdout);
-    }
-
-        this->loadVertexProgram(path, "main");
-
-
-        _modelviewVP = getNamedParameterFromVP("modelview");
-        _projectionVP = getNamedParameterFromVP("projection");
-
-        _attenVP = getNamedParameterFromVP("atten");
-        _posoffsetVP = getNamedParameterFromVP("posoffset");
-        _baseposVP = getNamedParameterFromVP("basepos");
-        _scaleVP = getNamedParameterFromVP("scale");
-
-        _normalParam = getNamedParameterFromVP("normal");
+    this->loadVertexProgram("pointsvp.cg", "main");
+    _modelviewVP  = getNamedParameterFromVP("modelview");
+    _projectionVP = getNamedParameterFromVP("projection");
+    _attenVP      = getNamedParameterFromVP("atten");
+    _posoffsetVP  = getNamedParameterFromVP("posoffset");
+    _baseposVP    = getNamedParameterFromVP("basepos");
+    _scaleVP      = getNamedParameterFromVP("scale");
+    _normalParam  = getNamedParameterFromVP("normal");
 }
 
@@ -46 +27 @@
 void PointShader::setParameters()
 {
-        cgGLSetStateMatrixParameter(_modelviewVP, CG_GL_MODELVIEW_MATRIX, CG_GL_MATRIX_IDENTITY);
+    cgGLSetStateMatrixParameter(_modelviewVP, CG_GL_MODELVIEW_MATRIX, CG_GL_MATRIX_IDENTITY);
     cgGLSetStateMatrixParameter(_projectionVP, CG_GL_PROJECTION_MATRIX, CG_GL_MATRIX_IDENTITY);
         
-        cgGLSetParameter1f(_attenVP, 1.0f);
-        cgGLSetParameter4f(_posoffsetVP, 1.0f, 1.0f, 1.0f, 1.0f);
-        cgGLSetParameter4f(_baseposVP, 1.0f, 1.0f, 1.0f, 1.0f);
-        cgGLSetParameter4f(_scaleVP, 1.0f, 1.0f, 1.0f, 1.0f);
-
-        //cgGLSetTextureParameter(_normalParam,_normal->getGraphicsObjectID());
-        //cgGLEnableTextureParameter(_normalParam);
-        
+    cgGLSetParameter1f(_attenVP, 1.0f);
+    cgGLSetParameter4f(_posoffsetVP, 1.0f, 1.0f, 1.0f, 1.0f);
+    cgGLSetParameter4f(_baseposVP, 1.0f, 1.0f, 1.0f, 1.0f);
+    cgGLSetParameter4f(_scaleVP, 1.0f, 1.0f, 1.0f, 1.0f);
+    
+    //cgGLSetTextureParameter(_normalParam,_normal->getGraphicsObjectID());
+    //cgGLEnableTextureParameter(_normalParam);
+    
 }
 
 void PointShader::resetParameters()
 {
-        //cgGLDisableTextureParameter(_normalParam);
+    //cgGLDisableTextureParameter(_normalParam);
 }

trunk/packages/vizservers/nanovis/R2/include/R2/R2FilePath.h

@@ -6 +6 @@
 
 class R2FilePath {
-        typedef std::list<R2string> R2stringList;
-        typedef std::list<R2string>::iterator R2stringListIter;
-
-        /**
-         * @brief application directory
-         */
-        static R2string _curDirectory;
-
-        /**
-         * @brief R2FilePath instance
-         */
-        static R2FilePath _instance;
-
-        /**
-         * @brief all default file paths
-         */
-        R2stringList _pathList;
+    typedef std::list<R2string> R2stringList;
+    typedef std::list<R2string>::iterator R2stringListIter;
+    
+    /**
+     * @brief application directory
+     */
+    static R2string _curDirectory;
+    
+    /**
+     * @brief R2FilePath instance
+     */
+    static R2FilePath _instance;
+    
+    /**
+     * @brief all default file paths
+     */
+    R2stringList _pathList;
 public :
-        /**
-         * @brief constructor
-         */
-        R2FilePath();
-
-        /**
-         * @brief find a file whose name is fileName and return its full path
-         * @param fileName a file name 
-         * @return return full path of the file, but if not found, return ""
-         */
-        R2string getPath(const char* fileName);
-
-        /**
-         * @brief set default data paths
-         * @param filePath all default paths separated by colon(:)
-         */
-        void setPath(const R2string& filePath);
-
+    /**
+     * @brief constructor
+     */
+    R2FilePath();
+    
+    /**
+     * @brief find a file whose name is fileName and return its full path
+     * @param fileName a file name 
+     * @return return full path of the file, but if not found, return ""
+     */
+    const char *getPath(const char* fileName);
+    
+    /**
+     * @brief set default data paths
+     * @param filePath all default paths separated by colon(:)
+     */
+    bool setPath(const char *path);
+    
     /**
      *
@@ -47 +47 @@
     void setWorkingDirectory(int argc, const char** argv);
 public :
-
-        /**
-         * @brief get R2FilePath instance
-         */
-        static R2FilePath* getInstance();
-
+    
+    /**
+     * @brief get R2FilePath instance
+     */
+    static R2FilePath* getInstance();
 };
 

trunk/packages/vizservers/nanovis/R2/include/R2/R2Fonts.h

@@ -10 +10 @@
 
     struct R2FontAttributes {
-        R2string _fontName;
+        char *_fontName;
         R2int32 _textureWidth;
         R2int32 _textureHeight;

trunk/packages/vizservers/nanovis/R2/src/R2FilePath.cpp

@@ -5 +5 @@
 #include <direct.h>
 #endif
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
-#include <stdio.h>
 
 R2string R2FilePath::_curDirectory;
@@ -12 +14 @@
 
 char seps[]   = ":";
+
 R2FilePath::R2FilePath()
 {
-        char buff[255];
+    char buff[255];
 #ifdef WIN32
-        _getcwd(buff, 255);
+    _getcwd(buff, 255);
 #else
     getcwd(buff, 100);
 #endif
+    int length = strlen(buff);
+    buff[length] = '/';
+    buff[length + 1] = '\0';
 
-        int length = strlen(buff);
-        buff[length] = '/';
-        buff[length + 1] = '\0';
-
-        _curDirectory = buff;
+    _curDirectory = buff;
 
 }
 
-void R2FilePath::setPath(const R2string& filePath)
+bool 
+R2FilePath::setPath(const char *filePath)
 {
-        char buff[255];
+    char buff[255];
 
-        _pathList.clear();
+    if (filePath == NULL) {
+        return false;
+    }
+    _pathList.clear();
 
-        char *token;
-        strcpy(buff, filePath);
-        token = strtok(buff, seps );
-
+    char *p;
+    strcpy(buff, filePath);
+    for (p = strtok(buff, seps); p != NULL; p = strtok(NULL, seps)) {
         int lastIndex;
-        while( token != NULL )
-        {
-                lastIndex = strlen(token) - 1;
-                //if (token[0] == '/' || token[1] == ':')
-                if (token[0] == '/')
-                {
-                        if (token[lastIndex] == '/' || token[lastIndex] == '\\')
-                        {
-                                _pathList.push_back(R2string(token));
-                        }
-                        else 
-                        {
-                                _pathList.push_back(R2string(token) + "/");
-                        }
-                        
-                }
-                else
-                {
-                        if (token[lastIndex] == '/' || token[lastIndex] == '\\')
-                        {
-                                _pathList.push_back(_curDirectory + R2string(token));
-                        }
-                        else 
-                        {
-                                _pathList.push_back(_curDirectory + R2string(token) + "/");
-                        }
-
-                        
-                }
-                token = strtok( NULL, seps );
+        char *last;
+        struct stat buf;
+        if ((stat(p, &buf) != 0) || (!S_ISDIR(buf.st_mode))) {
+            return false;
         }
+        last = p + strlen(p) - 1;
+        if (*p == '/') {
+            if (*last == '/' || *last == '\\') {
+                _pathList.push_back(R2string(p));
+            } else {
+                _pathList.push_back(R2string(p) + "/");
+            }
+        } else {
+            if (*last == '/' || *last == '\\') {
+                _pathList.push_back(_curDirectory + R2string(p));
+            } else {
+                _pathList.push_back(_curDirectory + R2string(p) + "/");
+            }
+        }
+    }
+    return true;
 }
 
 R2FilePath* R2FilePath::getInstance()
 {
-        return &_instance;
+    return &_instance;
 }
 
-R2string R2FilePath::getPath(const char* fileName)
+const char *
+R2FilePath::getPath(const char* fileName)
 {
-        R2string path;
-        FILE* file;
+    R2string path;
 
-        R2stringListIter iter;
-        for (iter = _pathList.begin(); iter != _pathList.end(); ++iter)
-        {
-                chdir(*iter);
+    R2stringListIter iter;
+    int nameLength = strlen(fileName);
+    for (iter = _pathList.begin(); iter != _pathList.end(); ++iter) {
+        char *path;
 
-                if ((file = fopen(fileName, "rb")) != NULL)
-                {
-                        fclose(file);
-                        
-                        path = (*iter) + fileName;
-
-                        break;
-                }
-                
+        path = new char[strlen((char *)(*iter)) + 1 + nameLength + 1];
+        sprintf(path, "%s/%s", (char *)(*iter), fileName);
+        if (access(path, R_OK) == 0) {
+            return path;
         }
-
-        chdir(_curDirectory);
-
-        return path;
+        delete [] path;
+    }
+    return NULL;
 }
 
-void R2FilePath::setWorkingDirectory(int argc, const char** argv)
+void 
+R2FilePath::setWorkingDirectory(int argc, const char** argv)
 {
     char buff[255];
+
     strcpy(buff, argv[0]);
-    for (int i = strlen(buff) - 1; i >= 0; --i)
-    {
-        if (buff[i] == '\\' || buff[i] == '/')
-        {
-            buff[i] = '/'; 
-            buff[i + 1] = '\0'; 
-            break;
-        }
+    for (int i = strlen(buff) - 1; i >= 0; --i) {
+        if (buff[i] == '\\' || buff[i] == '/') {
+            buff[i] = '/'; 
+            buff[i + 1] = '\0'; 
+            break;
+        }
     }
-
-        _curDirectory = buff;
+    _curDirectory = buff;
 }
 

trunk/packages/vizservers/nanovis/R2/src/R2Fonts.cpp

@@ -25 +25 @@
 R2Fonts::setFont(const char* fontName)
 {
-    for (unsigned index = 0; index < _fonts.size(); ++index) {
-        if (_fonts[index]._fontName == fontName) {
-            _fontIndex = index;
-            break;
-        }
+    if (fontName != NULL) {
+        unsigned int i;
+        for (i = 0; i < _fonts.size(); ++i) {
+            if (strcmp(_fonts[i]._fontName, fontName) == 0) {
+                _fontIndex = i;
+                break;
+            }
+        }
     }
 }
@@ -134 +137 @@
 {
     R2bool bSuccess = false;
-    R2string path = R2FilePath::getInstance()->getPath(fontFileName);
-    
-    std::ifstream fsInput((const char*) path, std::ios::binary);
+
+    const char *path = R2FilePath::getInstance()->getPath(fontFileName);
+    if (path == NULL) {
+        return false;
+    }
+    std::ifstream fsInput(path, std::ios::binary);
     if (fsInput) {
-        sFont._fontName = fontName;
-        
+        sFont._fontName = new char [strlen(fontName)+1];
+        strcpy(sFont._fontName, fontName);
+
         // make sure this file is the correct type by checking the header
         unsigned int uiFileId = 0;
@@ -219 +226 @@
         fsInput.close( );
     }
-
+    delete [] path;
     return bSuccess;
 }

trunk/packages/vizservers/nanovis/VolumeInterpolator.cpp

@@ -146 +146 @@
                              volume->n_components, 
                              volume->_data, 
-                             volume->wAxis.Min(), 
-                             volume->wAxis.Max(), 
+                             volume->wAxis.min(), 
+                             volume->wAxis.max(), 
                              volume->nonzero_min);
         _referenceOfVolume = volumeId;

trunk/packages/vizservers/nanovis/VolumeRenderer.cpp

@@ -37 +37 @@
     init_shaders();
 
-    R2string path = R2FilePath::getInstance()->getPath("Font.bmp");
-    init_font((const char*) path);
-
+    const char *path = R2FilePath::getInstance()->getPath("Font.bmp");
+    if (path == NULL) {
+        fprintf(stderr, "can't find Font.bmp\n");
+        assert(path != NULL);
+    }
+    init_font(path);
+    delete [] path;
     _volumeInterpolator = new VolumeInterpolator();
 }

trunk/packages/vizservers/nanovis/global.h

@@ -40 +40 @@
 
 
-inline CGprogram 
-loadProgram(CGcontext context, CGprofile profile, CGenum program_type, 
-            char *filename)
-{
-    CGprogram program = cgCreateProgramFromFile(context, program_type, filename, 
-                                                profile, NULL, NULL);
-    cgGLLoadProgram(program);
-    return program;
-}
-
 inline void 
 draw_quad(int w, int h, int tw, int th)
@@ -74 +64 @@
             "-----------------------------------------------------------\n");
 }
+
+extern CGprogram LoadCgSourceProgram(CGcontext context, const char *filename, 
+        CGprofile profile, const char *entryPoint);
+
 #endif

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -23 +23 @@
 #include <sstream>
 #include <string>
+#include <memory.h>
 #include <time.h>
 #include <sys/time.h>
@@ -100 +101 @@
 NvLIC* NanoVis::licRenderer = 0;
 
+FILE *NanoVis::stdin = NULL;
+FILE *NanoVis::logfile = NULL;
+
 bool NanoVis::lic_on = false;
 bool NanoVis::particle_on = false;
@@ -122 +126 @@
 float color_table[256][4];
 
+int debug_flag = false;
 /*
 #ifdef XINETD
@@ -274 +279 @@
 }
 
+
+CGprogram 
+LoadCgSourceProgram(CGcontext context, const char *fileName, CGprofile profile, 
+                    const char *entryPoint)
+{
+    const char *path = R2FilePath::getInstance()->getPath(fileName);
+    if (path == NULL) {
+        fprintf(stderr, "can't find program \"%s\"\n", fileName);
+        assert(path != NULL);
+    }
+    CGprogram program;
+    program = cgCreateProgramFromFile(context, CG_SOURCE, path, profile, 
+        entryPoint, NULL);
+    delete [] path;
+    cgGLLoadProgram(program);
+    return program;
+}
 
 /* Load a 3D volume
@@ -621 +643 @@
     fprintf(stderr, "Graphics hardware: %s\n", glGetString(GL_RENDERER));
     fprintf(stderr, "-----------------------------------------------------------\n");
-
+    if (path == NULL) {
+        fprintf(stderr, "no path defined for shaders or resources\n");
+        fflush(stderr);
+        exit(1);
+    }
     // init GLEW
     GLenum err = glewInit();
@@ -632 +658 @@
     fprintf(stdout, "Status: Using GLEW %s\n", glewGetString(GLEW_VERSION));
 
-    if (path)
-    {
-        R2FilePath::getInstance()->setPath(path);
+    if (!R2FilePath::getInstance()->setPath(path)) {
+        fprintf(stderr, "can't set file path to %s\n", path);
+        fflush(stderr);
+        exit(1);
     }
 
@@ -1447 +1474 @@
             continue;
         }
-        if (xMin > volPtr->xAxis.Min()) {
-            xMin = volPtr->xAxis.Min();
-        }
-        if (xMax < volPtr->xAxis.Max()) {
-            xMax = volPtr->xAxis.Max();
-        }
-        if (yMin > volPtr->yAxis.Min()) {
-            yMin = volPtr->yAxis.Min();
-        }
-        if (yMax < volPtr->yAxis.Max()) {
-            yMax = volPtr->yAxis.Max();
-        }
-        if (zMin > volPtr->zAxis.Min()) {
-            zMin = volPtr->zAxis.Min();
-        }
-        if (zMax < volPtr->zAxis.Max()) {
-            zMax = volPtr->zAxis.Max();
-        }
-        if (wMin > volPtr->wAxis.Min()) {
-            wMin = volPtr->wAxis.Min();
-        }
-        if (wMax < volPtr->wAxis.Max()) {
-            wMax = volPtr->wAxis.Max();
+        if (xMin > volPtr->xAxis.min()) {
+            xMin = volPtr->xAxis.min();
+        }
+        if (xMax < volPtr->xAxis.max()) {
+            xMax = volPtr->xAxis.max();
+        }
+        if (yMin > volPtr->yAxis.min()) {
+            yMin = volPtr->yAxis.min();
+        }
+        if (yMax < volPtr->yAxis.max()) {
+            yMax = volPtr->yAxis.max();
+        }
+        if (zMin > volPtr->zAxis.min()) {
+            zMin = volPtr->zAxis.min();
+        }
+        if (zMax < volPtr->zAxis.max()) {
+            zMax = volPtr->zAxis.max();
+        }
+        if (wMin > volPtr->wAxis.min()) {
+            wMin = volPtr->wAxis.min();
+        }
+        if (wMax < volPtr->wAxis.max()) {
+            wMax = volPtr->wAxis.max();
         }
     }
@@ -1502 +1529 @@
             continue;
         }
-        if (xMin > hmPtr->xAxis.Min()) {
-            xMin = hmPtr->xAxis.Min();
-        }
-        if (xMax < hmPtr->xAxis.Max()) {
-            xMax = hmPtr->xAxis.Max();
-        }
-        if (yMin > hmPtr->yAxis.Min()) {
-            yMin = hmPtr->yAxis.Min();
-        }
-        if (yMax < hmPtr->yAxis.Max()) {
-            yMax = hmPtr->yAxis.Max();
-        }
-        if (zMin > hmPtr->zAxis.Min()) {
-            zMin = hmPtr->zAxis.Min();
-        }
-        if (zMax < hmPtr->zAxis.Max()) {
-            zMax = hmPtr->zAxis.Max();
-        }
-        if (wMin > hmPtr->wAxis.Min()) {
-            wMin = hmPtr->wAxis.Min();
-        }
-        if (wMax < hmPtr->wAxis.Max()) {
-            wMax = hmPtr->wAxis.Max();
+        if (xMin > hmPtr->xAxis.min()) {
+            xMin = hmPtr->xAxis.min();
+        }
+        if (xMax < hmPtr->xAxis.max()) {
+            xMax = hmPtr->xAxis.max();
+        }
+        if (yMin > hmPtr->yAxis.min()) {
+            yMin = hmPtr->yAxis.min();
+        }
+        if (yMax < hmPtr->yAxis.max()) {
+            yMax = hmPtr->yAxis.max();
+        }
+        if (zMin > hmPtr->zAxis.min()) {
+            zMin = hmPtr->zAxis.min();
+        }
+        if (zMax < hmPtr->zAxis.max()) {
+            zMax = hmPtr->zAxis.max();
+        }
+        if (wMin > hmPtr->wAxis.min()) {
+            wMin = hmPtr->wAxis.min();
+        }
+        if (wMax < hmPtr->wAxis.max()) {
+            wMax = hmPtr->wAxis.max();
         }
     }
@@ -1537 +1564 @@
     }
     if ((wMin < DBL_MAX) && (wMax > -DBL_MAX)) {
-        HeightMap::valueMin = wMin;
-        HeightMap::valueMax = wMax;
+        HeightMap::valueMin = grid->yAxis.min();
+        HeightMap::valueMax = grid->yAxis.max();
+    }
+    for (unsigned int i = 0; i < heightMap.size(); i++) {
+        HeightMap *hmPtr;
+
+        hmPtr = heightMap[i];
+        if (hmPtr == NULL) {
+            continue;
+        }
+        hmPtr->MapToGrid(grid);
     }
     HeightMap::update_pending = false;
@@ -1834 +1870 @@
 init_service()
 {
-    //open log and map stderr to log file
-    xinetd_log = fopen("/tmp/log.txt", "w");
-    close(2);
-    dup2(fileno(xinetd_log), 2);
-    dup2(2,1);
-
+    if (!debug_flag) {
+        //open log and map stderr to log file
+        xinetd_log = fopen("/tmp/log.txt", "w");
+        close(2);
+        dup2(fileno(xinetd_log), 2);
+        dup2(2,1);
+    }
     //flush junk
     fflush(stdout);
@@ -1893 +1930 @@
 main(int argc, char** argv)
 {
-    char *path;
+    const char *path;
+    char *newPath;
+
+    newPath = NULL;
     path = NULL;
-    while(1) {
-        int c;
-        int option_index = 0;
-        struct option long_options[] = {
-            // name, has_arg, flag, val
-            { 0,0,0,0 },
-        };
-
-        c = getopt_long(argc, argv, "+p:", long_options, &option_index);
+    NanoVis::stdin = stdin;
+    NanoVis::logfile = stderr;
+    opterr = 1;
+    while (1) {
+        static struct option long_options[] = {
+            {"infile",  required_argument, NULL,           0},
+            {"logfile", required_argument, NULL,           1},
+            {"path",    required_argument, NULL,           2},
+            {"debug",   no_argument,       NULL,           3},
+            {0, 0, 0, 0}
+        };
+        int option_index = 0;
+        int c;
+
+        c = getopt_long(argc, argv, ":dp:i:l:", long_options, &option_index);
         if (c == -1) {
             break;
         }
-        switch(c) {
-        case 'p':
+        switch (c) {
+        case '?':
+            fprintf(stderr, "unknown option -%c\n", optopt);
+            return 1;
+        case ':':
+            if (optopt < 4) {
+                fprintf(stderr, "argument missing for --%s option\n", 
+                    long_options[optopt].name);
+            } else {
+                fprintf(stderr, "argument missing for -%c option\n", optopt);
+            }
+            return 1;
+        case 2:
+        case 'p':
             path = optarg;
-            break;
-        default:
-            fprintf(stderr,"Don't know what option '%c'.\n", c);
+            break;
+        case 3:
+        case 'd':
+            debug_flag = true;
+            break;
+        case 0:
+        case 'i':
+            fprintf(stderr, "opening infile %s\n", optarg);
+            NanoVis::stdin = fopen(optarg, "r");
+            if (NanoVis::stdin == NULL) {
+                perror(optarg);
+                return 2;
+            }
+            break;
+        case 1:
+        case 'l':
+            fprintf(stderr, "opening logfile %s\n", optarg);
+            NanoVis::logfile = fopen(optarg, "w");
+            if (NanoVis::logfile == NULL) {
+                perror(optarg);
+                return 2;
+            }
+            break;
+        default:
+            fprintf(stderr,"unknown option '%c'.\n", c);
             return 1;
         }
-    }
-
+    }     
+    if (path == NULL) {
+        char *p;
+
+        // See if we can derive the path from the location of the program.
+        // Assume program is in the form <path>/bin/nanovis.
+
+        path = argv[0];
+        p = strrchr(path, '/');
+        if (p != NULL) {
+            *p = '\0';
+            p = strrchr(path, '/');
+        }
+        if (p == NULL) {
+            fprintf(stderr, "path not specified\n");
+            return 1;
+        }
+        *p = '\0';
+        newPath = new char[(strlen(path) + 15) * 2 + 1];
+        sprintf(newPath, "%s/lib/shaders:%s/lib/resources", path, path);
+        path = newPath;
+    }
     R2FilePath::getInstance()->setWorkingDirectory(argc, (const char**) argv);
 
@@ -1943 +2043 @@
 
     NanoVis::init(path);
+    if (newPath != NULL) {
+        delete [] newPath;
+    }
     NanoVis::initGL();
     initTcl();
@@ -1955 +2058 @@
 
     NvExit();
-
     return 0;
 }

trunk/packages/vizservers/nanovis/nanovis.h

@@ -172 +172 @@
 #endif
 
+    static FILE *stdin, *logfile;
+
     static void read_screen(void) {
         glReadPixels(0, 0, win_width, win_height, GL_RGB, GL_UNSIGNED_BYTE, 
@@ -181 +183 @@
 };
 
+
 #endif  /* __NANOVIS_H__ */

trunk/packages/vizservers/pymolproxy/pymolproxy.c

@@ -825 +825 @@
 
 static int
-LoadPDBStrCmd(ClientData cdata, Tcl_Interp *interp, int argc, 
+LoadPDB2Cmd(ClientData cdata, Tcl_Interp *interp, int argc, 
               const char *argv[])
 {
-    const char *pdbdata, *pdb, *name;
-    char *buf;
-    char buffer[800];
-    struct pymol_proxy *pymol = (struct pymol_proxy *) cdata;
+    const char *pdbdata, *name;
+    PymolProxy *pymol = (PymolProxy *) cdata;
     int state = 1;
     int tmpf;
@@ -841 +839 @@
     
     clear_error(pymol);
-    
+    pdbdata = name = NULL;      /* Suppress compiler warning. */
     for(arg = 1; arg < argc; arg++) {
         if ( strcmp(argv[arg],"-defer") == 0 )
@@ -850 +848 @@
             pdbdata = argv[arg];
             varg++;
-        }
-        else if (varg == 2) {
+        } else if (varg == 2) {
             name = argv[arg];
             varg++;
-        }
-        else if (varg == 3) {
+        } else if (varg == 3) {
             state = atoi( argv[arg] );
             varg++;
@@ -874 +870 @@
     sendf(pymol, "load %s, %s, %d\n", filename, name, state);
     sendf(pymol, "zoom buffer=2\n");
-    
+    /* Can't clean up the temporary file, since we don't when pymol will be
+     * done reading it. */
     return(pymol->status);
 }
@@ -959 +956 @@
     clear_error(pymol);
 
-    for(arg = 1; arg < argc; arg++)
-        {
-            if (strcmp(argv[arg],"-defer") == 0)
-                defer = 1;
-            else if (strcmp(argv[arg],"-push") == 0)
-                push = 1;
-            else  if (varg == 1) {
-                turnx = atof(argv[arg]);
-                varg++;
-            }
-            else if (varg == 2) {
-                turny = atof(argv[arg]);
-                varg++;
-            }
-            else if (varg == 3) {
-                turnz = atof(argv[arg]);
-                varg++;
-            }
-        } 
- 
+    for(arg = 1; arg < argc; arg++) {
+        if (strcmp(argv[arg],"-defer") == 0) {
+            defer = 1; 
+        } else if (strcmp(argv[arg],"-push") == 0) {
+            push = 1;
+        } else  if (varg == 1) {
+            turnx = atof(argv[arg]);
+            varg++;
+        } else if (varg == 2) {
+            turny = atof(argv[arg]);
+            varg++;
+        } else if (varg == 3) {
+            turnz = atof(argv[arg]);
+            varg++;
+        }
+    } 
     pymol->need_update = !defer || push;
     pymol->immediate_update  |= push;
@@ -1005 +998 @@
     clear_error(pymol);
 
-    for(arg = 1; arg < argc; arg++)
-        {
-            if (strcmp(argv[arg],"-defer") == 0)
-                defer = 1;
-            else if (strcmp(argv[arg],"-push") == 0)
-                push = 1;
-            else if (varg == 1) {
-                factor = atof(argv[arg]);
-                varg++;
-            }
-        }
-
+    for(arg = 1; arg < argc; arg++) {
+        if (strcmp(argv[arg],"-defer") == 0)
+            defer = 1;
+        else if (strcmp(argv[arg],"-push") == 0)
+            push = 1;
+        else if (varg == 1) {
+            factor = atof(argv[arg]);
+            varg++;
+        }
+    }
     zmove = factor * -75;
  
@@ -1224 +1215 @@
     Tcl_CreateCommand(interp, "zoom",    ZoomCmd,       &pymol, NULL);
     Tcl_CreateCommand(interp, "loadpdb", LoadPDBCmd,    &pymol, NULL);
+    Tcl_CreateCommand(interp, "loadpdb2", LoadPDB2Cmd,  &pymol, NULL);
     Tcl_CreateCommand(interp, "ballnstick",BallNStickCmd, &pymol, NULL);
     Tcl_CreateCommand(interp, "spheres", SpheresCmd,    &pymol, NULL);

trunk/packages/vizservers/start_viz.sh.in

@@ -4 +4 @@
 export DISPLAY
 
-install_dir=@prefix@
-nanoscalePort=2000
-nanovisPort=2000
-pymolPort=2020
+broadcast="192.168.200.255"
+install_dir="@prefix@"
+nanoscale_port=2000
+nanovis_port=2000
+pymol_port=2020
 
 dir=$( mktemp -d /tmp/nanorun.XXXXXX )
@@ -16 +17 @@
 export PATH LD_LIBRARY_PATH PYMOL_PATH
 
+nanoscale="${dir}/bin/nanoscale -b $nanoscale_port -s $broadcast"
+nanovis="${dir}/bin/nanovis -p ${dir}/lib/shaders:${dir}/lib/resources"
+pymolproxy="${dir}/bin/pymolproxy ${dir}/bin/pymol -p -q -i -x -X 0 -Y 0"
+
 cp -r ${install_dir}/* ${dir}
 
@@ -23 +28 @@
 ulimit -t $(expr ${minutes} \* 60 )
 
-#${dir}/bin/nanoscale -d -b ${nanoscalePort} -s 192.168.200.255 -l ${nanovisPort} -c "${dir}/bin/nanovis -p ${dir}/lib/shaders:${dir}/lib/resources"
-#${dir}/bin/nanoscale -d -b ${nanoscalePort} -s 192.168.200.255 -l ${pymolPort} -c "${dir}/bin/pymolproxy ${dir}/bin/pymol -p -q -i -x -X 0 -Y 0"
-${dir}/bin/nanoscale -b ${nanoscalePort} -s 192.168.200.255 -l ${nanovisPort} -c "${dir}/bin/nanovis -p ${dir}/lib/shaders:${dir}/lib/resources" -l ${pymolPort} -c "${dir}/bin/pymolproxy ${dir}/bin/pymol -p -q -i -x -X 0 -Y 0"
+#$nanoscale -d -l $nanovis_port -c $nanovis
+#$nanoscale -d -l $pymol_port -c $pymolproxy
+
+#echo "$nanoscale -l $nanovis_port -c \"$nanovis\" -l $pymol_port -c \"$pymolproxy\""
+#$nanoscale -l $nanovis_port -c "$nanovis" -l $pymol_port -c "$pymolproxy"
+
+echo "$nanoscale -l $nanovis_port -c \"$nanovis\""
+$nanoscale -l $nanovis_port -c "$nanovis"