- Timestamp:
- Aug 22, 2010, 4:46:24 PM (14 years ago)
- Location:
- trunk/gui
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gui/configure
r1867 r1869 1979 1979 1980 1980 1981 gui_with_tcl="" 1982 1981 1983 make_command="" 1982 1984 for m in "$MAKE" make gmake gnumake ; do … … 2074 2076 fi 2075 2077 fi 2078 2079 # ----------------------------------------------------------------------- 2080 # 2081 # Find the Tcl build configuration file "tclConfig.sh" 2082 # 2083 # ----------------------------------------------------------------------- 2084 2085 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclConfig.sh" >&5 2086 $as_echo_n "checking for tclConfig.sh... " >&6; } 2087 tcl_config_sh="" 2088 if test "x$gui_with_tcl" != "x" ; then 2089 2090 # Verify that a tclConfig.sh file exists in the directory specified 2091 # by --with-tcl. 2092 2093 for dir in \ 2094 $gui_with_tcl 2095 do 2096 if test -r "$dir/tclConfig.sh" ; then 2097 tcl_config_sh="$dir/tclConfig.sh" 2098 break 2099 elif test -r "$dir/lib/tclConfig.sh" ; then 2100 tcl_config_sh="$dir/lib/tclConfig.sh" 2101 break 2102 fi 2103 done 2104 else 2105 2106 # Otherwise, search for Tcl configuration file. 2107 2108 # 1. Search previously named locations. 2109 2110 for dir in \ 2111 $prefix \ 2112 $exec_prefix \ 2113 $gui_cv_tcl_lib 2114 do 2115 if test -r "$dir/tclConfig.sh" ; then 2116 tcl_config_sh="$dir/tclConfig.sh" 2117 break 2118 elif test -r "$dir/lib/tclConfig.sh" ; then 2119 tcl_config_sh="$dir/lib/tclConfig.sh" 2120 break 2121 fi 2122 done 2123 fi 2124 2125 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${tcl_config_sh}" >&5 2126 $as_echo "${tcl_config_sh}" >&6; } 2127 2128 if test "x$tcl_config_sh" = "x" ; then 2129 echo "can't find Tcl configuration script \"tclConfig.sh\"" 2130 exit 1 2131 fi 2132 2133 . ${tcl_config_sh} 2134 2135 TCL_INC_SPEC="$TCL_INCLUDE_SPEC" 2076 2136 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${TCLSH}" >&5 2077 2137 $as_echo "${TCLSH}" >&6; } 2078 2138 2079 2080 TCL_VERSION="8.4"2081 for dir in \2082 ${exec_prefix} \2083 ${exec_prefix}/lib ; do2084 tclconfig="${dir}/tclConfig.sh"2085 if test -f "$tclconfig" ; then2086 . $tclconfig2087 break2088 fi2089 done2090 TCL_INC_SPEC="$TCL_INCLUDE_SPEC"2091 2092 if test "x$with_tcllib" != "x" ; then2093 tclconfig="${with_tcllib}/tclConfig.sh"2094 if test -f "$tclconfig" ; then2095 . $tclconfig2096 fi2097 TCL_LIB_SPEC="-L${with_tcllib} -ltcl${TCL_VERSION}"2098 fi2099 if test "x$with_tclinclude" != "x" ; then2100 TCL_INC_SPEC="-I${with_tclinclude}"2101 fi2102 2139 2103 2140 -
trunk/gui/configure.in
r1867 r1869 27 27 AC_PROG_MKDIR_P 28 28 AC_PROG_MAKE_SET 29 30 gui_with_tcl="" 29 31 30 32 make_command="" … … 78 80 fi 79 81 fi 82 83 # ----------------------------------------------------------------------- 84 # 85 # Find the Tcl build configuration file "tclConfig.sh" 86 # 87 # ----------------------------------------------------------------------- 88 89 AC_MSG_CHECKING([for tclConfig.sh]) 90 tcl_config_sh="" 91 if test "x$gui_with_tcl" != "x" ; then 92 93 # Verify that a tclConfig.sh file exists in the directory specified 94 # by --with-tcl. 95 96 for dir in \ 97 $gui_with_tcl 98 do 99 if test -r "$dir/tclConfig.sh" ; then 100 tcl_config_sh="$dir/tclConfig.sh" 101 break 102 elif test -r "$dir/lib/tclConfig.sh" ; then 103 tcl_config_sh="$dir/lib/tclConfig.sh" 104 break 105 fi 106 done 107 else 108 109 # Otherwise, search for Tcl configuration file. 110 111 # 1. Search previously named locations. 112 113 for dir in \ 114 $prefix \ 115 $exec_prefix \ 116 $gui_cv_tcl_lib 117 do 118 if test -r "$dir/tclConfig.sh" ; then 119 tcl_config_sh="$dir/tclConfig.sh" 120 break 121 elif test -r "$dir/lib/tclConfig.sh" ; then 122 tcl_config_sh="$dir/lib/tclConfig.sh" 123 break 124 fi 125 done 126 fi 127 128 AC_MSG_RESULT([${tcl_config_sh}]) 129 130 if test "x$tcl_config_sh" = "x" ; then 131 echo "can't find Tcl configuration script \"tclConfig.sh\"" 132 exit 1 133 fi 134 135 . ${tcl_config_sh} 136 137 TCL_INC_SPEC="$TCL_INCLUDE_SPEC" 80 138 AC_MSG_RESULT([${TCLSH}]) 81 139 AC_SUBST(TCLSH) 82 83 TCL_VERSION="8.4"84 for dir in \85 ${exec_prefix} \86 ${exec_prefix}/lib ; do87 tclconfig="${dir}/tclConfig.sh"88 if test -f "$tclconfig" ; then89 . $tclconfig90 break91 fi92 done93 TCL_INC_SPEC="$TCL_INCLUDE_SPEC"94 95 if test "x$with_tcllib" != "x" ; then96 tclconfig="${with_tcllib}/tclConfig.sh"97 if test -f "$tclconfig" ; then98 . $tclconfig99 fi100 TCL_LIB_SPEC="-L${with_tcllib} -ltcl${TCL_VERSION}"101 fi102 if test "x$with_tclinclude" != "x" ; then103 TCL_INC_SPEC="-I${with_tclinclude}"104 fi105 140 106 141 AC_SUBST(TCL_VERSION)
Note: See TracChangeset
for help on using the changeset viewer.