Changeset 1114 for trunk/packages/vizservers
- Timestamp:
- Aug 18, 2008, 1:21:11 PM (16 years ago)
- Location:
- trunk/packages/vizservers
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/configure
r1113 r1114 721 721 SUBDIRS 722 722 TCL_VERSION 723 TCL_LIB_DIR 724 TCL_LIB 725 TCL_LIB_VERSION 726 TCL_INCL_DIR 723 TCL_INC_SPEC 724 TCL_LIB_SPEC 727 725 RP2_INCL_DIR 728 726 RP_DIR … … 738 736 enable_load 739 737 with_tcllib 740 with_tclinclude741 738 with_rappture 742 739 ' … … 1385 1382 --with-tcllib=DIR location of Tcl binary library libtclstubs.a 1386 1383 [default=/usr/lib] 1387 --with-tclinclude=DIR location of tcl.h header file [default=/usr/include]1388 1384 --with-rappture=DIR location of rappture files lib/librappture2.a and 1389 1385 include/rappture2/rappture2.h [default=/usr] … … 8661 8657 withval=$with_tcllib; with_tcllib=$withval 8662 8658 else 8663 with_tcllib= /usr/lib8659 with_tcllib="" 8664 8660 fi 8665 8661 … … 8679 8675 # 8680 8676 8681 for dir in ${exec_prefix} ${with_rappture} ; do 8682 tclconfig="${dir}/lib/tclConfig.sh" 8683 if test -x "$tclconfig" ; then 8677 TCL_VERSION="8.4" 8678 for dir in \ 8679 ${exec_prefix} \ 8680 ${exec_prefix}/lib \ 8681 ${with_rappture} \ 8682 ${with_rappture}/lib ; do 8683 tclconfig="${dir}/tclConfig.sh" 8684 if test -f "$tclconfig" ; then 8684 8685 . $tclconfig 8685 8686 break 8686 8687 fi 8687 8688 done 8688 8689 8690 TCL_LIB_DIR="" 8691 TCL_LIB="" 8692 TCL_LIB_VERSION="$TCL_VERSION" 8693 { $as_echo "$as_me:$LINENO: checking for tcl binary libraries" >&5 8694 $as_echo_n "checking for tcl binary libraries... " >&6; } 8689 TCL_INC_SPEC="$TCL_INCLUDE_SPEC" 8690 8695 8691 if test "x$with_tcllib" != "x" ; then 8696 if test -f "$with_tcllib" 8697 then 8698 if test -n `basename $with_tcllib | grep libtcl0-9\.0-9.so` 8699 then 8700 TCL_LIB_DIR="$with_tcllib" 8701 fi 8702 else 8703 if test -d "$with_tcllib" 8704 then 8705 if test -x "$with_tcllib/`ls $with_tcllib | grep libtcl0-9\.0-9\.so$`" 8706 then 8707 TCL_LIB_DIR="$with_tcllib" 8708 else 8709 { $as_echo "$as_me:$LINENO: result: no" >&5 8710 $as_echo "no" >&6; } 8711 { { $as_echo "$as_me:$LINENO: error: cannot find tcl binary libraries, try using --with-tcllib" >&5 8712 $as_echo "$as_me: error: cannot find tcl binary libraries, try using --with-tcllib" >&2;} 8713 { (exit 1); exit 1; }; } 8714 fi 8715 else 8716 { $as_echo "$as_me:$LINENO: result: no" >&5 8717 $as_echo "no" >&6; } 8718 { { $as_echo "$as_me:$LINENO: error: cannot find tcl binary libraries inside $with_tcllib, try using --with-tcllib" >&5 8719 $as_echo "$as_me: error: cannot find tcl binary libraries inside $with_tcllib, try using --with-tcllib" >&2;} 8720 { (exit 1); exit 1; }; } 8721 fi 8722 fi 8723 else 8724 8725 8726 for ac_header in tcl.h 8727 do 8728 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 8729 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then 8730 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 8731 $as_echo_n "checking for $ac_header... " >&6; } 8732 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then 8733 $as_echo_n "(cached) " >&6 8734 fi 8735 ac_res=`eval 'as_val=${'$as_ac_Header'} 8736 $as_echo "$as_val"'` 8737 { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 8738 $as_echo "$ac_res" >&6; } 8739 else 8740 # Is the header compilable? 8741 { $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 8742 $as_echo_n "checking $ac_header usability... " >&6; } 8743 cat >conftest.$ac_ext <<_ACEOF 8744 /* confdefs.h. */ 8745 _ACEOF 8746 cat confdefs.h >>conftest.$ac_ext 8747 cat >>conftest.$ac_ext <<_ACEOF 8748 /* end confdefs.h. */ 8749 $ac_includes_default 8750 #include <$ac_header> 8751 _ACEOF 8752 rm -f conftest.$ac_objext 8753 if { (ac_try="$ac_compile" 8754 case "(($ac_try" in 8755 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 8756 *) ac_try_echo=$ac_try;; 8757 esac 8758 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" 8759 $as_echo "$ac_try_echo") >&5 8760 (eval "$ac_compile") 2>conftest.er1 8761 ac_status=$? 8762 grep -v '^ *+' conftest.er1 >conftest.err 8763 rm -f conftest.er1 8764 cat conftest.err >&5 8765 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 8766 (exit $ac_status); } && { 8767 test -z "$ac_cxx_werror_flag" || 8768 test ! -s conftest.err 8769 } && test -s conftest.$ac_objext; then 8770 ac_header_compiler=yes 8771 else 8772 $as_echo "$as_me: failed program was:" >&5 8773 sed 's/^/| /' conftest.$ac_ext >&5 8774 8775 ac_header_compiler=no 8776 fi 8777 8778 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 8779 { $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 8780 $as_echo "$ac_header_compiler" >&6; } 8781 8782 # Is the header present? 8783 { $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 8784 $as_echo_n "checking $ac_header presence... " >&6; } 8785 cat >conftest.$ac_ext <<_ACEOF 8786 /* confdefs.h. */ 8787 _ACEOF 8788 cat confdefs.h >>conftest.$ac_ext 8789 cat >>conftest.$ac_ext <<_ACEOF 8790 /* end confdefs.h. */ 8791 #include <$ac_header> 8792 _ACEOF 8793 if { (ac_try="$ac_cpp conftest.$ac_ext" 8794 case "(($ac_try" in 8795 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 8796 *) ac_try_echo=$ac_try;; 8797 esac 8798 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" 8799 $as_echo "$ac_try_echo") >&5 8800 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 8801 ac_status=$? 8802 grep -v '^ *+' conftest.er1 >conftest.err 8803 rm -f conftest.er1 8804 cat conftest.err >&5 8805 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 8806 (exit $ac_status); } >/dev/null && { 8807 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || 8808 test ! -s conftest.err 8809 }; then 8810 ac_header_preproc=yes 8811 else 8812 $as_echo "$as_me: failed program was:" >&5 8813 sed 's/^/| /' conftest.$ac_ext >&5 8814 8815 ac_header_preproc=no 8816 fi 8817 8818 rm -f conftest.err conftest.$ac_ext 8819 { $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 8820 $as_echo "$ac_header_preproc" >&6; } 8821 8822 # So? What about this header? 8823 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in 8824 yes:no: ) 8825 { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 8826 $as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 8827 { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 8828 $as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 8829 ac_header_preproc=yes 8830 ;; 8831 no:yes:* ) 8832 { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 8833 $as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 8834 { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 8835 $as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 8836 { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 8837 $as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 8838 { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 8839 $as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 8840 { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 8841 $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 8842 { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 8843 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 8844 ( cat <<\_ASBOX 8845 ## ----------------------------------- ## 8846 ## Report this to rappture@nanohub.org ## 8847 ## ----------------------------------- ## 8848 _ASBOX 8849 ) | sed "s/^/$as_me: WARNING: /" >&2 8850 ;; 8851 esac 8852 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 8853 $as_echo_n "checking for $ac_header... " >&6; } 8854 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then 8855 $as_echo_n "(cached) " >&6 8856 else 8857 eval "$as_ac_Header=\$ac_header_preproc" 8858 fi 8859 ac_res=`eval 'as_val=${'$as_ac_Header'} 8860 $as_echo "$as_val"'` 8861 { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 8862 $as_echo "$ac_res" >&6; } 8863 8864 fi 8865 if test `eval 'as_val=${'$as_ac_Header'} 8866 $as_echo "$as_val"'` = yes; then 8867 cat >>confdefs.h <<_ACEOF 8868 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 8869 _ACEOF 8870 8871 else 8872 { { $as_echo "$as_me:$LINENO: error: cannot find tcl.h, try using --with-tclinclude" >&5 8873 $as_echo "$as_me: error: cannot find tcl.h, try using --with-tclinclude" >&2;} 8874 { (exit 1); exit 1; }; } 8875 fi 8876 8877 done 8878 8879 fi 8880 # TCL_LIB=$(ls ${TCL_LIB_DIR} | grep -o libtcl[0-9]\.[0-9]) 8881 # TCL_LIB=`ls ${TCL_LIB_DIR} | awk '/libtcl([0-9]\.?[0-9])?\.so/ { print }'` 8882 # TCL_LIB=`ls ${TCL_LIB_DIR} | sed -e '/libtcl([0-9]\.?[0-9])?\.so$/ {p}'` 8883 # TCL_LIB_VERSION=$(echo ${TCL_LIB} | sed -e s/libtcl// -e s/\.so//) 8884 { $as_echo "$as_me:$LINENO: result: ${TCL_LIB_DIR}/${TCL_LIB}" >&5 8885 $as_echo "${TCL_LIB_DIR}/${TCL_LIB}" >&6; } 8886 # echo TCL_LIB_DIR = ${TCL_LIB_DIR} 8887 # echo TCL_LIB = ${TCL_LIB} 8888 # echo TCL_LIB_VERSION = ${TCL_LIB_VERSION} 8889 8890 8891 8892 8893 8894 # Check whether --with-tclinclude was given. 8895 if test "${with_tclinclude+set}" = set; then 8896 withval=$with_tclinclude; with_tclinclude=$withval 8897 else 8898 with_tclinclude=/usr/include 8899 fi 8900 8901 8902 TCL_INCL_DIR="" 8903 { $as_echo "$as_me:$LINENO: checking for tcl.h" >&5 8904 $as_echo_n "checking for tcl.h... " >&6; } 8692 tclconfig="${with_tcllib}/tclConfig.sh" 8693 if test -f "$tclconfig" ; then 8694 . $tclconfig 8695 fi 8696 TCL_LIB_SPEC="-L${with_tcllib} -ltcl${TCL_VERSION}" 8697 fi 8905 8698 if test "x$with_tclinclude" != "x" ; then 8906 if test -f "$with_tclinclude" 8907 then 8908 if test `basename $with_tclinclude` = "tcl.h" 8909 then 8910 TCL_INCL_DIR="`dirname $with_tclinclude`" 8911 fi 8912 else 8913 if test -d "$with_tclinclude" 8914 then 8915 if test -r "$with_tclinclude/tcl.h" 8916 then 8917 TCL_INCL_DIR="$with_tclinclude" 8918 else 8919 if test -r "$with_tclinclude/tcl${TCL_LIB_VERSION}/tcl.h" 8920 then 8921 TCL_INCL_DIR="$with_tclinclude/tcl${TCL_LIB_VERSION}" 8922 else 8923 { $as_echo "$as_me:$LINENO: result: no" >&5 8924 $as_echo "no" >&6; } 8925 { { $as_echo "$as_me:$LINENO: error: cannot find tcl.h, try using --with-tclinclude" >&5 8926 $as_echo "$as_me: error: cannot find tcl.h, try using --with-tclinclude" >&2;} 8927 { (exit 1); exit 1; }; } 8928 fi 8929 fi 8930 else 8931 { $as_echo "$as_me:$LINENO: result: no" >&5 8932 $as_echo "no" >&6; } 8933 { { $as_echo "$as_me:$LINENO: error: cannot find tcl.h inside $with_tclinclude, try using --with-tclinclude" >&5 8934 $as_echo "$as_me: error: cannot find tcl.h inside $with_tclinclude, try using --with-tclinclude" >&2;} 8935 { (exit 1); exit 1; }; } 8936 fi 8937 fi 8938 else 8939 8940 for ac_header in tcl.h 8941 do 8942 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 8943 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then 8944 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 8945 $as_echo_n "checking for $ac_header... " >&6; } 8946 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then 8947 $as_echo_n "(cached) " >&6 8948 fi 8949 ac_res=`eval 'as_val=${'$as_ac_Header'} 8950 $as_echo "$as_val"'` 8951 { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 8952 $as_echo "$ac_res" >&6; } 8953 else 8954 # Is the header compilable? 8955 { $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 8956 $as_echo_n "checking $ac_header usability... " >&6; } 8957 cat >conftest.$ac_ext <<_ACEOF 8958 /* confdefs.h. */ 8959 _ACEOF 8960 cat confdefs.h >>conftest.$ac_ext 8961 cat >>conftest.$ac_ext <<_ACEOF 8962 /* end confdefs.h. */ 8963 $ac_includes_default 8964 #include <$ac_header> 8965 _ACEOF 8966 rm -f conftest.$ac_objext 8967 if { (ac_try="$ac_compile" 8968 case "(($ac_try" in 8969 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 8970 *) ac_try_echo=$ac_try;; 8971 esac 8972 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" 8973 $as_echo "$ac_try_echo") >&5 8974 (eval "$ac_compile") 2>conftest.er1 8975 ac_status=$? 8976 grep -v '^ *+' conftest.er1 >conftest.err 8977 rm -f conftest.er1 8978 cat conftest.err >&5 8979 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 8980 (exit $ac_status); } && { 8981 test -z "$ac_cxx_werror_flag" || 8982 test ! -s conftest.err 8983 } && test -s conftest.$ac_objext; then 8984 ac_header_compiler=yes 8985 else 8986 $as_echo "$as_me: failed program was:" >&5 8987 sed 's/^/| /' conftest.$ac_ext >&5 8988 8989 ac_header_compiler=no 8990 fi 8991 8992 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 8993 { $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 8994 $as_echo "$ac_header_compiler" >&6; } 8995 8996 # Is the header present? 8997 { $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 8998 $as_echo_n "checking $ac_header presence... " >&6; } 8999 cat >conftest.$ac_ext <<_ACEOF 9000 /* confdefs.h. */ 9001 _ACEOF 9002 cat confdefs.h >>conftest.$ac_ext 9003 cat >>conftest.$ac_ext <<_ACEOF 9004 /* end confdefs.h. */ 9005 #include <$ac_header> 9006 _ACEOF 9007 if { (ac_try="$ac_cpp conftest.$ac_ext" 9008 case "(($ac_try" in 9009 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 9010 *) ac_try_echo=$ac_try;; 9011 esac 9012 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" 9013 $as_echo "$ac_try_echo") >&5 9014 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 9015 ac_status=$? 9016 grep -v '^ *+' conftest.er1 >conftest.err 9017 rm -f conftest.er1 9018 cat conftest.err >&5 9019 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 9020 (exit $ac_status); } >/dev/null && { 9021 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || 9022 test ! -s conftest.err 9023 }; then 9024 ac_header_preproc=yes 9025 else 9026 $as_echo "$as_me: failed program was:" >&5 9027 sed 's/^/| /' conftest.$ac_ext >&5 9028 9029 ac_header_preproc=no 9030 fi 9031 9032 rm -f conftest.err conftest.$ac_ext 9033 { $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 9034 $as_echo "$ac_header_preproc" >&6; } 9035 9036 # So? What about this header? 9037 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in 9038 yes:no: ) 9039 { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 9040 $as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 9041 { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 9042 $as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 9043 ac_header_preproc=yes 9044 ;; 9045 no:yes:* ) 9046 { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 9047 $as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 9048 { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 9049 $as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 9050 { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 9051 $as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 9052 { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 9053 $as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 9054 { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 9055 $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 9056 { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 9057 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 9058 ( cat <<\_ASBOX 9059 ## ----------------------------------- ## 9060 ## Report this to rappture@nanohub.org ## 9061 ## ----------------------------------- ## 9062 _ASBOX 9063 ) | sed "s/^/$as_me: WARNING: /" >&2 9064 ;; 9065 esac 9066 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 9067 $as_echo_n "checking for $ac_header... " >&6; } 9068 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then 9069 $as_echo_n "(cached) " >&6 9070 else 9071 eval "$as_ac_Header=\$ac_header_preproc" 9072 fi 9073 ac_res=`eval 'as_val=${'$as_ac_Header'} 9074 $as_echo "$as_val"'` 9075 { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 9076 $as_echo "$ac_res" >&6; } 9077 9078 fi 9079 if test `eval 'as_val=${'$as_ac_Header'} 9080 $as_echo "$as_val"'` = yes; then 9081 cat >>confdefs.h <<_ACEOF 9082 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 9083 _ACEOF 9084 9085 else 9086 { { $as_echo "$as_me:$LINENO: error: cannot find tcl.h, try using --with-tclinclude" >&5 9087 $as_echo "$as_me: error: cannot find tcl.h, try using --with-tclinclude" >&2;} 9088 { (exit 1); exit 1; }; } 9089 fi 9090 9091 done 9092 9093 fi 9094 { $as_echo "$as_me:$LINENO: result: ${TCL_INCL_DIR}" >&5 9095 $as_echo "${TCL_INCL_DIR}" >&6; } 8699 TCL_INC_SPEC="-I${with_tclinclude}" 8700 fi 8701 8702 8703 9096 8704 9097 8705 … … 9149 8757 fi 9150 8758 else 8759 9151 8760 9152 8761 for ac_header in rappture.h -
trunk/packages/vizservers/configure.in
r1113 r1114 53 53 [location of Tcl binary library libtclstubs.a @<:@default=/usr/lib@:>@])], 54 54 [with_tcllib=$withval], 55 [with_tcllib= /usr/lib])55 [with_tcllib=""]) 56 56 57 57 # … … 69 69 # 70 70 71 for dir in ${exec_prefix} ${with_rappture} ; do 72 tclconfig="${dir}/lib/tclConfig.sh" 73 if test -x "$tclconfig" ; then 71 TCL_VERSION="8.4" 72 for dir in \ 73 ${exec_prefix} \ 74 ${exec_prefix}/lib \ 75 ${with_rappture} \ 76 ${with_rappture}/lib ; do 77 tclconfig="${dir}/tclConfig.sh" 78 if test -f "$tclconfig" ; then 74 79 . $tclconfig 75 80 break 76 81 fi 77 82 done 83 TCL_INC_SPEC="$TCL_INCLUDE_SPEC" 84 85 if test "x$with_tcllib" != "x" ; then 86 tclconfig="${with_tcllib}/tclConfig.sh" 87 if test -f "$tclconfig" ; then 88 . $tclconfig 89 fi 90 TCL_LIB_SPEC="-L${with_tcllib} -ltcl${TCL_VERSION}" 91 fi 92 if test "x$with_tclinclude" != "x" ; then 93 TCL_INC_SPEC="-I${with_tclinclude}" 94 fi 78 95 79 96 AC_SUBST(TCL_VERSION) 80 TCL_LIB_DIR="" 81 TCL_LIB="" 82 TCL_LIB_VERSION="$TCL_VERSION" 83 AC_MSG_CHECKING([for tcl binary libraries]) 84 if test "x$with_tcllib" != "x" ; then 85 if test -f "$with_tcllib" 86 then 87 if test -n `basename $with_tcllib | grep libtcl[0-9]\.[0-9].so` 88 then 89 TCL_LIB_DIR="$with_tcllib" 90 fi 91 else 92 if test -d "$with_tcllib" 93 then 94 if test -x "$with_tcllib/`ls $with_tcllib | grep libtcl[0-9]\.[0-9]\.so$`" 95 then 96 TCL_LIB_DIR="$with_tcllib" 97 else 98 AC_MSG_RESULT([no]) 99 AC_MSG_ERROR([cannot find tcl binary libraries, try using --with-tcllib]) 100 fi 101 else 102 AC_MSG_RESULT([no]) 103 AC_MSG_ERROR([cannot find tcl binary libraries inside $with_tcllib, try using --with-tcllib]) 104 fi 105 fi 106 else 107 AC_CHECK_HEADERS([tcl.h], [], 108 [AC_MSG_ERROR([cannot find tcl.h, try using --with-tclinclude])]) 109 fi 110 # TCL_LIB=$(ls ${TCL_LIB_DIR} | grep -o libtcl[0-9]\.[0-9]) 111 # TCL_LIB=`ls ${TCL_LIB_DIR} | awk '/libtcl([0-9]\.?[0-9])?\.so/ { print }'` 112 # TCL_LIB=`ls ${TCL_LIB_DIR} | sed -e '/libtcl([0-9]\.?[0-9])?\.so$/ {p}'` 113 # TCL_LIB_VERSION=$(echo ${TCL_LIB} | sed -e s/libtcl// -e s/\.so//) 114 AC_MSG_RESULT([${TCL_LIB_DIR}/${TCL_LIB}]) 115 # echo TCL_LIB_DIR = ${TCL_LIB_DIR} 116 # echo TCL_LIB = ${TCL_LIB} 117 # echo TCL_LIB_VERSION = ${TCL_LIB_VERSION} 118 AC_SUBST(TCL_LIB_DIR) 119 AC_SUBST(TCL_LIB) 120 AC_SUBST(TCL_LIB_VERSION) 121 122 AC_ARG_WITH( 123 [tclinclude], 124 [AS_HELP_STRING([--with-tclinclude[=DIR]], 125 [location of tcl.h header file @<:@default=/usr/include@:>@])], 126 [with_tclinclude=$withval], 127 [with_tclinclude=/usr/include]) 128 129 TCL_INCL_DIR="" 130 AC_MSG_CHECKING([for tcl.h]) 131 if test "x$with_tclinclude" != "x" ; then 132 if test -f "$with_tclinclude" 133 then 134 if test `basename $with_tclinclude` = "tcl.h" 135 then 136 TCL_INCL_DIR="`dirname $with_tclinclude`" 137 fi 138 else 139 if test -d "$with_tclinclude" 140 then 141 if test -r "$with_tclinclude/tcl.h" 142 then 143 TCL_INCL_DIR="$with_tclinclude" 144 else 145 if test -r "$with_tclinclude/tcl${TCL_LIB_VERSION}/tcl.h" 146 then 147 TCL_INCL_DIR="$with_tclinclude/tcl${TCL_LIB_VERSION}" 148 else 149 AC_MSG_RESULT([no]) 150 AC_MSG_ERROR([cannot find tcl.h, try using --with-tclinclude]) 151 fi 152 fi 153 else 154 AC_MSG_RESULT([no]) 155 AC_MSG_ERROR([cannot find tcl.h inside $with_tclinclude, try using --with-tclinclude]) 156 fi 157 fi 158 else 159 AC_CHECK_HEADERS([tcl.h], [], 160 [AC_MSG_ERROR([cannot find tcl.h, try using --with-tclinclude])]) 161 fi 162 AC_MSG_RESULT([${TCL_INCL_DIR}]) 163 AC_SUBST(TCL_INCL_DIR) 97 AC_SUBST(TCL_INC_SPEC) 98 AC_SUBST(TCL_LIB_SPEC) 164 99 165 100 AC_ARG_WITH( -
trunk/packages/vizservers/nanoscale/clientlib.c
r409 r1114 7 7 #include <sys/time.h> 8 8 #include <netinet/in.h> 9 #include <arpa/inet.h> 9 10 #include <netdb.h> 10 11 -
trunk/packages/vizservers/nanovis/Makefile.in
r1082 r1114 57 57 TF_LIB_SPEC = $(TF_LIB) 58 58 59 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 60 TCL_INC_SPEC = @TCL_INC_SPEC@ 61 59 62 LIBS = \ 60 63 $(RP_LIB_SPEC) \ … … 64 67 $(TF_LIB_SPEC) \ 65 68 $(MAT_LIB_SPEC) \ 66 -ltcl8.4\69 $(TCL_LIB_SPEC) \ 67 70 $(GL_LIB_SPEC) 68 71 69 72 INCLUDES = \ 70 73 -I$(srcdir) \ 74 $(TCL_INC_SPEC) \ 71 75 $(RP_INC_SPEC) \ 72 76 $(GL_INC_SPEC) \ -
trunk/packages/vizservers/nanovis/R2/src/R2FilePath.cpp
r1111 r1114 44 44 strcpy(buff, filePath); 45 45 for (p = strtok(buff, seps); p != NULL; p = strtok(NULL, seps)) { 46 int lastIndex;47 46 char *last; 48 47 struct stat buf; -
trunk/packages/vizservers/pymolproxy/Makefile.in
r1082 r1114 2 2 TARGETS = pymolproxy 3 3 4 TCL_INC_SPEC = @TCL_INC_SPEC@ 5 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 4 6 CC = @CC@ 5 INCLUDES = -I@TCL_INCL_DIR@7 INCLUDES = $(TCL_INC_SPEC) 6 8 CFLAGS = @CFLAGS@ 7 9 EXTRA_CFLAGS = -Wall … … 27 29 28 30 OBJS = pymolproxy.o 29 LIBS = -ltcl8.431 LIBS = $(TCL_LIB_SPEC) 30 32 31 33 all: $(TARGETS)
Note: See TracChangeset
for help on using the changeset viewer.