- Timestamp:
- Aug 24, 2010, 7:45:35 AM (14 years ago)
- Location:
- branches/blt4
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/blt4/configure.in
r1780 r1874 633 633 634 634 SC_ENABLE_SYMBOLS 635 636 if test "${SHARED_BUILD}" = "1" ; then637 CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING} ${SHLIB_CFLAGS}'638 else639 CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING}'640 fi641 635 642 636 ac_configure_args="--disable-threads --enable-shared" -
branches/blt4/packages/vizservers/configure
r1823 r1874 606 606 TCL_VERSION 607 607 SUBDIRS 608 SIZEOF_FLOAT 609 SIZEOF_VOID_P 610 SIZEOF_LONG_LONG 611 SIZEOF_LONG 612 SIZEOF_INT 608 613 CXXCPP 609 614 ac_ct_CXX … … 1832 1837 } # ac_fn_cxx_try_run 1833 1838 1839 # ac_fn_cxx_compute_int LINENO EXPR VAR INCLUDES 1840 # ---------------------------------------------- 1841 # Tries to find the compile-time value of EXPR in a program that includes 1842 # INCLUDES, setting VAR accordingly. Returns whether the value could be 1843 # computed 1844 ac_fn_cxx_compute_int () 1845 { 1846 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1847 if test "$cross_compiling" = yes; then 1848 # Depending upon the size, compute the lo and hi bounds. 1849 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1850 /* end confdefs.h. */ 1851 $4 1852 int 1853 main () 1854 { 1855 static int test_array [1 - 2 * !(($2) >= 0)]; 1856 test_array [0] = 0 1857 1858 ; 1859 return 0; 1860 } 1861 _ACEOF 1862 if ac_fn_cxx_try_compile "$LINENO"; then : 1863 ac_lo=0 ac_mid=0 1864 while :; do 1865 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1866 /* end confdefs.h. */ 1867 $4 1868 int 1869 main () 1870 { 1871 static int test_array [1 - 2 * !(($2) <= $ac_mid)]; 1872 test_array [0] = 0 1873 1874 ; 1875 return 0; 1876 } 1877 _ACEOF 1878 if ac_fn_cxx_try_compile "$LINENO"; then : 1879 ac_hi=$ac_mid; break 1880 else 1881 as_fn_arith $ac_mid + 1 && ac_lo=$as_val 1882 if test $ac_lo -le $ac_mid; then 1883 ac_lo= ac_hi= 1884 break 1885 fi 1886 as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val 1887 fi 1888 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 1889 done 1890 else 1891 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1892 /* end confdefs.h. */ 1893 $4 1894 int 1895 main () 1896 { 1897 static int test_array [1 - 2 * !(($2) < 0)]; 1898 test_array [0] = 0 1899 1900 ; 1901 return 0; 1902 } 1903 _ACEOF 1904 if ac_fn_cxx_try_compile "$LINENO"; then : 1905 ac_hi=-1 ac_mid=-1 1906 while :; do 1907 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1908 /* end confdefs.h. */ 1909 $4 1910 int 1911 main () 1912 { 1913 static int test_array [1 - 2 * !(($2) >= $ac_mid)]; 1914 test_array [0] = 0 1915 1916 ; 1917 return 0; 1918 } 1919 _ACEOF 1920 if ac_fn_cxx_try_compile "$LINENO"; then : 1921 ac_lo=$ac_mid; break 1922 else 1923 as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val 1924 if test $ac_mid -le $ac_hi; then 1925 ac_lo= ac_hi= 1926 break 1927 fi 1928 as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val 1929 fi 1930 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 1931 done 1932 else 1933 ac_lo= ac_hi= 1934 fi 1935 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 1936 fi 1937 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 1938 # Binary search between lo and hi bounds. 1939 while test "x$ac_lo" != "x$ac_hi"; do 1940 as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val 1941 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1942 /* end confdefs.h. */ 1943 $4 1944 int 1945 main () 1946 { 1947 static int test_array [1 - 2 * !(($2) <= $ac_mid)]; 1948 test_array [0] = 0 1949 1950 ; 1951 return 0; 1952 } 1953 _ACEOF 1954 if ac_fn_cxx_try_compile "$LINENO"; then : 1955 ac_hi=$ac_mid 1956 else 1957 as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val 1958 fi 1959 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 1960 done 1961 case $ac_lo in #(( 1962 ?*) eval "$3=\$ac_lo"; ac_retval=0 ;; 1963 '') ac_retval=1 ;; 1964 esac 1965 else 1966 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1967 /* end confdefs.h. */ 1968 $4 1969 static long int longval () { return $2; } 1970 static unsigned long int ulongval () { return $2; } 1971 #include <stdio.h> 1972 #include <stdlib.h> 1973 int 1974 main () 1975 { 1976 1977 FILE *f = fopen ("conftest.val", "w"); 1978 if (! f) 1979 return 1; 1980 if (($2) < 0) 1981 { 1982 long int i = longval (); 1983 if (i != ($2)) 1984 return 1; 1985 fprintf (f, "%ld", i); 1986 } 1987 else 1988 { 1989 unsigned long int i = ulongval (); 1990 if (i != ($2)) 1991 return 1; 1992 fprintf (f, "%lu", i); 1993 } 1994 /* Do not output a trailing newline, as this causes \r\n confusion 1995 on some platforms. */ 1996 return ferror (f) || fclose (f) != 0; 1997 1998 ; 1999 return 0; 2000 } 2001 _ACEOF 2002 if ac_fn_cxx_try_run "$LINENO"; then : 2003 echo >>conftest.val; read $3 <conftest.val; ac_retval=0 2004 else 2005 ac_retval=1 2006 fi 2007 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ 2008 conftest.$ac_objext conftest.beam conftest.$ac_ext 2009 rm -f conftest.val 2010 2011 fi 2012 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2013 as_fn_set_status $ac_retval 2014 2015 } # ac_fn_cxx_compute_int 2016 1834 2017 # ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES 1835 2018 # --------------------------------------------------------- … … 1924 2107 1925 2108 } # ac_fn_cxx_check_header_mongrel 2109 2110 # ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES 2111 # --------------------------------------------------------- 2112 # Tests whether HEADER exists and can be compiled using the include files in 2113 # INCLUDES, setting the cache variable VAR accordingly. 2114 ac_fn_cxx_check_header_compile () 2115 { 2116 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2117 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2118 $as_echo_n "checking for $2... " >&6; } 2119 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2120 $as_echo_n "(cached) " >&6 2121 else 2122 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2123 /* end confdefs.h. */ 2124 $4 2125 #include <$2> 2126 _ACEOF 2127 if ac_fn_cxx_try_compile "$LINENO"; then : 2128 eval "$3=yes" 2129 else 2130 eval "$3=no" 2131 fi 2132 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 2133 fi 2134 eval ac_res=\$$3 2135 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 2136 $as_echo "$ac_res" >&6; } 2137 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2138 2139 } # ac_fn_cxx_check_header_compile 1926 2140 1927 2141 # ac_fn_cxx_try_link LINENO … … 7333 7547 esac 7334 7548 7549 # The cast to long int works around a bug in the HP C Compiler 7550 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 7551 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 7552 # This bug is HP SR number 8606223364. 7553 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 7554 $as_echo_n "checking size of int... " >&6; } 7555 if test "${ac_cv_sizeof_int+set}" = set; then : 7556 $as_echo_n "(cached) " >&6 7557 else 7558 if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : 7559 7560 else 7561 if test "$ac_cv_type_int" = yes; then 7562 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 7563 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 7564 { as_fn_set_status 77 7565 as_fn_error "cannot compute sizeof (int) 7566 See \`config.log' for more details." "$LINENO" 5; }; } 7567 else 7568 ac_cv_sizeof_int=0 7569 fi 7570 fi 7571 7572 fi 7573 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 7574 $as_echo "$ac_cv_sizeof_int" >&6; } 7575 7576 7577 7578 cat >>confdefs.h <<_ACEOF 7579 #define SIZEOF_INT $ac_cv_sizeof_int 7580 _ACEOF 7581 7582 7583 # The cast to long int works around a bug in the HP C Compiler 7584 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 7585 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 7586 # This bug is HP SR number 8606223364. 7587 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 7588 $as_echo_n "checking size of long... " >&6; } 7589 if test "${ac_cv_sizeof_long+set}" = set; then : 7590 $as_echo_n "(cached) " >&6 7591 else 7592 if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : 7593 7594 else 7595 if test "$ac_cv_type_long" = yes; then 7596 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 7597 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 7598 { as_fn_set_status 77 7599 as_fn_error "cannot compute sizeof (long) 7600 See \`config.log' for more details." "$LINENO" 5; }; } 7601 else 7602 ac_cv_sizeof_long=0 7603 fi 7604 fi 7605 7606 fi 7607 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 7608 $as_echo "$ac_cv_sizeof_long" >&6; } 7609 7610 7611 7612 cat >>confdefs.h <<_ACEOF 7613 #define SIZEOF_LONG $ac_cv_sizeof_long 7614 _ACEOF 7615 7616 7617 # The cast to long int works around a bug in the HP C Compiler 7618 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 7619 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 7620 # This bug is HP SR number 8606223364. 7621 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 7622 $as_echo_n "checking size of long long... " >&6; } 7623 if test "${ac_cv_sizeof_long_long+set}" = set; then : 7624 $as_echo_n "(cached) " >&6 7625 else 7626 if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then : 7627 7628 else 7629 if test "$ac_cv_type_long_long" = yes; then 7630 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 7631 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 7632 { as_fn_set_status 77 7633 as_fn_error "cannot compute sizeof (long long) 7634 See \`config.log' for more details." "$LINENO" 5; }; } 7635 else 7636 ac_cv_sizeof_long_long=0 7637 fi 7638 fi 7639 7640 fi 7641 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 7642 $as_echo "$ac_cv_sizeof_long_long" >&6; } 7643 7644 7645 7646 cat >>confdefs.h <<_ACEOF 7647 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long 7648 _ACEOF 7649 7650 7651 # The cast to long int works around a bug in the HP C Compiler 7652 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 7653 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 7654 # This bug is HP SR number 8606223364. 7655 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 7656 $as_echo_n "checking size of void *... " >&6; } 7657 if test "${ac_cv_sizeof_void_p+set}" = set; then : 7658 $as_echo_n "(cached) " >&6 7659 else 7660 if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : 7661 7662 else 7663 if test "$ac_cv_type_void_p" = yes; then 7664 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 7665 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 7666 { as_fn_set_status 77 7667 as_fn_error "cannot compute sizeof (void *) 7668 See \`config.log' for more details." "$LINENO" 5; }; } 7669 else 7670 ac_cv_sizeof_void_p=0 7671 fi 7672 fi 7673 7674 fi 7675 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 7676 $as_echo "$ac_cv_sizeof_void_p" >&6; } 7677 7678 7679 7680 cat >>confdefs.h <<_ACEOF 7681 #define SIZEOF_VOID_P $ac_cv_sizeof_void_p 7682 _ACEOF 7683 7684 7685 # The cast to long int works around a bug in the HP C Compiler 7686 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 7687 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 7688 # This bug is HP SR number 8606223364. 7689 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float" >&5 7690 $as_echo_n "checking size of float... " >&6; } 7691 if test "${ac_cv_sizeof_float+set}" = set; then : 7692 $as_echo_n "(cached) " >&6 7693 else 7694 if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float" "$ac_includes_default"; then : 7695 7696 else 7697 if test "$ac_cv_type_float" = yes; then 7698 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 7699 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 7700 { as_fn_set_status 77 7701 as_fn_error "cannot compute sizeof (float) 7702 See \`config.log' for more details." "$LINENO" 5; }; } 7703 else 7704 ac_cv_sizeof_float=0 7705 fi 7706 fi 7707 7708 fi 7709 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_float" >&5 7710 $as_echo "$ac_cv_sizeof_float" >&6; } 7711 7712 7713 7714 cat >>confdefs.h <<_ACEOF 7715 #define SIZEOF_FLOAT $ac_cv_sizeof_float 7716 _ACEOF 7717 7718 7719 7720 # Save the values as shell variables so that we can substitute them 7721 # into bltHash.h for situtations where there's no bltInt.h. 7722 7723 SIZEOF_INT=${ac_cv_sizeof_int} 7724 7725 SIZEOF_LONG=${ac_cv_sizeof_long} 7726 7727 SIZEOF_LONG_LONG=${ac_cv_sizeof_long_long} 7728 7729 SIZEOF_VOID_P=${ac_cv_sizeof_void_p} 7730 7731 SIZEOF_FLOAT=${ac_cv_sizeof_float} 7732 7335 7733 7336 7734 LD_RPATH=""; … … 7579 7977 do : 7580 7978 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 7581 ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 7979 ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " 7980 #define SIZEOF_LONG ${ac_cv_sizeof_long} 7981 #if SIZEOF_LONG == 8 7982 # define INT64_C(c) c ## L 7983 # define UINT64_C(c) c ## UL 7984 #else 7985 # define INT64_C(c) c ## LL 7986 # define UINT64_C(c) c ## ULL 7987 #endif 7988 7989 " 7582 7990 eval as_val=\$$as_ac_Header 7583 7991 if test "x$as_val" = x""yes; then : -
branches/blt4/packages/vizservers/configure.in
r1823 r1874 45 45 46 46 AC_C_BIGENDIAN 47 AC_CHECK_SIZEOF(int, 4) 48 AC_CHECK_SIZEOF(long, 4) 49 AC_CHECK_SIZEOF(long long, 8) 50 AC_CHECK_SIZEOF(void *, 4) 51 AC_CHECK_SIZEOF(float, 4) 52 53 # Save the values as shell variables so that we can substitute them 54 # into bltHash.h for situtations where there's no bltInt.h. 55 56 AC_SUBST(SIZEOF_INT, ${ac_cv_sizeof_int}) 57 AC_SUBST(SIZEOF_LONG, ${ac_cv_sizeof_long}) 58 AC_SUBST(SIZEOF_LONG_LONG, ${ac_cv_sizeof_long_long}) 59 AC_SUBST(SIZEOF_VOID_P, ${ac_cv_sizeof_void_p}) 60 AC_SUBST(SIZEOF_FLOAT, ${ac_cv_sizeof_float}) 47 61 48 62 LD_RPATH=""; … … 209 223 AC_MSG_RESULT([${DX_LIB_DIR}]) 210 224 211 AC_CHECK_HEADERS([ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h]) 225 AC_CHECK_HEADERS([ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h],,,[ 226 #define SIZEOF_LONG ${ac_cv_sizeof_long} 227 #if SIZEOF_LONG == 8 228 # define INT64_C(c) c ## L 229 # define UINT64_C(c) c ## UL 230 #else 231 # define INT64_C(c) c ## LL 232 # define UINT64_C(c) c ## ULL 233 #endif 234 ]) 212 235 213 236 oldLIBS=$LIBS -
branches/blt4/packages/vizservers/nanovis/RpAVTranslate.h
r1798 r1874 18 18 19 19 extern "C" { 20 #define __STDC_CONSTANT_MACROS 1 20 #ifndef INT64_C 21 #if SIZEOF_LONG == 8 22 # define INT64_C(c) c ## L 23 # define UINT64_C(c) c ## UL 24 #else 25 # define INT64_C(c) c ## LL 26 # define UINT64_C(c) c ## ULL 27 # endif 28 #endif 21 29 #ifdef HAVE_FFMPEG_AVFORMAT_H 22 30 #include <ffmpeg/avformat.h> -
branches/blt4/packages/vizservers/nanovis/nanovis.cpp
r1823 r1874 30 30 #include <string> 31 31 #include <sys/resource.h> 32 #include <sys/stat.h> 32 33 #include <sys/time.h> 33 34 #include <sys/times.h> -
branches/blt4/packages/vizservers/nanovis/nvconf.h.in
r1823 r1874 88 88 #undef PACKAGE_TARNAME 89 89 90 /* Define to the home page for this package. */ 91 #undef PACKAGE_URL 92 90 93 /* Define to the version of this package. */ 91 94 #undef PACKAGE_VERSION 95 96 /* The size of `float', as computed by sizeof. */ 97 #undef SIZEOF_FLOAT 98 99 /* The size of `int', as computed by sizeof. */ 100 #undef SIZEOF_INT 101 102 /* The size of `long', as computed by sizeof. */ 103 #undef SIZEOF_LONG 104 105 /* The size of `long long', as computed by sizeof. */ 106 #undef SIZEOF_LONG_LONG 107 108 /* The size of `void *', as computed by sizeof. */ 109 #undef SIZEOF_VOID_P 92 110 93 111 /* Define to 1 if you have the ANSI C header files. */
Note: See TracChangeset
for help on using the changeset viewer.