diff options
| author | Thomas Gellekum <tg@FreeBSD.org> | 1997-12-01 12:41:45 +0000 |
|---|---|---|
| committer | Thomas Gellekum <tg@FreeBSD.org> | 1997-12-01 12:41:45 +0000 |
| commit | 8e5ce1ebd5fbca6cdee1ea5f82d410ced3350ba8 (patch) | |
| tree | 5086a49a1c83a4e7ce209a7aede9ad6fdf38fa56 /x11-toolkits/tkstep80/files/patch-aa | |
| parent | Add back @dirrm's. (diff) | |
Use the new location for the tiff34 headers.
Closes PR: 5160
Notes
Notes:
svn path=/head/; revision=8934
Diffstat (limited to 'x11-toolkits/tkstep80/files/patch-aa')
| -rw-r--r-- | x11-toolkits/tkstep80/files/patch-aa | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/x11-toolkits/tkstep80/files/patch-aa b/x11-toolkits/tkstep80/files/patch-aa index c39f29c64f77..229b3f5c2b1c 100644 --- a/x11-toolkits/tkstep80/files/patch-aa +++ b/x11-toolkits/tkstep80/files/patch-aa @@ -1,7 +1,7 @@ ---- configure.orig Fri Aug 15 22:17:52 1997 -+++ configure Wed Oct 1 10:50:54 1997 -@@ -662,14 +662,14 @@ - if test -n "$withval"; then +--- configure.orig Mon Dec 1 12:56:45 1997 ++++ configure Mon Dec 1 13:11:06 1997 +@@ -877,14 +877,14 @@ + withval="$with_tcl" TCL_BIN_DIR=$withval else - TCL_BIN_DIR=`cd ../../tcl8.0/unix; pwd` @@ -18,7 +18,7 @@ fi #-------------------------------------------------------------------- -@@ -688,6 +688,8 @@ +@@ -903,6 +903,8 @@ DL_LIBS=$TCL_DL_LIBS LD_FLAGS=$TCL_LD_FLAGS @@ -27,7 +27,16 @@ LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' # If Tcl and Tk are installed in different places, adjust the library -@@ -2271,6 +2273,7 @@ +@@ -2475,7 +2477,7 @@ + + if test "$ok" = "yes" ; then + ENABLE_TIFF="-DENABLE_TIFF" +- EXTRA_LIBS="$EXTRA_LIBS -ltiff -ljpeg -lz" ++ EXTRA_LIBS="$EXTRA_LIBS -ltiff34 -ljpeg -lz" + IMAGE_OBJ="$IMAGE_OBJ tkImgTIFF.o" + else + ENABLE_TIFF="" +@@ -2731,6 +2733,7 @@ s%@SHLIB_VERSION@%$SHLIB_VERSION%g s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g |