Ignore:
Timestamp:
Mar 2, 2004, 4:12:00 PM (16 years ago)
Author:
pguyot (Paul Guyot)
Message:

OK. The third time should be the good one. There are way too many patches in
this port anyway.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/lang/ocaml/files/patch-configure

    r5690 r5691  
    4747   fi
    4848+  if test -z "$tcl_version"; then
    49 +    tk_defs="-I/opt/local/include -I/System/Library/Frameworks/Tcl.framework/Versions/8.4/Headers/"
     49+    tk_defs="-I__PREFIX/include -I/System/Library/Frameworks/Tcl.framework/Versions/8.4/Headers/"
    5050+    tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c`
    5151+  fi
     
    5757                    Tcl_DoOneEvent
    5858   then tk_libs="-L/sw/lib -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib"
    59 +  elif sh ./hasgot -L/opt/local/lib $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs \
     59+  elif sh ./hasgot -L__PREFIX/lib $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs \
    6060+                   Tcl_DoOneEvent
    61 +  then tk_libs="-L/opt/local/lib -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib"
     61+  then tk_libs="-L__PREFIX/lib -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib"
    6262   else
    6363     echo "Tcl library not found."
     
    6767     tk_libs="-L/sw/lib $tk_libs"
    6868     echo "Tcl/Tk libraries found."
    69 +  elif sh ./hasgot -L/opt/local/lib $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then
    70 +    tk_libs="-L/opt/local/lib $tk_libs"
     69+  elif sh ./hasgot -L__PREFIX/lib $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then
     70+    tk_libs="-L__PREFIX/lib $tk_libs"
    7171+    echo "Tcl/Tk libraries found."
    7272   else
Note: See TracChangeset for help on using the changeset viewer.