diff options
| author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2000-08-25 06:53:45 +0000 |
|---|---|---|
| committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2000-08-25 06:53:45 +0000 |
| commit | 21917d591edd4e9891c5a18f2978e0037a5b9ce2 (patch) | |
| tree | 729bbf98183974e342ec8892516509520e5cdcae | |
| parent | 0b9d867f2f0dfe7b598512b493f3f337acc2966a (diff) | |
recognize Tk under Cygwin
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3285 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rwxr-xr-x | configure | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -893,7 +893,8 @@ fi # Look for tcl/tk echo "Configuring LablTk..." -if test "$x11_include" = "not found" || test "$x11_link" = "not found" +if test "$ostype" != "Cygwin" && \ + (test "$x11_include" = "not found" || test "$x11_link" = "not found") then echo "X11 not found." has_tk=false @@ -922,8 +923,13 @@ else fi fi +if test $has_tk = true && test "$ostype" != "Cygwin"; then + tk_x11_include=$x11_include + tk_x11_libs="$x11_libs -lX11" +fi + if test $has_tk = true; then - if sh ./hasgot $x11_include $tk_defs -i tk.h; then + if sh ./hasgot $tk_x11_include $tk_defs -i tk.h; then echo "tk.h found." else echo "tk.h not found." @@ -958,7 +964,7 @@ if test $has_tk = true; then fi fi if test $has_tk = true; then - if sh ./hasgot $tk_libs $x11_libs -lX11 $tkauxlibs Tk_SetGrid; then + if sh ./hasgot $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then echo "Tcl/Tk libraries found." else echo "Tcl library found." |