Changeset 4060


Ignore:
Timestamp:
Nov 15, 2013 1:06:52 AM (10 years ago)
Author:
ldelgass
Message:

Add separate configure scripts for nanovis and vtkvis, remove them from the
vizservers configure (which now only configures nanoscale and pymolproxy).

Location:
trunk/packages/vizservers
Files:
10 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/packages/vizservers/Makefile.in

    r4052 r4060  
    1919
    2020SUBDIRS         = @SUBDIRS@
    21 VTK_LIB_DIR     = @VTK_LIB_DIR@
    22 CG_LIB_DIR      = @CG_LIB_DIR@
    23 
    24 SUBDIRS         = nanoscale pymolproxy
    25 
    26 ifneq ($(VTK_LIB_DIR),)
    27   SUBDIRS += vtkvis
    28 endif
    29 
    30 ifneq ($(CG_LIB_DIR),)
    31   SUBDIRS += nanovis
    32 endif
    3321
    3422.PHONY: all install clean distclean $(SUBDIRS)

  • trunk/packages/vizservers/configure

    r4049 r4060  
    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
    643631LD_RPATH
    644 CG_LIB_SPEC
    645 CG_INC_SPEC
    646 FFMPEG
    647632CXXCPP
    648633ac_ct_CXX
    … …  
    732717enable_option_checking
    733718with_tcllib
    734 with_rappture
    735 with_vtk_includes
    736 with_vtk_libs
    737 with_vtk
    738 with_ffmpeg
     719with_statsdir
    739720with_python
    740 with_statsdir
    741721enable_64bit
    742722enable_64bit_vis
    … …  
    13821362  --with-tcllib=DIR       location of Tcl binary library libtclstubs.a
    13831363                          [default=/usr/lib]
    1384   --with-rappture=DIR     location of rappture files lib/librappture.a and
    1385                           include/rappture.h [default=/usr]
    1386   --with-vtk-includes=DIR VTK include files are in DIR
    1387   --with-vtk-libs=DIR     VTK libraries are in DIR
    1388   --with-vtk=VERSION      Version of VTK required
    1389   --with-ffmpeg=DIR       location of ffmpeg [default=yes]
     1364  --with-statsdir=DIR     Write statistics in DIR
    13901365  --with-python=DIR       location of python [default=yes]
    1391   --with-statsdir=DIR     Write statistics in DIR
    13921366  --with-x                use the X Window System
    13931367
    … …  
    18871861
    18881862} # ac_fn_cxx_try_run
    1889 
    1890 # ac_fn_cxx_compute_int LINENO EXPR VAR INCLUDES
    1891 # ----------------------------------------------
    1892 # Tries to find the compile-time value of EXPR in a program that includes
    1893 # INCLUDES, setting VAR accordingly. Returns whether the value could be
    1894 # computed
    1895 ac_fn_cxx_compute_int ()
    1896 {
    1897   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    1898   if test "$cross_compiling" = yes; then
    1899     # Depending upon the size, compute the lo and hi bounds.
    1900 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1901 /* end confdefs.h.  */
    1902 $4
    1903 int
    1904 main ()
    1905 {
    1906 static int test_array [1 - 2 * !(($2) >= 0)];
    1907 test_array [0] = 0;
    1908 return test_array [0];
    1909 
    1910   ;
    1911   return 0;
    1912 }
    1913 _ACEOF
    1914 if ac_fn_cxx_try_compile "$LINENO"; then :
    1915   ac_lo=0 ac_mid=0
    1916   while :; do
    1917     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1918 /* end confdefs.h.  */
    1919 $4
    1920 int
    1921 main ()
    1922 {
    1923 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
    1924 test_array [0] = 0;
    1925 return test_array [0];
    1926 
    1927   ;
    1928   return 0;
    1929 }
    1930 _ACEOF
    1931 if ac_fn_cxx_try_compile "$LINENO"; then :
    1932   ac_hi=$ac_mid; break
    1933 else
    1934   as_fn_arith $ac_mid + 1 && ac_lo=$as_val
    1935                         if test $ac_lo -le $ac_mid; then
    1936                           ac_lo= ac_hi=
    1937                           break
    1938                         fi
    1939                         as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
    1940 fi
    1941 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    1942   done
    1943 else
    1944   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1945 /* end confdefs.h.  */
    1946 $4
    1947 int
    1948 main ()
    1949 {
    1950 static int test_array [1 - 2 * !(($2) < 0)];
    1951 test_array [0] = 0;
    1952 return test_array [0];
    1953 
    1954   ;
    1955   return 0;
    1956 }
    1957 _ACEOF
    1958 if ac_fn_cxx_try_compile "$LINENO"; then :
    1959   ac_hi=-1 ac_mid=-1
    1960   while :; do
    1961     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1962 /* end confdefs.h.  */
    1963 $4
    1964 int
    1965 main ()
    1966 {
    1967 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
    1968 test_array [0] = 0;
    1969 return test_array [0];
    1970 
    1971   ;
    1972   return 0;
    1973 }
    1974 _ACEOF
    1975 if ac_fn_cxx_try_compile "$LINENO"; then :
    1976   ac_lo=$ac_mid; break
    1977 else
    1978   as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
    1979                         if test $ac_mid -le $ac_hi; then
    1980                           ac_lo= ac_hi=
    1981                           break
    1982                         fi
    1983                         as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
    1984 fi
    1985 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    1986   done
    1987 else
    1988   ac_lo= ac_hi=
    1989 fi
    1990 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    1991 fi
    1992 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    1993 # Binary search between lo and hi bounds.
    1994 while test "x$ac_lo" != "x$ac_hi"; do
    1995   as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
    1996   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1997 /* end confdefs.h.  */
    1998 $4
    1999 int
    2000 main ()
    2001 {
    2002 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
    2003 test_array [0] = 0;
    2004 return test_array [0];
    2005 
    2006   ;
    2007   return 0;
    2008 }
    2009 _ACEOF
    2010 if ac_fn_cxx_try_compile "$LINENO"; then :
    2011   ac_hi=$ac_mid
    2012 else
    2013   as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
    2014 fi
    2015 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    2016 done
    2017 case $ac_lo in #((
    2018 ?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
    2019 '') ac_retval=1 ;;
    2020 esac
    2021   else
    2022     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    2023 /* end confdefs.h.  */
    2024 $4
    2025 static long int longval () { return $2; }
    2026 static unsigned long int ulongval () { return $2; }
    2027 #include <stdio.h>
    2028 #include <stdlib.h>
    2029 int
    2030 main ()
    2031 {
    2032 
    2033   FILE *f = fopen ("conftest.val", "w");
    2034   if (! f)
    2035     return 1;
    2036   if (($2) < 0)
    2037     {
    2038       long int i = longval ();
    2039       if (i != ($2))
    2040         return 1;
    2041       fprintf (f, "%ld", i);
    2042     }
    2043   else
    2044     {
    2045       unsigned long int i = ulongval ();
    2046       if (i != ($2))
    2047         return 1;
    2048       fprintf (f, "%lu", i);
    2049     }
    2050   /* Do not output a trailing newline, as this causes \r\n confusion
    2051      on some platforms.  */
    2052   return ferror (f) || fclose (f) != 0;
    2053 
    2054   ;
    2055   return 0;
    2056 }
    2057 _ACEOF
    2058 if ac_fn_cxx_try_run "$LINENO"; then :
    2059   echo >>conftest.val; read $3 <conftest.val; ac_retval=0
    2060 else
    2061   ac_retval=1
    2062 fi
    2063 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
    2064   conftest.$ac_objext conftest.beam conftest.$ac_ext
    2065 rm -f conftest.val
    2066 
    2067   fi
    2068   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    2069   as_fn_set_status $ac_retval
    2070 
    2071 } # ac_fn_cxx_compute_int
    20721863
    20731864# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
    … …  
    26552446
    26562447
    2657 ac_config_headers="$ac_config_headers nanovis/nvconf.h nanoscale/config.h"
     2448ac_config_headers="$ac_config_headers nanoscale/config.h"
    26582449
    26592450
    … …  
    26682459
    26692460
    2670 # Check whether --with-rappture was given.
    2671 if test "${with_rappture+set}" = set; then :
    2672   withval=$with_rappture; with_rappture=$withval
    2673 else
    2674   with_rappture=yes
    2675 fi
    2676 
    2677 
    2678 
    2679 # Check whether --with-vtk-includes was given.
    2680 if test "${with_vtk_includes+set}" = set; then :
    2681   withval=$with_vtk_includes; with_vtk_includes=$withval
    2682 else
    2683   with_vtk_includes=""
    2684 fi
    2685 
    2686 
    2687 
    2688 # Check whether --with-vtk-libs was given.
    2689 if test "${with_vtk_libs+set}" = set; then :
    2690   withval=$with_vtk_libs; with_vtk_libs=$withval
    2691 else
    2692   with_vtk_libs=""
    2693 fi
    2694 
    2695 
    2696 
    2697 # Check whether --with-vtk was given.
    2698 if test "${with_vtk+set}" = set; then :
    2699   withval=$with_vtk; with_vtk=$withval
    2700 else
    2701   with_vtk=yes
    2702 fi
    2703 
    2704 
    2705 
    2706 # Check whether --with-ffmpeg was given.
    2707 if test "${with_ffmpeg+set}" = set; then :
    2708   withval=$with_ffmpeg;
    2709 else
    2710   with_ffmpeg=yes
     2461# Check whether --with-statsdir was given.
     2462if test "${with_statsdir+set}" = set; then :
     2463  withval=$with_statsdir; STATSDIR=$withval
     2464else
     2465  STATSDIR="/var/tmp/visservers"
    27112466fi
    27122467
    … …  
    40703825fi
    40713826
    4072 
    4073 
    4074 # Check whether --with-statsdir was given.
    4075 if test "${with_statsdir+set}" = set; then :
    4076   withval=$with_statsdir; STATSDIR=$withval
    4077 else
    4078   STATSDIR="/var/tmp/visservers"
    4079 fi
    4080 
    4081 
    4082 VERSION=0.0.1
    40833827
    40843828#------------------------------------------------------------------------
    … …  
    60105754
    60115755
    6012 
    60135756{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
    60145757$as_echo_n "checking for X... " >&6; }
    … …  
    79997742 esac
    80007743
    8001 # The cast to long int works around a bug in the HP C Compiler
    8002 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    8003 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    8004 # This bug is HP SR number 8606223364.
    8005 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
    8006 $as_echo_n "checking size of int... " >&6; }
    8007 if ${ac_cv_sizeof_int+:} false; then :
    8008   $as_echo_n "(cached) " >&6
    8009 else
    8010   if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
    8011 
    8012 else
    8013   if test "$ac_cv_type_int" = yes; then
    8014      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    8015 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    8016 as_fn_error 77 "cannot compute sizeof (int)
    8017 See \`config.log' for more details" "$LINENO" 5; }
    8018    else
    8019      ac_cv_sizeof_int=0
    8020    fi
    8021 fi
    8022 
    8023 fi
    8024 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
    8025 $as_echo "$ac_cv_sizeof_int" >&6; }
    8026 
    8027 
    8028 
    8029 cat >>confdefs.h <<_ACEOF
    8030 #define SIZEOF_INT $ac_cv_sizeof_int
    8031 _ACEOF
    8032 
    8033 
    8034 # The cast to long int works around a bug in the HP C Compiler
    8035 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    8036 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    8037 # This bug is HP SR number 8606223364.
    8038 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
    8039 $as_echo_n "checking size of long... " >&6; }
    8040 if ${ac_cv_sizeof_long+:} false; then :
    8041   $as_echo_n "(cached) " >&6
    8042 else
    8043   if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
    8044 
    8045 else
    8046   if test "$ac_cv_type_long" = yes; then
    8047      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    8048 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    8049 as_fn_error 77 "cannot compute sizeof (long)
    8050 See \`config.log' for more details" "$LINENO" 5; }
    8051    else
    8052      ac_cv_sizeof_long=0
    8053    fi
    8054 fi
    8055 
    8056 fi
    8057 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
    8058 $as_echo "$ac_cv_sizeof_long" >&6; }
    8059 
    8060 
    8061 
    8062 cat >>confdefs.h <<_ACEOF
    8063 #define SIZEOF_LONG $ac_cv_sizeof_long
    8064 _ACEOF
    8065 
    8066 
    8067 # The cast to long int works around a bug in the HP C Compiler
    8068 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    8069 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    8070 # This bug is HP SR number 8606223364.
    8071 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
    8072 $as_echo_n "checking size of long long... " >&6; }
    8073 if ${ac_cv_sizeof_long_long+:} false; then :
    8074   $as_echo_n "(cached) " >&6
    8075 else
    8076   if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
    8077 
    8078 else
    8079   if test "$ac_cv_type_long_long" = yes; then
    8080      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    8081 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    8082 as_fn_error 77 "cannot compute sizeof (long long)
    8083 See \`config.log' for more details" "$LINENO" 5; }
    8084    else
    8085      ac_cv_sizeof_long_long=0
    8086    fi
    8087 fi
    8088 
    8089 fi
    8090 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
    8091 $as_echo "$ac_cv_sizeof_long_long" >&6; }
    8092 
    8093 
    8094 
    8095 cat >>confdefs.h <<_ACEOF
    8096 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
    8097 _ACEOF
    8098 
    8099 
    8100 # The cast to long int works around a bug in the HP C Compiler
    8101 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    8102 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    8103 # This bug is HP SR number 8606223364.
    8104 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
    8105 $as_echo_n "checking size of void *... " >&6; }
    8106 if ${ac_cv_sizeof_void_p+:} false; then :
    8107   $as_echo_n "(cached) " >&6
    8108 else
    8109   if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
    8110 
    8111 else
    8112   if test "$ac_cv_type_void_p" = yes; then
    8113      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    8114 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    8115 as_fn_error 77 "cannot compute sizeof (void *)
    8116 See \`config.log' for more details" "$LINENO" 5; }
    8117    else
    8118      ac_cv_sizeof_void_p=0
    8119    fi
    8120 fi
    8121 
    8122 fi
    8123 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
    8124 $as_echo "$ac_cv_sizeof_void_p" >&6; }
    8125 
    8126 
    8127 
    8128 cat >>confdefs.h <<_ACEOF
    8129 #define SIZEOF_VOID_P $ac_cv_sizeof_void_p
    8130 _ACEOF
    8131 
    8132 
    8133 # The cast to long int works around a bug in the HP C Compiler
    8134 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    8135 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    8136 # This bug is HP SR number 8606223364.
    8137 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float" >&5
    8138 $as_echo_n "checking size of float... " >&6; }
    8139 if ${ac_cv_sizeof_float+:} false; then :
    8140   $as_echo_n "(cached) " >&6
    8141 else
    8142   if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float"        "$ac_includes_default"; then :
    8143 
    8144 else
    8145   if test "$ac_cv_type_float" = yes; then
    8146      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    8147 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    8148 as_fn_error 77 "cannot compute sizeof (float)
    8149 See \`config.log' for more details" "$LINENO" 5; }
    8150    else
    8151      ac_cv_sizeof_float=0
    8152    fi
    8153 fi
    8154 
    8155 fi
    8156 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_float" >&5
    8157 $as_echo "$ac_cv_sizeof_float" >&6; }
    8158 
    8159 
    8160 
    8161 cat >>confdefs.h <<_ACEOF
    8162 #define SIZEOF_FLOAT $ac_cv_sizeof_float
    8163 _ACEOF
    8164 
    8165 
    81667744
    81677745# Save the values as shell variables so that we can substitute them
    81687746# into bltHash.h for situtations where there's no bltInt.h.
    8169 
    81707747
    81717748LD_RPATH="";
    … …  
    81817758#       CgGL headers and library
    81827759#       pthread library
    8183 #       ffmpeg headers and library (started)
    81847760#
    81857761
    … …  
    81877763for dir in \
    81887764 ${exec_prefix} \
    8189  ${exec_prefix}/lib \
    8190  ${with_rappture} \
    8191  ${with_rappture}/lib ; do
     7765 ${exec_prefix}/lib ; do
    81927766  tclconfig="${dir}/tclConfig.sh"
    81937767  if test -f "$tclconfig" ; then
    … …  
    82097783fi
    82107784
    8211 RP_DIR=""
    8212 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rappture" >&5
    8213 $as_echo_n "checking for rappture... " >&6; }
    8214 if test "$with_rappture" == "yes" ; then
    8215   for dir in "$exec_prefix" "/usr" ; do
    8216     if test -r "$dir/include/rappture2/rappture2.h" -a \
    8217      -r "$dir/lib/librappture.a"; then
    8218       RP_DIR="$dir"
    8219       RP_INC_SPEC="-I$dir/include -I$dir/include/rappture2"
    8220       RP_LIB_DIR="$dir/lib"
    8221       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dir" >&5
    8222 $as_echo "$dir" >&6; }
    8223       break
    8224     fi
    8225   done
    8226 else
    8227   if test ! -d "$with_rappture" ; then
    8228     as_fn_error $? "--with-rappture: no such directory $with_rappture" "$LINENO" 5
    8229   fi
    8230   RP_DIR=$with_rappture
    8231   RP_INC_SPEC="-I$with_rappture/include -I$with_rappture/include/rappture2"
    8232   RP_LIB_DIR="$with_rappture/lib"
    8233 fi
    8234 if test "x${RP_DIR}" = "x" ; then
    8235   as_fn_error $? "cannot find rappture.h and librappture2.a, try using --with-rappture" "$LINENO" 5
    8236 else
    8237   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_rappture" >&5
    8238 $as_echo "$with_rappture" >&6; }
    8239 fi
    8240 
    8241 # This could be temporary. We are assuming that we're using VTK 6+.
    8242 # Since VTK 6 hasn't been released, we will look it only in the
    8243 # Rappture build directories.
    8244 VTK_LIB_DIR=${libdir}
    8245 if test "$with_vtk" != "no" ; then
    8246   if test "$with_vtk" = "yes" ; then
    8247     for dir in vtk-6.{10,9,8,7,6,5,4,3,2,1,0} ; do
    8248       if test -d "${incdir}/$dir"; then
    8249         VTK_INC_SPEC="-I${incdir}/$dir"
    8250         break
    8251       fi
    8252     done
    8253   fi
    8254 fi
    8255 
    8256 if test "x$with_vtk_includes" != "x"; then
    8257    VTK_INC_SPEC=-I$with_vtk_includes
    8258 fi
    8259 
    8260 if test "x$with_vtk_libs" != "x"; then
    8261    VTK_LIB_DIR=$with_vtk_libs
    8262    VTK_LIB_SPEC="-L$with_vtk_libs"
    8263 fi
    8264 
    8265 save_CPPFLAGS=$CPPFLAGS
    8266 CPPFLAGS=$VTK_INC_SPEC
    8267 
    8268 for ac_header in vtkSmartPointer.h
    8269 do :
    8270   ac_fn_cxx_check_header_mongrel "$LINENO" "vtkSmartPointer.h" "ac_cv_header_vtkSmartPointer_h" "$ac_includes_default"
    8271 if test "x$ac_cv_header_vtkSmartPointer_h" = xyes; then :
    8272   cat >>confdefs.h <<_ACEOF
    8273 #define HAVE_VTKSMARTPOINTER_H 1
    8274 _ACEOF
    8275 
    8276 else
    8277   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find vtkSmartPointer.h" >&5
    8278 $as_echo "$as_me: WARNING: cannot find vtkSmartPointer.h" >&2;}
    8279 fi
    8280 
    8281 done
    8282 
    8283 CPPFLAGS=$save_CPPFLAGS
    8284 
    8285 ac_fn_cxx_check_header_mongrel "$LINENO" "GL/glut.h" "ac_cv_header_GL_glut_h" "$ac_includes_default"
    8286 if test "x$ac_cv_header_GL_glut_h" = xyes; then :
    8287 
    8288 fi
    8289 
    82907785
    82917786ac_fn_cxx_check_header_mongrel "$LINENO" "GL/glew.h" "ac_cv_header_GL_glew_h" "$ac_includes_default"
    … …  
    83357830
    83367831
    8337 save_CPPFLAGS=$CPPFLAGS
    8338 
    8339 
    8340 #--------------------------------------------------------------------
    8341 # search for ffmpeg executable
    8342 #--------------------------------------------------------------------
    8343 if test "${with_ffmpeg}" != "no" ; then
    8344   if test "${with_ffmpeg}" = "yes" ; then
    8345     # Extract the first word of "ffmpeg", so it can be a program name with args.
    8346 set dummy ffmpeg; ac_word=$2
    8347 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    8348 $as_echo_n "checking for $ac_word... " >&6; }
    8349 if ${ac_cv_path_FFMPEG+:} false; then :
    8350   $as_echo_n "(cached) " >&6
    8351 else
    8352   case $FFMPEG in
    8353   [\\/]* | ?:[\\/]*)
    8354   ac_cv_path_FFMPEG="$FFMPEG" # Let the user override the test with a path.
    8355   ;;
    8356   *)
    8357   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8358 for as_dir in $PATH
    8359 do
    8360   IFS=$as_save_IFS
    8361   test -z "$as_dir" && as_dir=.
    8362     for ac_exec_ext in '' $ac_executable_extensions; do
    8363   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    8364     ac_cv_path_FFMPEG="$as_dir/$ac_word$ac_exec_ext"
    8365     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    8366     break 2
    8367   fi
    8368 done
    8369   done
    8370 IFS=$as_save_IFS
    8371 
    8372   ;;
    8373 esac
    8374 fi
    8375 FFMPEG=$ac_cv_path_FFMPEG
    8376 if test -n "$FFMPEG"; then
    8377   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FFMPEG" >&5
    8378 $as_echo "$FFMPEG" >&6; }
    8379 else
    8380   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    8381 $as_echo "no" >&6; }
    8382 fi
    8383 
    8384 
    8385   else
    8386     # Extract the first word of "ffmpeg", so it can be a program name with args.
    8387 set dummy ffmpeg; ac_word=$2
    8388 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    8389 $as_echo_n "checking for $ac_word... " >&6; }
    8390 if ${ac_cv_path_FFMPEG+:} false; then :
    8391   $as_echo_n "(cached) " >&6
    8392 else
    8393   case $FFMPEG in
    8394   [\\/]* | ?:[\\/]*)
    8395   ac_cv_path_FFMPEG="$FFMPEG" # Let the user override the test with a path.
    8396   ;;
    8397   *)
    8398   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8399 as_dummy="${with_ffmpeg}/bin:${with_ffmpeg}"
    8400 for as_dir in $as_dummy
    8401 do
    8402   IFS=$as_save_IFS
    8403   test -z "$as_dir" && as_dir=.
    8404     for ac_exec_ext in '' $ac_executable_extensions; do
    8405   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    8406     ac_cv_path_FFMPEG="$as_dir/$ac_word$ac_exec_ext"
    8407     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    8408     break 2
    8409   fi
    8410 done
    8411   done
    8412 IFS=$as_save_IFS
    8413 
    8414   ;;
    8415 esac
    8416 fi
    8417 FFMPEG=$ac_cv_path_FFMPEG
    8418 if test -n "$FFMPEG"; then
    8419   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FFMPEG" >&5
    8420 $as_echo "$FFMPEG" >&6; }
    8421 else
    8422   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    8423 $as_echo "no" >&6; }
    8424 fi
    8425 
    8426 
    8427   fi
    8428   if test "${FFMPEG}x" != "x" ; then
    8429 
    8430 $as_echo "#define HAVE_FFMPEG 1" >>confdefs.h
    8431 
    8432   fi
    8433 fi
    8434 
    8435 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nVidia Cg installation" >&5
    8436 $as_echo_n "checking for nVidia Cg installation... " >&6; }
    8437 CG_DIR=""
    8438 for dir in \
    8439  /opt/nvidia-cg-toolkit \
    8440  /usr/cg \
    8441  /usr
    8442 do
    8443   if test -r "$dir/include" ; then
    8444     CG_DIR=$dir
    8445     break
    8446   fi
    8447 done
    8448 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${CG_DIR}" >&5
    8449 $as_echo "${CG_DIR}" >&6; }
    8450 
    8451 CG_INC_SPEC="-I${CG_DIR}/include"
    8452 
    8453 save_CPPFLAGS=$CPPFLAGS
    8454 CPPFLAGS="${CG_INC_SPEC} $CPPFLAGS"
    8455 for ac_header in Cg/cgGL.h
    8456 do :
    8457   ac_fn_cxx_check_header_mongrel "$LINENO" "Cg/cgGL.h" "ac_cv_header_Cg_cgGL_h" "$ac_includes_default"
    8458 if test "x$ac_cv_header_Cg_cgGL_h" = xyes; then :
    8459   cat >>confdefs.h <<_ACEOF
    8460 #define HAVE_CG_CGGL_H 1
    8461 _ACEOF
    8462 
    8463 else
    8464   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find nVidia Cg headers" >&5
    8465 $as_echo "$as_me: WARNING: cannot find nVidia Cg headers" >&2;}
    8466 fi
    8467 
    8468 done
    8469 
    8470 CPPFLAGS=$save_CPPFLAGS
    8471 
    8472 CG_LIB_DIR=""
    8473 for dir in \
    8474  /opt/nvidia-cg-toolkit \
    8475  /usr/cg \
    8476  /usr
    8477 do
    8478   if test -r "$dir/lib" ; then
    8479     CG_LIB_DIR=$dir/lib
    8480     break
    8481   fi
    8482   if test -r "$dir/lib64" ; then
    8483     CG_LIB_DIR=$dir/lib64
    8484     break
    8485   fi
    8486 done
    8487 
    8488 if test "${CG_LIB_DIR}" = "/usr/lib" ; then
    8489   CG_INC_SPEC=""
    8490   CG_LIB_SPEC="-lCg -lCgGL"
    8491 else
    8492   CG_LIB_SPEC="-L${CG_LIB_DIR} -lCg -lCgGL"
    8493   LD_RPATH="$loader_run_path:${CG_LIB_DIR}"
    8494 fi
    8495 
    8496 SUBDIRS="nanoscale nanovis pymolproxy vtkvis"
    8497 
    8498 
    8499 
    8500 
    8501 
    8502 
    8503 
    8504 
    8505 
    8506 
    8507 
    8508 
    8509 
    8510 
    8511 
    8512 
    8513 
    8514 
    8515 
    8516 
    8517 
    8518 
    8519 
    8520 
    8521 
    8522 
    8523 
    8524 
    8525 
    8526 
    8527 ac_config_files="$ac_config_files Makefile nanoscale/Makefile nanoscale/renderservers.tcl nanovis/Doxyfile nanovis/Makefile nanovis/graphics/Makefile nanovis/imgLoaders/Makefile nanovis/newmat11/Makefile nanovis/util/Makefile nanovis/vrmath/Makefile pymolproxy/Makefile vtkvis/Doxyfile vtkvis/Makefile start_nanoscale.sh"
     7832SUBDIRS="nanoscale pymolproxy"
     7833
     7834
     7835
     7836
     7837
     7838
     7839
     7840
     7841
     7842ac_config_files="$ac_config_files Makefile nanoscale/Makefile nanoscale/renderservers.tcl pymolproxy/Makefile start_nanoscale.sh"
    85287843
    85297844cat >confcache <<\_ACEOF
    … …  
    92198534do
    92208535  case $ac_config_target in
    9221     "nanovis/nvconf.h") CONFIG_HEADERS="$CONFIG_HEADERS nanovis/nvconf.h" ;;
    92228536    "nanoscale/config.h") CONFIG_HEADERS="$CONFIG_HEADERS nanoscale/config.h" ;;
    92238537    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    92248538    "nanoscale/Makefile") CONFIG_FILES="$CONFIG_FILES nanoscale/Makefile" ;;
    92258539    "nanoscale/renderservers.tcl") CONFIG_FILES="$CONFIG_FILES nanoscale/renderservers.tcl" ;;
    9226     "nanovis/Doxyfile") CONFIG_FILES="$CONFIG_FILES nanovis/Doxyfile" ;;
    9227     "nanovis/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/Makefile" ;;
    9228     "nanovis/graphics/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/graphics/Makefile" ;;
    9229     "nanovis/imgLoaders/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/imgLoaders/Makefile" ;;
    9230     "nanovis/newmat11/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/newmat11/Makefile" ;;
    9231     "nanovis/util/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/util/Makefile" ;;
    9232     "nanovis/vrmath/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/vrmath/Makefile" ;;
    92338540    "pymolproxy/Makefile") CONFIG_FILES="$CONFIG_FILES pymolproxy/Makefile" ;;
    9234     "vtkvis/Doxyfile") CONFIG_FILES="$CONFIG_FILES vtkvis/Doxyfile" ;;
    9235     "vtkvis/Makefile") CONFIG_FILES="$CONFIG_FILES vtkvis/Makefile" ;;
    92368541    "start_nanoscale.sh") CONFIG_FILES="$CONFIG_FILES start_nanoscale.sh" ;;
    92378542

  • trunk/packages/vizservers/configure.in

    r4049 r4060  
    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 AC_ARG_WITH(
    42     [ffmpeg],
    43     [AS_HELP_STRING([--with-ffmpeg[=DIR]],
    44       [location of ffmpeg @<:@default=yes@:>@])],
    45     [],
    46     [with_ffmpeg=yes])
    47 
    48 RP_LANG_PYTHON
    49 
    50 AC_ARG_WITH(
    5114    [statsdir],
    5215    [AS_HELP_STRING([--with-statsdir=DIR],
    … …  
    5518    [STATSDIR="/var/tmp/visservers"])
    5619
    57 VERSION=0.0.1
     20RP_LANG_PYTHON
    5821
    5922#------------------------------------------------------------------------
    … …  
    8144SC_CONFIG_CFLAGS
    8245
    83 
    8446AC_PATH_X
    8547
    … …  
    9759
    9860AC_C_BIGENDIAN
    99 AC_CHECK_SIZEOF(int, 4)
    100 AC_CHECK_SIZEOF(long, 4)
    101 AC_CHECK_SIZEOF(long long, 8)
    102 AC_CHECK_SIZEOF(void *, 4)
    103 AC_CHECK_SIZEOF(float, 4)
    10461
    10562# Save the values as shell variables so that we can substitute them
    10663# into bltHash.h for situtations where there's no bltInt.h.
    107 
    10864
    10965LD_RPATH="";
    … …  
    11975#       CgGL headers and library
    12076#       pthread library
    121 #       ffmpeg headers and library (started)
    12277#
    12378
    … …  
    12580for dir in \
    12681 ${exec_prefix} \
    127  ${exec_prefix}/lib \
    128  ${with_rappture} \
    129  ${with_rappture}/lib ; do
     82 ${exec_prefix}/lib ; do
    13083  tclconfig="${dir}/tclConfig.sh"
    13184  if test -f "$tclconfig" ; then
    … …  
    147100fi
    148101
    149 RP_DIR=""
    150 AC_MSG_CHECKING([for rappture])
    151 if test "$with_rappture" == "yes" ; then
    152   for dir in "$exec_prefix" "/usr" ; do
    153     if test -r "$dir/include/rappture2/rappture2.h" -a \
    154      -r "$dir/lib/librappture.a"; then
    155       RP_DIR="$dir"
    156       RP_INC_SPEC="-I$dir/include -I$dir/include/rappture2"
    157       RP_LIB_DIR="$dir/lib"
    158       AC_MSG_RESULT([$dir])
    159       break
    160     fi
    161   done
    162 else
    163   if test ! -d "$with_rappture" ; then
    164     AC_MSG_ERROR([--with-rappture: no such directory $with_rappture])
    165   fi
    166   RP_DIR=$with_rappture
    167   RP_INC_SPEC="-I$with_rappture/include -I$with_rappture/include/rappture2"
    168   RP_LIB_DIR="$with_rappture/lib"
    169 fi
    170 if test "x${RP_DIR}" = "x" ; then
    171   AC_MSG_ERROR([cannot find rappture.h and librappture2.a, try using --with-rappture])
    172 else
    173   AC_MSG_RESULT([$with_rappture])
    174 fi
    175 
    176 # This could be temporary. We are assuming that we're using VTK 6+.
    177 # Since VTK 6 hasn't been released, we will look it only in the
    178 # Rappture build directories.
    179 VTK_LIB_DIR=${libdir}
    180 dnl Prefer our VTK installation over systems. --with-vtk overrides.
    181 if test "$with_vtk" != "no" ; then
    182   if test "$with_vtk" = "yes" ; then
    183     for dir in vtk-6.{10,9,8,7,6,5,4,3,2,1,0} ; do
    184       if test -d "${incdir}/$dir"; then
    185         VTK_INC_SPEC="-I${incdir}/$dir"
    186         break
    187       fi
    188     done
    189   fi
    190 fi
    191 
    192 if test "x$with_vtk_includes" != "x"; then
    193    VTK_INC_SPEC=-I$with_vtk_includes
    194 fi
    195 
    196 if test "x$with_vtk_libs" != "x"; then
    197    VTK_LIB_DIR=$with_vtk_libs
    198    VTK_LIB_SPEC="-L$with_vtk_libs"
    199 fi
    200 
    201 save_CPPFLAGS=$CPPFLAGS
    202 CPPFLAGS=$VTK_INC_SPEC
    203 AC_CHECK_HEADERS([vtkSmartPointer.h], [], [AC_MSG_WARN([cannot find vtkSmartPointer.h])])
    204 CPPFLAGS=$save_CPPFLAGS
    205 
    206 AC_CHECK_HEADER([GL/glut.h])
    207102AC_CHECK_HEADER([GL/glew.h])
    208103
    … …  
    212107AC_CHECK_FUNCS([accept4])
    213108
    214 save_CPPFLAGS=$CPPFLAGS
     109SUBDIRS="nanoscale pymolproxy"
    215110
    216 
    217 #--------------------------------------------------------------------
    218 # search for ffmpeg executable
    219 #--------------------------------------------------------------------
    220 if test "${with_ffmpeg}" != "no" ; then
    221   if test "${with_ffmpeg}" = "yes" ; then
    222     AC_PATH_PROG(FFMPEG, ffmpeg)
    223   else
    224     AC_PATH_PROG(FFMPEG, ffmpeg, [], [${with_ffmpeg}/bin:${with_ffmpeg}])
    225   fi
    226   if test "${FFMPEG}x" != "x" ; then
    227     AC_DEFINE(HAVE_FFMPEG, 1, [nanovis can use ffmpeg to create videos.])
    228   fi
    229 fi
    230 
    231 AC_MSG_CHECKING([for nVidia Cg installation])
    232 CG_DIR=""
    233 for dir in \
    234  /opt/nvidia-cg-toolkit \
    235  /usr/cg \
    236  /usr
    237 do
    238   if test -r "$dir/include" ; then
    239     CG_DIR=$dir
    240     break
    241   fi
    242 done
    243 AC_MSG_RESULT([${CG_DIR}])
    244 
    245 CG_INC_SPEC="-I${CG_DIR}/include"
    246 
    247 save_CPPFLAGS=$CPPFLAGS
    248 CPPFLAGS="${CG_INC_SPEC} $CPPFLAGS"
    249 AC_CHECK_HEADERS([Cg/cgGL.h], [], AC_MSG_WARN([cannot find nVidia Cg headers]))
    250 CPPFLAGS=$save_CPPFLAGS
    251 
    252 CG_LIB_DIR=""
    253 for dir in \
    254  /opt/nvidia-cg-toolkit \
    255  /usr/cg \
    256  /usr
    257 do
    258   if test -r "$dir/lib" ; then
    259     CG_LIB_DIR=$dir/lib
    260     break
    261   fi
    262   if test -r "$dir/lib64" ; then
    263     CG_LIB_DIR=$dir/lib64
    264     break
    265   fi
    266 done
    267 
    268 if test "${CG_LIB_DIR}" = "/usr/lib" ; then
    269   CG_INC_SPEC=""
    270   CG_LIB_SPEC="-lCg -lCgGL"
    271 else
    272   CG_LIB_SPEC="-L${CG_LIB_DIR} -lCg -lCgGL"
    273   LD_RPATH="$loader_run_path:${CG_LIB_DIR}"
    274 fi
    275 
    276 SUBDIRS="nanoscale nanovis pymolproxy vtkvis"
    277 
    278 AC_SUBST(CFLAGS_DEBUG)
    279 AC_SUBST(CFLAGS_OPTIMIZE)
    280 AC_SUBST(CG_INC_SPEC)
    281 AC_SUBST(CG_LIB_SPEC)
    282 AC_SUBST(FFMPEG)
    283111AC_SUBST(LD_RPATH)
    284 AC_SUBST(RP_DIR)
    285 AC_SUBST(RP_INC_SPEC)
    286 AC_SUBST(RP_LIB_DIR)
    287 AC_SUBST(SHLIB_CFLAGS)
    288 AC_SUBST(SHLIB_LD)
    289 AC_SUBST(SHLIB_LDFLAGS)
    290 AC_SUBST(SHLIB_SUFFIX)
    291 AC_SUBST(SIZEOF_FLOAT)
    292 AC_SUBST(SIZEOF_INT)
    293 AC_SUBST(SIZEOF_LONG)
    294 AC_SUBST(SIZEOF_LONG_LONG)
    295 AC_SUBST(SIZEOF_VOID_P)
    296112AC_SUBST(STATSDIR)
    297 AC_SUBST(STLIB_LD)
    298113AC_SUBST(SUBDIRS)
    299114AC_SUBST(PYTHON)
    … …  
    301116AC_SUBST(TCL_LIB_SPEC)
    302117AC_SUBST(TCL_VERSION)
    303 AC_SUBST(VERSION)
    304 AC_SUBST(VTK_INC_SPEC)
    305 AC_SUBST(VTK_LIB_DIR)
    306118
    307119AC_OUTPUT([
    … …  
    309121   nanoscale/Makefile \
    310122   nanoscale/renderservers.tcl \
    311    nanovis/Doxyfile \
    312    nanovis/Makefile \
    313    nanovis/graphics/Makefile \
    314    nanovis/imgLoaders/Makefile \
    315    nanovis/newmat11/Makefile \
    316    nanovis/util/Makefile \
    317    nanovis/vrmath/Makefile \
    318123   pymolproxy/Makefile \
    319    vtkvis/Doxyfile \
    320    vtkvis/Makefile \
    321124   start_nanoscale.sh])

  • trunk/packages/vizservers/nanoscale/config.h.in

    r2448 r4060  
    1010#undef HAVE_ARPA_INET_H
    1111
    12 /* Define to 1 if you have the `avformat_alloc_context' function. */
    13 #undef HAVE_AVFORMAT_ALLOC_CONTEXT
    14 
    15 /* Define to 1 if you have the <Cg/cgGL.h> header file. */
    16 #undef HAVE_CG_CGGL_H
    17 
    18 /* Define to 1 if you have the <ffmpeg/avcodec.h> header file. */
    19 #undef HAVE_FFMPEG_AVCODEC_H
    20 
    21 /* Define to 1 if you have the <ffmpeg/avformat.h> header file. */
    22 #undef HAVE_FFMPEG_AVFORMAT_H
    23 
    24 /* Define to 1 if you have the <ffmpeg/avutil.h> header file. */
    25 #undef HAVE_FFMPEG_AVUTIL_H
    26 
    27 /* Define to 1 if you have the `img_convert' function. */
    28 #undef HAVE_IMG_CONVERT
    29 
    3012/* Define to 1 if you have the <inttypes.h> header file. */
    3113#undef HAVE_INTTYPES_H
    32 
    33 /* Define to 1 if you have the `avcodec' library (-lavcodec). */
    34 #undef HAVE_LIBAVCODEC
    35 
    36 /* Define to 1 if you have the <libavcodec/avcodec.h> header file. */
    37 #undef HAVE_LIBAVCODEC_AVCODEC_H
    38 
    39 /* Define to 1 if you have the `avformat' library (-lavformat). */
    40 #undef HAVE_LIBAVFORMAT
    41 
    42 /* Define to 1 if you have the <libavformat/avformat.h> header file. */
    43 #undef HAVE_LIBAVFORMAT_AVFORMAT_H
    44 
    45 /* Define to 1 if you have the `avutil' library (-lavutil). */
    46 #undef HAVE_LIBAVUTIL
    47 
    48 /* Define to 1 if you have the <libavutil/avutil.h> header file. */
    49 #undef HAVE_LIBAVUTIL_AVUTIL_H
    50 
    51 /* Define to 1 if you have the `highgui' library (-lhighgui). */
    52 #undef HAVE_LIBHIGHGUI
    5314
    5415/* Define to 1 if you have the <memory.h> header file. */
    … …  
    6021/* Define to 1 if you have the <netinet/in.h> header file. */
    6122#undef HAVE_NETINET_IN_H
    62 
    63 /* Define to 1 if you have the <opencv/cv.h> header file. */
    64 #undef HAVE_OPENCV_CV_H
    65 
    66 /* Define to 1 if you have the <opencv/highgui.h> header file. */
    67 #undef HAVE_OPENCV_HIGHGUI_H
    6823
    6924/* Define to 1 if you have the <stdint.h> header file. */
    … …  
    9752#undef HAVE_UNISTD_H
    9853
    99 /* Define to 1 if you have the <vtkSmartPointer.h> header file. */
    100 #undef HAVE_VTKSMARTPOINTER_H
    101 
    10254/* Define to the address where bug reports for this package should be sent. */
    10355#undef PACKAGE_BUGREPORT
    … …  
    11264#undef PACKAGE_TARNAME
    11365
     66/* Define to the home page for this package. */
     67#undef PACKAGE_URL
     68
    11469/* Define to the version of this package. */
    11570#undef PACKAGE_VERSION
    116 
    117 /* The size of `float', as computed by sizeof. */
    118 #undef SIZEOF_FLOAT
    119 
    120 /* The size of `int', as computed by sizeof. */
    121 #undef SIZEOF_INT
    122 
    123 /* The size of `long', as computed by sizeof. */
    124 #undef SIZEOF_LONG
    125 
    126 /* The size of `long long', as computed by sizeof. */
    127 #undef SIZEOF_LONG_LONG
    128 
    129 /* The size of `void *', as computed by sizeof. */
    130 #undef SIZEOF_VOID_P
    13171
    13272/* Define to 1 if you have the ANSI C header files. */

  • trunk/packages/vizservers/nanovis/CmdProc.cpp

    r4056 r4060  
    117117nv::GetOpFromObj(Tcl_Interp *interp,    /* Interpreter to report errors to */
    118118                 int nSpecs,            /* Number of specifications in array */
    119                  CmdSpec *specs,                /* Op specification array */
     119                 CmdSpec *specs,        /* Op specification array */
    120120                 int operPos,           /* Position of operation in argument
    121121                                         * list. */

  • trunk/packages/vizservers/nanovis/Makefile.in

    r3876 r4060  
    5454VRMATH_LIB_SPEC = $(VRMATH_LIB)
    5555
     56VTK_VERSION     = @VTK_VERSION@
    5657VTK_LIB_DIR     = @VTK_LIB_DIR@
    57 VTK_INC_SPEC    = @VTK_INC_SPEC@
    58 VTK_LIB_SPEC    = \
    59                 -lvtkIOCore-6.0 \
    60                 -lvtkIOLegacy-6.0 \
    61                 -lvtkFiltersCore-6.0 \
    62                 -lvtkImagingHybrid-6.0 \
    63                 -lvtkImagingCore-6.0 \
    64                 -lvtkCommonCore-6.0 \
    65                 -lvtkCommonDataModel-6.0 \
    66                 -lvtkCommonExecutionModel-6.0  \
    67                 -lvtkCommonMisc-6.0  \
    68                 -lvtkCommonSystem-6.0 \
    69                 -lvtkCommonTransforms-6.0 \
    70                 -lvtkCommonMath-6.0
     58VTK_INC_DIR     = @VTK_INC_DIR@
     59VTK_INC_SPEC    = -I$(VTK_INC_DIR)/vtk-$(VTK_VERSION)
     60VTK_LIB_SPEC    = -L$(VTK_LIB_DIR) \
     61                -lvtkIOCore-$(VTK_VERSION) \
     62                -lvtkIOLegacy-$(VTK_VERSION) \
     63                -lvtkFiltersCore-$(VTK_VERSION) \
     64                -lvtkImagingHybrid-$(VTK_VERSION) \
     65                -lvtkImagingCore-$(VTK_VERSION) \
     66                -lvtkCommonCore-$(VTK_VERSION) \
     67                -lvtkCommonDataModel-$(VTK_VERSION) \
     68                -lvtkCommonExecutionModel-$(VTK_VERSION)  \
     69                -lvtkCommonMisc-$(VTK_VERSION)  \
     70                -lvtkCommonSystem-$(VTK_VERSION) \
     71                -lvtkCommonTransforms-$(VTK_VERSION) \
     72                -lvtkCommonMath-$(VTK_VERSION)
    7173
    7274EXTRA_LIBS      = -lm -lpthread
    … …  
    7880TCL_INC_SPEC    = @TCL_INC_SPEC@
    7981
    80 LD_RUN_PATH     = $(libdir):@LD_RPATH@
     82LD_RUN_PATH     = $(VTK_LIB_DIR):$(libdir):@LD_RPATH@
    8183
    8284SVN_VERSION     = $(shell svnversion $(srcdir))

  • trunk/packages/vizservers/nanovis/nvconf.h.in

    r3559 r4060  
    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

  • trunk/packages/vizservers/pymolproxy/Makefile.in

    r3403 r4060  
    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

  • trunk/packages/vizservers/vtkvis/LIC.cpp

    r3999 r4060  
    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) {

  • trunk/packages/vizservers/vtkvis/LIC.h

    r3621 r4060  
    6767    Axis _sliceAxis;
    6868    ColorMap *_colorMap;
     69    int _resolution;
    6970
    7071    vtkSmartPointer<vtkLookupTable> _lut;

  • trunk/packages/vizservers/vtkvis/Makefile.in

    r4040 r4060  
    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.