Changeset 4530


Ignore:
Timestamp:
Jul 17, 2014 2:57:21 AM (6 years ago)
Author:
ldelgass
Message:

Merge r4024,4049,4051-4052,4060 from trunk

Location:
branches/1.3
Files:
1 deleted
9 edited
3 copied

Legend:

Unmodified
Added
Removed
  • branches/1.3

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

    r4467 r4530  
    1919
    2020SUBDIRS         = @SUBDIRS@
    21 VTK_LIB_DIR     = @VTK_LIB_DIR@
    22 
    23 SUBDIRS         = nanoscale pymolproxy
    24 
    25 ifneq ($(VTK_LIB_DIR),)
    26   SUBDIRS += vtkvis
    27 endif
    2821
    2922.PHONY: all install clean distclean $(SUBDIRS)
    30 
    31 FILES           = \
    32                 start_viz.sh
    3323
    3424all: $(SUBDIRS)
     
    4232          $(MAKE) -C $$i install || exit 1 ; \
    4333        done
    44         $(INSTALL) -m 0555 start_viz.sh $(bindir)/start_viz.sh
    4534        $(INSTALL) -m 0555 start_nanoscale.sh $(bindir)/start_nanoscale.sh
    4635
     
    5544        done
    5645        $(RM) -r autom4te.cache
    57         $(RM) Makefile config.cache config.log config.status start_viz.sh start_nanoscale.sh *~
     46        $(RM) Makefile config.cache config.log config.status start_nanoscale.sh *~
  • branches/1.3/packages/vizservers/configure

    r4467 r4530  
    624624ac_subst_vars='LTLIBOBJS
    625625LIBOBJS
    626 VTK_LIB_DIR
    627 VTK_INC_SPEC
    628 VERSION
    629626TCL_VERSION
    630627TCL_LIB_SPEC
     
    632629SUBDIRS
    633630STATSDIR
    634 SIZEOF_VOID_P
    635 SIZEOF_LONG_LONG
    636 SIZEOF_LONG
    637 SIZEOF_INT
    638 SIZEOF_FLOAT
    639 SHLIB_LDFLAGS
    640 RP_LIB_DIR
    641 RP_INC_SPEC
    642 RP_DIR
     631LOGDIR
    643632LD_RPATH
    644633CXXCPP
     
    729718enable_option_checking
    730719with_tcllib
    731 with_rappture
    732 with_vtk_includes
    733 with_vtk_libs
    734 with_vtk
     720with_statsdir
     721with_logdir
    735722with_python
    736 with_statsdir
    737723enable_64bit
    738724enable_64bit_vis
     
    13781364  --with-tcllib=DIR       location of Tcl binary library libtclstubs.a
    13791365                          [default=/usr/lib]
    1380   --with-rappture=DIR     location of rappture files lib/librappture.a and
    1381                           include/rappture.h [default=/usr]
    1382   --with-vtk-includes=DIR VTK include files are in DIR
    1383   --with-vtk-libs=DIR     VTK libraries are in DIR
    1384   --with-vtk=VERSION      Version of VTK required
     1366  --with-statsdir=DIR     Write statistics in DIR
     1367  --with-logdir=DIR       Write log files in DIR
    13851368  --with-python=DIR       location of python [default=yes]
    1386   --with-statsdir=DIR     Write statics in DIR
    13871369  --with-x                use the X Window System
    13881370
     
    18821864
    18831865} # ac_fn_cxx_try_run
    1884 
    1885 # ac_fn_cxx_compute_int LINENO EXPR VAR INCLUDES
    1886 # ----------------------------------------------
    1887 # Tries to find the compile-time value of EXPR in a program that includes
    1888 # INCLUDES, setting VAR accordingly. Returns whether the value could be
    1889 # computed
    1890 ac_fn_cxx_compute_int ()
    1891 {
    1892   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    1893   if test "$cross_compiling" = yes; then
    1894     # Depending upon the size, compute the lo and hi bounds.
    1895 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1896 /* end confdefs.h.  */
    1897 $4
    1898 int
    1899 main ()
    1900 {
    1901 static int test_array [1 - 2 * !(($2) >= 0)];
    1902 test_array [0] = 0;
    1903 return test_array [0];
    1904 
    1905   ;
    1906   return 0;
    1907 }
    1908 _ACEOF
    1909 if ac_fn_cxx_try_compile "$LINENO"; then :
    1910   ac_lo=0 ac_mid=0
    1911   while :; do
    1912     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1913 /* end confdefs.h.  */
    1914 $4
    1915 int
    1916 main ()
    1917 {
    1918 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
    1919 test_array [0] = 0;
    1920 return test_array [0];
    1921 
    1922   ;
    1923   return 0;
    1924 }
    1925 _ACEOF
    1926 if ac_fn_cxx_try_compile "$LINENO"; then :
    1927   ac_hi=$ac_mid; break
    1928 else
    1929   as_fn_arith $ac_mid + 1 && ac_lo=$as_val
    1930                         if test $ac_lo -le $ac_mid; then
    1931                           ac_lo= ac_hi=
    1932                           break
    1933                         fi
    1934                         as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
    1935 fi
    1936 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    1937   done
    1938 else
    1939   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1940 /* end confdefs.h.  */
    1941 $4
    1942 int
    1943 main ()
    1944 {
    1945 static int test_array [1 - 2 * !(($2) < 0)];
    1946 test_array [0] = 0;
    1947 return test_array [0];
    1948 
    1949   ;
    1950   return 0;
    1951 }
    1952 _ACEOF
    1953 if ac_fn_cxx_try_compile "$LINENO"; then :
    1954   ac_hi=-1 ac_mid=-1
    1955   while :; do
    1956     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1957 /* end confdefs.h.  */
    1958 $4
    1959 int
    1960 main ()
    1961 {
    1962 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
    1963 test_array [0] = 0;
    1964 return test_array [0];
    1965 
    1966   ;
    1967   return 0;
    1968 }
    1969 _ACEOF
    1970 if ac_fn_cxx_try_compile "$LINENO"; then :
    1971   ac_lo=$ac_mid; break
    1972 else
    1973   as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
    1974                         if test $ac_mid -le $ac_hi; then
    1975                           ac_lo= ac_hi=
    1976                           break
    1977                         fi
    1978                         as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
    1979 fi
    1980 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    1981   done
    1982 else
    1983   ac_lo= ac_hi=
    1984 fi
    1985 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    1986 fi
    1987 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    1988 # Binary search between lo and hi bounds.
    1989 while test "x$ac_lo" != "x$ac_hi"; do
    1990   as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
    1991   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1992 /* end confdefs.h.  */
    1993 $4
    1994 int
    1995 main ()
    1996 {
    1997 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
    1998 test_array [0] = 0;
    1999 return test_array [0];
    2000 
    2001   ;
    2002   return 0;
    2003 }
    2004 _ACEOF
    2005 if ac_fn_cxx_try_compile "$LINENO"; then :
    2006   ac_hi=$ac_mid
    2007 else
    2008   as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
    2009 fi
    2010 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    2011 done
    2012 case $ac_lo in #((
    2013 ?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
    2014 '') ac_retval=1 ;;
    2015 esac
    2016   else
    2017     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    2018 /* end confdefs.h.  */
    2019 $4
    2020 static long int longval () { return $2; }
    2021 static unsigned long int ulongval () { return $2; }
    2022 #include <stdio.h>
    2023 #include <stdlib.h>
    2024 int
    2025 main ()
    2026 {
    2027 
    2028   FILE *f = fopen ("conftest.val", "w");
    2029   if (! f)
    2030     return 1;
    2031   if (($2) < 0)
    2032     {
    2033       long int i = longval ();
    2034       if (i != ($2))
    2035         return 1;
    2036       fprintf (f, "%ld", i);
    2037     }
    2038   else
    2039     {
    2040       unsigned long int i = ulongval ();
    2041       if (i != ($2))
    2042         return 1;
    2043       fprintf (f, "%lu", i);
    2044     }
    2045   /* Do not output a trailing newline, as this causes \r\n confusion
    2046      on some platforms.  */
    2047   return ferror (f) || fclose (f) != 0;
    2048 
    2049   ;
    2050   return 0;
    2051 }
    2052 _ACEOF
    2053 if ac_fn_cxx_try_run "$LINENO"; then :
    2054   echo >>conftest.val; read $3 <conftest.val; ac_retval=0
    2055 else
    2056   ac_retval=1
    2057 fi
    2058 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
    2059   conftest.$ac_objext conftest.beam conftest.$ac_ext
    2060 rm -f conftest.val
    2061 
    2062   fi
    2063   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    2064   as_fn_set_status $ac_retval
    2065 
    2066 } # ac_fn_cxx_compute_int
    20671866
    20681867# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
     
    26502449
    26512450
    2652 ac_config_headers="$ac_config_headers nanovis/nvconf.h nanoscale/config.h"
     2451ac_config_headers="$ac_config_headers nanoscale/config.h"
    26532452
    26542453
     
    26632462
    26642463
    2665 # Check whether --with-rappture was given.
    2666 if test "${with_rappture+set}" = set; then :
    2667   withval=$with_rappture; with_rappture=$withval
    2668 else
    2669   with_rappture=yes
    2670 fi
    2671 
    2672 
    2673 
    2674 # Check whether --with-vtk-includes was given.
    2675 if test "${with_vtk_includes+set}" = set; then :
    2676   withval=$with_vtk_includes; with_vtk_includes=$withval
    2677 else
    2678   with_vtk_includes=""
    2679 fi
    2680 
    2681 
    2682 
    2683 # Check whether --with-vtk-libs was given.
    2684 if test "${with_vtk_libs+set}" = set; then :
    2685   withval=$with_vtk_libs; with_vtk_libs=$withval
    2686 else
    2687   with_vtk_libs=""
    2688 fi
    2689 
    2690 
    2691 
    2692 # Check whether --with-vtk was given.
    2693 if test "${with_vtk+set}" = set; then :
    2694   withval=$with_vtk; with_vtk=$withval
    2695 else
    2696   with_vtk=yes
     2464# Check whether --with-statsdir was given.
     2465if test "${with_statsdir+set}" = set; then :
     2466  withval=$with_statsdir; STATSDIR=$withval
     2467else
     2468  STATSDIR="/var/tmp/visservers"
     2469fi
     2470
     2471
     2472
     2473# Check whether --with-logdir was given.
     2474if test "${with_logdir+set}" = set; then :
     2475  withval=$with_logdir; LOGDIR=$withval
     2476else
     2477  LOGDIR="/tmp"
    26972478fi
    26982479
     
    40563837fi
    40573838
    4058 
    4059 
    4060 # Check whether --with-statsdir was given.
    4061 if test "${with_statsdir+set}" = set; then :
    4062   withval=$with_statsdir; STATSDIR=$withval
    4063 else
    4064   STATSDIR="/var/tmp/visservers"
    4065 fi
    4066 
    4067 
    4068 VERSION=0.0.1
    40693839
    40703840#------------------------------------------------------------------------
     
    59965766
    59975767
    5998 
    59995768{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
    60005769$as_echo_n "checking for X... " >&6; }
     
    79857754 esac
    79867755
    7987 # The cast to long int works around a bug in the HP C Compiler
    7988 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    7989 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    7990 # This bug is HP SR number 8606223364.
    7991 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
    7992 $as_echo_n "checking size of int... " >&6; }
    7993 if ${ac_cv_sizeof_int+:} false; then :
    7994   $as_echo_n "(cached) " >&6
    7995 else
    7996   if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
    7997 
    7998 else
    7999   if test "$ac_cv_type_int" = yes; then
    8000      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    8001 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    8002 as_fn_error 77 "cannot compute sizeof (int)
    8003 See \`config.log' for more details" "$LINENO" 5; }
    8004    else
    8005      ac_cv_sizeof_int=0
    8006    fi
    8007 fi
    8008 
    8009 fi
    8010 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
    8011 $as_echo "$ac_cv_sizeof_int" >&6; }
    8012 
    8013 
    8014 
    8015 cat >>confdefs.h <<_ACEOF
    8016 #define SIZEOF_INT $ac_cv_sizeof_int
    8017 _ACEOF
    8018 
    8019 
    8020 # The cast to long int works around a bug in the HP C Compiler
    8021 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    8022 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    8023 # This bug is HP SR number 8606223364.
    8024 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
    8025 $as_echo_n "checking size of long... " >&6; }
    8026 if ${ac_cv_sizeof_long+:} false; then :
    8027   $as_echo_n "(cached) " >&6
    8028 else
    8029   if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
    8030 
    8031 else
    8032   if test "$ac_cv_type_long" = yes; then
    8033      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    8034 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    8035 as_fn_error 77 "cannot compute sizeof (long)
    8036 See \`config.log' for more details" "$LINENO" 5; }
    8037    else
    8038      ac_cv_sizeof_long=0
    8039    fi
    8040 fi
    8041 
    8042 fi
    8043 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
    8044 $as_echo "$ac_cv_sizeof_long" >&6; }
    8045 
    8046 
    8047 
    8048 cat >>confdefs.h <<_ACEOF
    8049 #define SIZEOF_LONG $ac_cv_sizeof_long
    8050 _ACEOF
    8051 
    8052 
    8053 # The cast to long int works around a bug in the HP C Compiler
    8054 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    8055 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    8056 # This bug is HP SR number 8606223364.
    8057 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
    8058 $as_echo_n "checking size of long long... " >&6; }
    8059 if ${ac_cv_sizeof_long_long+:} false; then :
    8060   $as_echo_n "(cached) " >&6
    8061 else
    8062   if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
    8063 
    8064 else
    8065   if test "$ac_cv_type_long_long" = yes; then
    8066      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    8067 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    8068 as_fn_error 77 "cannot compute sizeof (long long)
    8069 See \`config.log' for more details" "$LINENO" 5; }
    8070    else
    8071      ac_cv_sizeof_long_long=0
    8072    fi
    8073 fi
    8074 
    8075 fi
    8076 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
    8077 $as_echo "$ac_cv_sizeof_long_long" >&6; }
    8078 
    8079 
    8080 
    8081 cat >>confdefs.h <<_ACEOF
    8082 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
    8083 _ACEOF
    8084 
    8085 
    8086 # The cast to long int works around a bug in the HP C Compiler
    8087 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    8088 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    8089 # This bug is HP SR number 8606223364.
    8090 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
    8091 $as_echo_n "checking size of void *... " >&6; }
    8092 if ${ac_cv_sizeof_void_p+:} false; then :
    8093   $as_echo_n "(cached) " >&6
    8094 else
    8095   if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
    8096 
    8097 else
    8098   if test "$ac_cv_type_void_p" = yes; then
    8099      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    8100 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    8101 as_fn_error 77 "cannot compute sizeof (void *)
    8102 See \`config.log' for more details" "$LINENO" 5; }
    8103    else
    8104      ac_cv_sizeof_void_p=0
    8105    fi
    8106 fi
    8107 
    8108 fi
    8109 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
    8110 $as_echo "$ac_cv_sizeof_void_p" >&6; }
    8111 
    8112 
    8113 
    8114 cat >>confdefs.h <<_ACEOF
    8115 #define SIZEOF_VOID_P $ac_cv_sizeof_void_p
    8116 _ACEOF
    8117 
    8118 
    8119 # The cast to long int works around a bug in the HP C Compiler
    8120 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    8121 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    8122 # This bug is HP SR number 8606223364.
    8123 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float" >&5
    8124 $as_echo_n "checking size of float... " >&6; }
    8125 if ${ac_cv_sizeof_float+:} false; then :
    8126   $as_echo_n "(cached) " >&6
    8127 else
    8128   if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float"        "$ac_includes_default"; then :
    8129 
    8130 else
    8131   if test "$ac_cv_type_float" = yes; then
    8132      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    8133 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    8134 as_fn_error 77 "cannot compute sizeof (float)
    8135 See \`config.log' for more details" "$LINENO" 5; }
    8136    else
    8137      ac_cv_sizeof_float=0
    8138    fi
    8139 fi
    8140 
    8141 fi
    8142 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_float" >&5
    8143 $as_echo "$ac_cv_sizeof_float" >&6; }
    8144 
    8145 
    8146 
    8147 cat >>confdefs.h <<_ACEOF
    8148 #define SIZEOF_FLOAT $ac_cv_sizeof_float
    8149 _ACEOF
    8150 
    8151 
    81527756
    81537757# Save the values as shell variables so that we can substitute them
    81547758# into bltHash.h for situtations where there's no bltInt.h.
    8155 
    81567759
    81577760LD_RPATH="";
     
    81647767#       GLEW header and library
    81657768#       pthread library
    8166 #       ffmpeg headers and library (started)
    81677769#
    81687770
     
    81707772for dir in \
    81717773 ${exec_prefix} \
    8172  ${exec_prefix}/lib \
    8173  ${with_rappture} \
    8174  ${with_rappture}/lib ; do
     7774 ${exec_prefix}/lib ; do
    81757775  tclconfig="${dir}/tclConfig.sh"
    81767776  if test -f "$tclconfig" ; then
     
    81927792fi
    81937793
    8194 RP_DIR=""
    8195 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rappture" >&5
    8196 $as_echo_n "checking for rappture... " >&6; }
    8197 if test "$with_rappture" == "yes" ; then
    8198   for dir in "$exec_prefix" "/usr" ; do
    8199     if test -r "$dir/include/rappture2/rappture2.h" -a \
    8200      -r "$dir/lib/librappture.a"; then
    8201       RP_DIR="$dir"
    8202       RP_INC_SPEC="-I$dir/include -I$dir/include/rappture2"
    8203       RP_LIB_DIR="$dir/lib"
    8204       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dir" >&5
    8205 $as_echo "$dir" >&6; }
    8206       break
    8207     fi
    8208   done
    8209 else
    8210   if test ! -d "$with_rappture" ; then
    8211     as_fn_error $? "--with-rappture: no such directory $with_rappture" "$LINENO" 5
    8212   fi
    8213   RP_DIR=$with_rappture
    8214   RP_INC_SPEC="-I$with_rappture/include -I$with_rappture/include/rappture2"
    8215   RP_LIB_DIR="$with_rappture/lib"
    8216 fi
    8217 if test "x${RP_DIR}" = "x" ; then
    8218   as_fn_error $? "cannot find rappture.h and librappture2.a, try using --with-rappture" "$LINENO" 5
    8219 else
    8220   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_rappture" >&5
    8221 $as_echo "$with_rappture" >&6; }
    8222 fi
    8223 
    8224 # This could be temporary. We are assuming that we're using VTK 6+.
    8225 # Since VTK 6 hasn't been released, we will look it only in the
    8226 # Rappture build directories.
    8227 VTK_LIB_DIR=${libdir}
    8228 if test "$with_vtk" != "no" ; then
    8229   if test "$with_vtk" = "yes" ; then
    8230     for dir in vtk-6.{10,9,8,7,6,5,4,3,2,1,0} ; do
    8231       if test -d "${incdir}/$dir"; then
    8232         VTK_INC_SPEC="-I${incdir}/$dir"
    8233         break
    8234       fi
    8235     done
    8236   fi
    8237 fi
    8238 
    8239 if test "x$with_vtk_includes" != "x"; then
    8240    VTK_INC_SPEC=-I$with_vtk_includes
    8241 fi
    8242 
    8243 if test "x$with_vtk_libs" != "x"; then
    8244    VTK_LIB_DIR=$with_vtk_libs
    8245    VTK_LIB_SPEC="-L$with_vtk_libs"
    8246 fi
    8247 
    8248 save_CPPFLAGS=$CPPFLAGS
    8249 CPPFLAGS=$VTK_INC_SPEC
    8250 
    8251 for ac_header in vtkSmartPointer.h
    8252 do :
    8253   ac_fn_cxx_check_header_mongrel "$LINENO" "vtkSmartPointer.h" "ac_cv_header_vtkSmartPointer_h" "$ac_includes_default"
    8254 if test "x$ac_cv_header_vtkSmartPointer_h" = xyes; then :
    8255   cat >>confdefs.h <<_ACEOF
    8256 #define HAVE_VTKSMARTPOINTER_H 1
    8257 _ACEOF
    8258 
    8259 else
    8260   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find vtkSmartPointer.h" >&5
    8261 $as_echo "$as_me: WARNING: cannot find vtkSmartPointer.h" >&2;}
    8262 fi
    8263 
    8264 done
    8265 
    8266 CPPFLAGS=$save_CPPFLAGS
    82677794
    82687795ac_fn_cxx_check_header_mongrel "$LINENO" "GL/glew.h" "ac_cv_header_GL_glew_h" "$ac_includes_default"
     
    83117838done
    83127839
    8313 
    8314 save_CPPFLAGS=$CPPFLAGS
    8315 
    8316 SUBDIRS="nanoscale pymolproxy vtkvis"
    8317 
    8318 
    8319 
    8320 
    8321 
    8322 
    8323 
    8324 
    8325 
    8326 
    8327 
    8328 
    8329 
    8330 
    8331 
    8332 
    8333 
    8334 
    8335 
    8336 
    8337 
    8338 
    8339 
    8340 
    8341 
    8342 
    8343 
    8344 ac_config_files="$ac_config_files Makefile nanoscale/Makefile nanoscale/renderservers.tcl pymolproxy/Makefile vtkvis/Doxyfile vtkvis/Makefile start_viz.sh start_nanoscale.sh"
     7840for ac_func in mkstemps
     7841do :
     7842  ac_fn_cxx_check_func "$LINENO" "mkstemps" "ac_cv_func_mkstemps"
     7843if test "x$ac_cv_func_mkstemps" = xyes; then :
     7844  cat >>confdefs.h <<_ACEOF
     7845#define HAVE_MKSTEMPS 1
     7846_ACEOF
     7847
     7848fi
     7849done
     7850
     7851
     7852SUBDIRS="nanoscale pymolproxy"
     7853
     7854
     7855
     7856
     7857
     7858
     7859
     7860
     7861
     7862
     7863ac_config_files="$ac_config_files Makefile nanoscale/Makefile nanoscale/renderservers.tcl pymolproxy/Makefile start_nanoscale.sh"
    83457864
    83467865cat >confcache <<\_ACEOF
     
    90368555do
    90378556  case $ac_config_target in
    9038     "nanovis/nvconf.h") CONFIG_HEADERS="$CONFIG_HEADERS nanovis/nvconf.h" ;;
    90398557    "nanoscale/config.h") CONFIG_HEADERS="$CONFIG_HEADERS nanoscale/config.h" ;;
    90408558    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     
    90428560    "nanoscale/renderservers.tcl") CONFIG_FILES="$CONFIG_FILES nanoscale/renderservers.tcl" ;;
    90438561    "pymolproxy/Makefile") CONFIG_FILES="$CONFIG_FILES pymolproxy/Makefile" ;;
    9044     "vtkvis/Doxyfile") CONFIG_FILES="$CONFIG_FILES vtkvis/Doxyfile" ;;
    9045     "vtkvis/Makefile") CONFIG_FILES="$CONFIG_FILES vtkvis/Makefile" ;;
    9046     "start_viz.sh") CONFIG_FILES="$CONFIG_FILES start_viz.sh" ;;
    90478562    "start_nanoscale.sh") CONFIG_FILES="$CONFIG_FILES start_nanoscale.sh" ;;
    90488563
  • branches/1.3/packages/vizservers/configure.in

    r4467 r4530  
    11AC_PREREQ([2.60])
    2 AC_INIT(vizservers, 0.1, rappture@nanohub.org)
     2AC_INIT([vizservers], [0.1], [rappture@nanohub.org])
    33AC_CONFIG_AUX_DIR(cf)
    4 AC_CONFIG_HEADERS([nanovis/nvconf.h nanoscale/config.h])
     4AC_CONFIG_HEADERS([nanoscale/config.h])
    55
    66AC_ARG_WITH(
     
    1212
    1313AC_ARG_WITH(
    14     [rappture],
    15     [AS_HELP_STRING([--with-rappture[=DIR]],
    16         [location of rappture files lib/librappture.a and include/rappture.h @<:@default=/usr@:>@])],
    17     [with_rappture=$withval],
    18     [with_rappture=yes])
    19 
    20 AC_ARG_WITH(
    21     [vtk-includes],
    22     [AS_HELP_STRING([--with-vtk-includes=DIR],
    23         [VTK include files are in DIR])],
    24     [with_vtk_includes=$withval],
    25     [with_vtk_includes=""])
    26 
    27 AC_ARG_WITH(
    28     [vtk-libs],
    29     [AS_HELP_STRING([--with-vtk-libs=DIR],
    30         [VTK libraries are in DIR])],
    31     [with_vtk_libs=$withval],
    32     [with_vtk_libs=""])
    33 
    34 AC_ARG_WITH(
    35     [vtk],
    36     [AS_HELP_STRING([--with-vtk=VERSION],
    37         [Version of VTK required])],
    38     [with_vtk=$withval],
    39     [with_vtk=yes])
    40 
    41 RP_LANG_PYTHON
    42 
    43 AC_ARG_WITH(
    4414    [statsdir],
    4515    [AS_HELP_STRING([--with-statsdir=DIR],
    46         [Write statics in DIR])],
     16        [Write statistics in DIR])],
    4717    [STATSDIR=$withval],
    4818    [STATSDIR="/var/tmp/visservers"])
    4919
    50 VERSION=0.0.1
     20AC_ARG_WITH(
     21    [logdir],
     22    [AS_HELP_STRING([--with-logdir=DIR],
     23        [Write log files in DIR])],
     24    [LOGDIR=$withval],
     25    [LOGDIR="/tmp"])
     26
     27RP_LANG_PYTHON
    5128
    5229#------------------------------------------------------------------------
     
    7451SC_CONFIG_CFLAGS
    7552
    76 
    7753AC_PATH_X
    7854
     
    9066
    9167AC_C_BIGENDIAN
    92 AC_CHECK_SIZEOF(int, 4)
    93 AC_CHECK_SIZEOF(long, 4)
    94 AC_CHECK_SIZEOF(long long, 8)
    95 AC_CHECK_SIZEOF(void *, 4)
    96 AC_CHECK_SIZEOF(float, 4)
    9768
    9869# Save the values as shell variables so that we can substitute them
    9970# into bltHash.h for situtations where there's no bltInt.h.
    100 
    10171
    10272LD_RPATH="";
     
    10979#       GLEW header and library
    11080#       pthread library
    111 #       ffmpeg headers and library (started)
    11281#
    11382
     
    11584for dir in \
    11685 ${exec_prefix} \
    117  ${exec_prefix}/lib \
    118  ${with_rappture} \
    119  ${with_rappture}/lib ; do
     86 ${exec_prefix}/lib ; do
    12087  tclconfig="${dir}/tclConfig.sh"
    12188  if test -f "$tclconfig" ; then
     
    137104fi
    138105
    139 RP_DIR=""
    140 AC_MSG_CHECKING([for rappture])
    141 if test "$with_rappture" == "yes" ; then
    142   for dir in "$exec_prefix" "/usr" ; do
    143     if test -r "$dir/include/rappture2/rappture2.h" -a \
    144      -r "$dir/lib/librappture.a"; then
    145       RP_DIR="$dir"
    146       RP_INC_SPEC="-I$dir/include -I$dir/include/rappture2"
    147       RP_LIB_DIR="$dir/lib"
    148       AC_MSG_RESULT([$dir])
    149       break
    150     fi
    151   done
    152 else
    153   if test ! -d "$with_rappture" ; then
    154     AC_MSG_ERROR([--with-rappture: no such directory $with_rappture])
    155   fi
    156   RP_DIR=$with_rappture
    157   RP_INC_SPEC="-I$with_rappture/include -I$with_rappture/include/rappture2"
    158   RP_LIB_DIR="$with_rappture/lib"
    159 fi
    160 if test "x${RP_DIR}" = "x" ; then
    161   AC_MSG_ERROR([cannot find rappture.h and librappture2.a, try using --with-rappture])
    162 else
    163   AC_MSG_RESULT([$with_rappture])
    164 fi
    165 
    166 # This could be temporary. We are assuming that we're using VTK 6+.
    167 # Since VTK 6 hasn't been released, we will look it only in the
    168 # Rappture build directories.
    169 VTK_LIB_DIR=${libdir}
    170 dnl Prefer our VTK installation over systems. --with-vtk overrides.
    171 if test "$with_vtk" != "no" ; then
    172   if test "$with_vtk" = "yes" ; then
    173     for dir in vtk-6.{10,9,8,7,6,5,4,3,2,1,0} ; do
    174       if test -d "${incdir}/$dir"; then
    175         VTK_INC_SPEC="-I${incdir}/$dir"
    176         break
    177       fi
    178     done
    179   fi
    180 fi
    181 
    182 if test "x$with_vtk_includes" != "x"; then
    183    VTK_INC_SPEC=-I$with_vtk_includes
    184 fi
    185 
    186 if test "x$with_vtk_libs" != "x"; then
    187    VTK_LIB_DIR=$with_vtk_libs
    188    VTK_LIB_SPEC="-L$with_vtk_libs"
    189 fi
    190 
    191 save_CPPFLAGS=$CPPFLAGS
    192 CPPFLAGS=$VTK_INC_SPEC
    193 AC_CHECK_HEADERS([vtkSmartPointer.h], [], [AC_MSG_WARN([cannot find vtkSmartPointer.h])])
    194 CPPFLAGS=$save_CPPFLAGS
    195 
    196106AC_CHECK_HEADER([GL/glew.h])
    197107
     
    200110
    201111AC_CHECK_FUNCS([accept4])
     112AC_CHECK_FUNCS([mkstemps])
    202113
    203 save_CPPFLAGS=$CPPFLAGS
     114SUBDIRS="nanoscale pymolproxy"
    204115
    205 SUBDIRS="nanoscale pymolproxy vtkvis"
    206 
    207 AC_SUBST(CFLAGS_DEBUG)
    208 AC_SUBST(CFLAGS_OPTIMIZE)
    209116AC_SUBST(LD_RPATH)
    210 AC_SUBST(RP_DIR)
    211 AC_SUBST(RP_INC_SPEC)
    212 AC_SUBST(RP_LIB_DIR)
    213 AC_SUBST(SHLIB_CFLAGS)
    214 AC_SUBST(SHLIB_LD)
    215 AC_SUBST(SHLIB_LDFLAGS)
    216 AC_SUBST(SHLIB_SUFFIX)
    217 AC_SUBST(SIZEOF_FLOAT)
    218 AC_SUBST(SIZEOF_INT)
    219 AC_SUBST(SIZEOF_LONG)
    220 AC_SUBST(SIZEOF_LONG_LONG)
    221 AC_SUBST(SIZEOF_VOID_P)
     117AC_SUBST(LOGDIR)
    222118AC_SUBST(STATSDIR)
    223 AC_SUBST(STLIB_LD)
    224119AC_SUBST(SUBDIRS)
    225120AC_SUBST(PYTHON)
     
    227122AC_SUBST(TCL_LIB_SPEC)
    228123AC_SUBST(TCL_VERSION)
    229 AC_SUBST(VERSION)
    230 AC_SUBST(VTK_INC_SPEC)
    231 AC_SUBST(VTK_LIB_DIR)
    232124
    233125AC_OUTPUT([
     
    236128   nanoscale/renderservers.tcl \
    237129   pymolproxy/Makefile \
    238    vtkvis/Doxyfile \
    239    vtkvis/Makefile \
    240    start_viz.sh \
    241130   start_nanoscale.sh])
  • branches/1.3/packages/vizservers/nanovis/nvconf.h.in

    r3559 r4530  
    1 /* nanovis/nvconf.h.in.  Generated from configure.in by autoheader.  */
     1/* nvconf.h.in.  Generated from configure.in by autoheader.  */
    22
    33/* Define if building universal (internal helper macro) */
     
    2727/* Define to 1 if you have the <netinet/in.h> header file. */
    2828#undef HAVE_NETINET_IN_H
    29 
    30 /* Define to 1 if you have the <Python.h> header file. */
    31 #undef HAVE_PYTHON_H
    3229
    3330/* Define to 1 if you have the <stdint.h> header file. */
     
    8279#undef PACKAGE_VERSION
    8380
    84 /* The size of `float', as computed by sizeof. */
    85 #undef SIZEOF_FLOAT
    86 
    87 /* The size of `int', as computed by sizeof. */
    88 #undef SIZEOF_INT
    89 
    90 /* The size of `long', as computed by sizeof. */
    91 #undef SIZEOF_LONG
    92 
    93 /* The size of `long long', as computed by sizeof. */
    94 #undef SIZEOF_LONG_LONG
    95 
    96 /* The size of `void *', as computed by sizeof. */
    97 #undef SIZEOF_VOID_P
    98 
    9981/* Define to 1 if you have the ANSI C header files. */
    10082#undef STDC_HEADERS
  • branches/1.3/packages/vizservers/pymolproxy/Makefile.in

    r4501 r4530  
    1212TCL_INC_SPEC =  @TCL_INC_SPEC@
    1313TCL_LIB_SPEC =  @TCL_LIB_SPEC@
    14 RP_LIB_DIR =    @RP_LIB_DIR@
    1514
    1615bindir =        @bindir@
     
    2423srcdir =        @srcdir@
    2524
    26 RP_DIR =        @RP_DIR@
    2725INSTALL =       @INSTALL@
    2826MKDIR_P =       @MKDIR_P@
     
    3836PROXY2_OBJS =   pymolproxy2.o md5.o
    3937LIBS =          $(TCL_LIB_SPEC) \
    40                 -Wl,-rpath,$(RP_LIB_DIR)
     38                -Wl,-rpath,$(libdir)
    4139
    4240SCRIPTS         = $(srcdir)/scripts/box.py
  • branches/1.3/packages/vizservers/vtkvis/LIC.cpp

    r4237 r4530  
    3333    GraphicsObject(),
    3434    _sliceAxis(Z_AXIS),
    35     _colorMap(NULL)
     35    _colorMap(NULL),
     36    _resolution(128)
    3637{
    3738}
     
    230231        int xdim, ydim, zdim;
    231232        double origin[3], spacing[3];
     233        int res = _resolution;
    232234        if (minDir == 0) {
    233235            xdim = 1;
    234             ydim = 128;
    235             zdim = 128;
     236            ydim = res;
     237            zdim = res;
    236238            origin[0] = bounds[0] + xSize/2.;
    237239            origin[1] = bounds[2];
     
    242244            _sliceAxis = X_AXIS;
    243245        } else if (minDir == 1) {
    244             xdim = 128;
     246            xdim = res;
    245247            ydim = 1;
    246             zdim = 128;
     248            zdim = res;
    247249            origin[0] = bounds[0];
    248250            origin[1] = bounds[2] + ySize/2.;
     
    253255            _sliceAxis = Y_AXIS;
    254256        } else {
    255             xdim = 128;
    256             ydim = 128;
     257            xdim = res;
     258            ydim = res;
    257259            zdim = 1;
    258260            origin[0] = bounds[0];
     
    279281        }
    280282        _lic->Update();
    281         vtkSmartPointer<vtkImageCast> cast = vtkSmartPointer<vtkImageCast>::New();
    282         cast->SetInputConnection(_probeFilter->GetOutputPort());
    283         cast->SetInputArrayToProcess(0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS,
    284                                      _probeFilter->GetValidPointMaskArrayName());
    285         cast->SetOutputScalarTypeToUnsignedChar();
    286         vtkSmartPointer<vtkImageMask> mask = vtkSmartPointer<vtkImageMask>::New();
    287         mask->SetInputConnection(0, _lic->GetOutputPort());
    288         mask->SetInputConnection(1, cast->GetOutputPort());
    289         _mapper->SetInputConnection(mask->GetOutputPort());
     283        if (1) {
     284            vtkSmartPointer<vtkImageData> imgData = _probeFilter->GetImageDataOutput();
     285            imgData->GetPointData()->SetActiveScalars(_probeFilter->GetValidPointMaskArrayName());
     286            vtkSmartPointer<vtkImageCast> maskCast = vtkSmartPointer<vtkImageCast>::New();
     287            maskCast->SetInputData(imgData);
     288            //maskCast->SetInputConnection(_probeFilter->GetOutputPort());
     289            //maskCast->SetInputArrayToProcess(0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS,
     290            //                                 _probeFilter->GetValidPointMaskArrayName());
     291            maskCast->SetOutputScalarTypeToUnsignedChar();
     292            vtkSmartPointer<vtkImageCast> licCast = vtkSmartPointer<vtkImageCast>::New();
     293            licCast->SetInputConnection(_lic->GetOutputPort());
     294            licCast->SetOutputScalarTypeToDouble();
     295            vtkSmartPointer<vtkImageMask> mask = vtkSmartPointer<vtkImageMask>::New();
     296            mask->SetInputConnection(0, licCast->GetOutputPort());
     297            mask->SetInputConnection(1, maskCast->GetOutputPort());
     298            _mapper->SetInputConnection(mask->GetOutputPort());
     299        } else {
     300            // Mask not working in VTK 6.1?
     301            _mapper->SetInputConnection(_lic->GetOutputPort());
     302        }
    290303    } else {
    291304        // DataSet is a 3D PolyData with cells
     
    371384        assert(vtkDataSet::SafeDownCast(_probeFilter->GetSource()) != NULL);
    372385        _dataSet->getBounds(bounds);
    373         int dim = 128;
     386        int dim = _resolution;
    374387
    375388        switch (axis) {
  • branches/1.3/packages/vizservers/vtkvis/LIC.h

    r3621 r4530  
    6767    Axis _sliceAxis;
    6868    ColorMap *_colorMap;
     69    int _resolution;
    6970
    7071    vtkSmartPointer<vtkLookupTable> _lut;
  • branches/1.3/packages/vizservers/vtkvis/Makefile.in

    r4501 r4530  
    4040TCL_INC_SPEC    = @TCL_INC_SPEC@
    4141
     42VTK_VERSION     = @VTK_VERSION@
    4243VTK_LIB_DIR     = @VTK_LIB_DIR@
    43 VTK_INC_SPEC    = @VTK_INC_SPEC@
    44 VTK_VERSION     = 6.0
    45 VTK_LIB_SPEC    = \
     44VTK_INC_DIR     = @VTK_INC_DIR@
     45VTK_INC_SPEC    = -I$(VTK_INC_DIR)/vtk-$(VTK_VERSION)
     46VTK_LIB_SPEC    = -L$(VTK_LIB_DIR) \
    4647                -lvtkDomainsChemistry-$(VTK_VERSION) \
    4748                -lvtkIOCore-$(VTK_VERSION) \
     
    8485endif
    8586
    86 LD_RUN_PATH     = $(libdir)
     87LD_RUN_PATH     = $(VTK_LIB_DIR):$(libdir)
    8788
    8889LIBS            = \
Note: See TracChangeset for help on using the changeset viewer.