diff options
| author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-10-07 06:59:10 +0000 |
|---|---|---|
| committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-10-07 06:59:10 +0000 |
| commit | 9ff7092bd924021a3fcb3d683876e11b309ee9bc (patch) | |
| tree | de30ca929d6a37020a20f39f23b213e168765eaf /net/tightvnc/files | |
| parent | 6640fa04e77572c69f3deb0df063b9cafa6eeeac (diff) | |
Notes
Diffstat (limited to 'net/tightvnc/files')
| -rw-r--r-- | net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def | 17 | ||||
| -rw-r--r-- | net/tightvnc/files/patch-vncviewer::Imakefile | 13 |
2 files changed, 21 insertions, 9 deletions
diff --git a/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def b/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def index 3a4c99ae2d34..0b9c0dc6c08a 100644 --- a/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def +++ b/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def @@ -1,11 +1,18 @@ ---- Xvnc/config/cf/vnclibs.def.orig Wed Mar 20 05:38:00 2002 -+++ Xvnc/config/cf/vnclibs.def Fri Mar 29 03:50:10 2002 -@@ -5,6 +5,5 @@ +--- Xvnc/config/cf/vnclibs.def.orig Thu Sep 26 12:32:21 2002 ++++ Xvnc/config/cf/vnclibs.def Thu Sep 26 12:34:04 2002 +@@ -5,13 +5,5 @@ * and programs/Xserver/hw/vnc whenever you change this file. */ -VNCLIBS = $(TOP)/../libvncauth/libvncauth.a --VNCSYSLIBS = -L$(TOP)/../lib/jpeg -ljpeg --VNCCPPFLAGS = -I$(TOP)/../include -I$(TOP)/../lib/zlib -I$(TOP)/../lib/jpeg +- +-#ifdef OSF1Architecture +-/* Avoid linking with different libjpeg in /usr/shlib under Tru64. */ +-VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a +-#else +-VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz +-#endif +- +-VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include +VNCLIBS = $(TOP)/../libvncauth/libvncauth.a %%LOCALBASE%%/lib/libjpeg.a +VNCCPPFLAGS = -I$(TOP)/../include -I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib diff --git a/net/tightvnc/files/patch-vncviewer::Imakefile b/net/tightvnc/files/patch-vncviewer::Imakefile index 41b6f6f53c35..0cf49c07a7c0 100644 --- a/net/tightvnc/files/patch-vncviewer::Imakefile +++ b/net/tightvnc/files/patch-vncviewer::Imakefile @@ -1,6 +1,6 @@ ---- vncviewer/Imakefile.orig Tue Apr 30 09:07:31 2002 -+++ vncviewer/Imakefile Wed May 22 21:48:12 2002 -@@ -10,12 +10,12 @@ +--- vncviewer/Imakefile.orig Thu Sep 26 11:26:17 2002 ++++ vncviewer/Imakefile Thu Sep 26 11:28:47 2002 +@@ -10,17 +10,12 @@ DEFINES = -DMITSHM #endif @@ -11,13 +11,18 @@ INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/include VNCAUTH_LIB = ../libvncauth/libvncauth.a -ZLIB_LIB = -L/usr/local/lib -lz +-#ifdef OSF1Architecture +-XCOMM Avoid linking with different libjpeg in /usr/shlib under Tru64. +-JPEG_LIB = /usr/local/lib/libjpeg.a +-#else -JPEG_LIB = -L/usr/local/lib -ljpeg +-#endif +ZLIB_LIB = -L%%LOCALBASE%%/lib -lz +JPEG_LIB = -L%%LOCALBASE%%/lib -ljpeg DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB) LOCAL_LIBRARIES = XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB) -@@ -39,4 +39,4 @@ +@@ -44,4 +39,4 @@ OBJS = $(SRCS:.c=.o) |