diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-02-14 10:52:51 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-02-14 10:52:51 (GMT) |
| commit | 47a2d1fb9d59a4afd47e4528a63ee1d590a9e443 (patch) | |
| tree | 62c8dc534f521d09a5e0ae8c1b257de00e5b9b5d /win/configure | |
| parent | 8f44cf8f13afe7af1e7fb98e61d6d71b8dcbe0ed (diff) | |
| parent | a0d89b5ac2d726f86a1209cc0e9666e5890bd49a (diff) | |
| download | tk-47a2d1fb9d59a4afd47e4528a63ee1d590a9e443.zip tk-47a2d1fb9d59a4afd47e4528a63ee1d590a9e443.tar.gz tk-47a2d1fb9d59a4afd47e4528a63ee1d590a9e443.tar.bz2 | |
Add some extra paths on Windows for finding tclConfig.sh, for mSys and Cygwin shell.
Improve some comments and quoting, no change in functionality.
FossilOrigin-Name: 3baf50cfdb612650e22fd0d7a6aed55433dd8c12
Diffstat (limited to 'win/configure')
| -rwxr-xr-x | win/configure | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/win/configure b/win/configure index b833f44..bd3acf4 100755 --- a/win/configure +++ b/win/configure @@ -3104,7 +3104,8 @@ echo "${ECHO_T}shared" >&6 echo "$as_me:$LINENO: result: static" >&5 echo "${ECHO_T}static" >&6 SHARED_BUILD=0 - cat >>confdefs.h <<\_ACEOF + +cat >>confdefs.h <<\_ACEOF #define STATIC_BUILD 1 _ACEOF @@ -3184,6 +3185,10 @@ echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" > for i in `ls -d ${libdir} 2>/dev/null` \ `ls -d ${exec_prefix}/lib 2>/dev/null` \ `ls -d ${prefix}/lib 2>/dev/null` \ + `ls -d /cygdrive/c/Tcl/lib 2>/dev/null` \ + `ls -d /cygdrive/c/Progra~1/Tcl/lib 2>/dev/null` \ + `ls -d /c/Tcl/lib 2>/dev/null` \ + `ls -d /c/Progra~1/Tcl/lib 2>/dev/null` \ `ls -d C:/Tcl/lib 2>/dev/null` \ `ls -d C:/Progra~1/Tcl/lib 2>/dev/null` \ ; do @@ -3225,16 +3230,16 @@ echo "${ECHO_T}found ${TCL_BIN_DIR}/tclConfig.sh" >&6 fi - echo "$as_me:$LINENO: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 -echo $ECHO_N "checking for existence of $TCL_BIN_DIR/tclConfig.sh... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for existence of ${TCL_BIN_DIR}/tclConfig.sh" >&5 +echo $ECHO_N "checking for existence of ${TCL_BIN_DIR}/tclConfig.sh... $ECHO_C" >&6 - if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then + if test -f "${TCL_BIN_DIR}/tclConfig.sh" ; then echo "$as_me:$LINENO: result: loading" >&5 echo "${ECHO_T}loading" >&6 - . $TCL_BIN_DIR/tclConfig.sh + . "${TCL_BIN_DIR}/tclConfig.sh" else - echo "$as_me:$LINENO: result: file not found" >&5 -echo "${ECHO_T}file not found" >&6 + echo "$as_me:$LINENO: result: could not find ${TCL_BIN_DIR}/tclConfig.sh" >&5 +echo "${ECHO_T}could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6 fi # |