diff options
Diffstat (limited to 'palm/pilot-link/files/patch-ab')
| -rw-r--r-- | palm/pilot-link/files/patch-ab | 46 |
1 files changed, 15 insertions, 31 deletions
diff --git a/palm/pilot-link/files/patch-ab b/palm/pilot-link/files/patch-ab index 112e540826bd..708d64291e8c 100644 --- a/palm/pilot-link/files/patch-ab +++ b/palm/pilot-link/files/patch-ab @@ -1,100 +1,84 @@ ---- configure.orig Sat Dec 13 23:27:17 1997 -+++ configure Wed Jan 14 06:49:36 1998 -@@ -9,7 +9,7 @@ - +--- configure.orig Sat Aug 21 10:57:14 1999 ++++ configure Sat Aug 21 11:05:26 1999 +@@ -10,5 +10,5 @@ # Defaults: ac_help= -ac_default_prefix=/usr/local +ac_default_prefix=/usr/local/pilot # Any additions from configure.in: ac_help="$ac_help - --with-gnu-ld assume the C compiler uses GNU ld [default=no]" -@@ -818,9 +818,9 @@ - +@@ -876,9 +876,9 @@ # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +INSTALL_PROGRAM='${INSTALL}' + test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 -@@ -2556,7 +2556,9 @@ - itcl='' +@@ -2643,5 +2643,5 @@ if test "x$with_tcl" = "xyes" || test "x$with_tcl" = "x" ; then for tcl_path in /usr/local/tcl8.0 /usr/local/tcl7.6 /usr/local/tcl7.5 /usr/local /usr /usr/local/tcl7.4; do - if test -f $tcl_path/lib/tclConfig.sh; then + if test -f $tcl_path/lib/tcl8.0/tclConfig.sh; then -+ with_tcl=$tcl_path; break -+ elif test -f $tcl_path/lib/tclConfig.sh; then with_tcl=$tcl_path; break elif test -f $tcl_path/lib/itcl/tclConfig.sh; then - itcl='/itcl' -@@ -2597,13 +2599,13 @@ - elif test "x$with_tcl" = "xno"; then +@@ -2684,5 +2684,5 @@ echo "$ac_t""not used" 1>&6 else - tclConfig="$with_tcl/lib$itcl/tclConfig.sh" + tclConfig="$with_tcl/lib/tcl8.0$itcl/tclConfig.sh" if test ! -f $tclConfig; then echo "$ac_t""Unable to find tclConfig.sh" 1>&6 - else +@@ -2690,5 +2690,5 @@ . $tclConfig echo "$ac_t""version $TCL_VERSION from $tclConfig" 1>&6 - TCL_INC="-I$TCL_PREFIX/include$itcl" + TCL_INC="-I$TCL_PREFIX/include/tcl8.0$itcl" TCL_BIN="$TCL_EXEC_PREFIX/bin" TCLLIBS="$TCL_LIB_SPEC $TCL_LIBS" - TCLTKLIBS="$TCLLIBS" -@@ -2614,7 +2616,7 @@ - +@@ -2701,5 +2701,5 @@ if test "x$with_itcl" = "xyes" || test "x$with_itcl" = "x"; then for itcl_path in $with_tcl; do - if test -f $itcl_path/lib$itcl/itclConfig.sh; then + if test -f $itcl_path/lib/tcl8.0$itcl/itclConfig.sh; then with_itcl=$itcl_path; break fi - done -@@ -2632,13 +2634,13 @@ - elif test "x$with_itcl" = "xno"; then +@@ -2719,5 +2719,5 @@ echo "$ac_t""not used" 1>&6 else - itclConfig="$with_itcl/lib$itcl/itclConfig.sh" + itclConfig="$with_itcl/lib/tcl8.0$itcl/itclConfig.sh" if test ! -f $itclConfig; then echo "$ac_t""Unable to find itclConfig.sh" 1>&6 - else +@@ -2725,5 +2725,5 @@ . $itclConfig echo "$ac_t""version $ITCL_VERSION from $itclConfig" 1>&6 - ITCL_INC="-I$TK_PREFIX/include$itcl" + ITCL_INC="-I$TK_PREFIX/include/tcl8.0$itcl" #TK_BIN="$TK_EXEC_PREFIX/bin" #TKLIBS="$TK_LIB_SPEC $TCL_LIB_SPEC $TK_LIBS" - #TCLTK_LIBS="\$(TK_LIB_SPEC) \$(TCL_LIB_SPEC) \$(TK_LIBS)" -@@ -2656,7 +2658,7 @@ - +@@ -2743,5 +2743,5 @@ if test "x$with_tk" = "xyes" || test "x$with_tk" = "x"; then for tk_path in $with_tcl; do - if test -f $tk_path/lib$itcl/tkConfig.sh; then + if test -f $tk_path/lib/tk8.0$itcl/tkConfig.sh; then with_tk=$tk_path; break fi - done -@@ -2674,13 +2676,13 @@ - elif test "x$with_tk" = "xno"; then +@@ -2761,5 +2761,5 @@ echo "$ac_t""not used" 1>&6 else - tkConfig="$with_tk/lib$itcl/tkConfig.sh" + tkConfig="$with_tk/lib/tk8.0$itcl/tkConfig.sh" if test ! -f $tkConfig; then echo "$ac_t""Unable to find tkConfig.sh" 1>&6 - else +@@ -2767,5 +2767,5 @@ . $tkConfig echo "$ac_t""version $TK_VERSION from $tkConfig" 1>&6 - TK_INC="-I$TK_PREFIX/include$itcl" + TK_INC="-I$TK_PREFIX/include/tk8.0$itcl" TK_BIN="$TK_EXEC_PREFIX/bin" TKLIBS="$TK_LIB_SPEC $TCL_LIB_SPEC $TK_LIBS" - TCLTK_LIBS="\$(TK_LIB_SPEC) \$(TCL_LIB_SPEC) \$(TK_LIBS)" |