summaryrefslogtreecommitdiff
path: root/www/mMosaic/patches/patch-aa
blob: ad6ba47a863a9c6c44b2079c61f2c1994a90aa47 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
$NetBSD: patch-aa,v 1.3 2002/10/08 12:51:58 jlam Exp $

--- Makefile.orig	Thu Feb  1 07:27:30 2001
+++ Makefile
@@ -45,13 +45,13 @@
 # GCC : Linux Intel optimised 
 #prereleaseflags = -Wall -pipe  -O2 -g  -march=pentium -mcpu=pentium
 # GCC : Linux, FreeBSD, NetBSD compiler flags (recommended)
-#prereleaseflags = -Wall -g
+prereleaseflags = -Wall -Wno-comment -Wno-parentheses -O2 -g
 # Qnx
 #prereleaseflags = -Oeax
 # SGI Mipspro
 #prereleaseflags = -g -n32 -Xcpluscomm -woff 1009,1014,1048,1110,1116,1185,1188,1204,1230,1233
 # Sun Workshop C Compiler
-prereleaseflags = -v -g -xstrconst
+#prereleaseflags = -v -g -xstrconst
 # Sun Workshop C++ Compiler
 #prereleaseflags = +w -g
 
@@ -63,9 +63,9 @@
 ##
 
 # Linux, NetBSD, FreeBSD, BSDI, OSF1, SunOS4this 
-#RANLIB = ranlib
+RANLIB = ranlib
 # SVR4, Irix, AIX, Qnx, Solaris 2.x
-RANLIB = /bin/true
+#RANLIB = /bin/true
 
 ##
 ## System configuration flags
@@ -88,11 +88,11 @@
 # FreeBSD
 #sysconfigflags = -DFreeBSD
 # NetBSD
-#sysconfigflags = -DNETBSD
+sysconfigflags = -DNETBSD
 # Irix
 #sysconfigflags = -DSVR4 -DIRIX
 # Solaris2.5 & 2.5.1
-sysconfigflags = -DSOLARIS -DSVR4
+#sysconfigflags = -DSOLARIS -DSVR4
 
 # Use Motif 1.2.x
 sysconfigflags += -DMOTIF1_2
@@ -124,7 +124,7 @@
 # Irix
 #syslibs = -lPW
 # Solaris 2.x, Motorola SVR4
-syslibs = -lsocket -lnsl -ldl
+#syslibs = -lsocket -lnsl -ldl
 
 ##
 ## X11 includes
@@ -141,7 +141,8 @@
 # Solaris 2.x
 #xinc	= -I/usr/openwin/include -I/usr/dt/include 
 #solaris8
-xinc	= -I/usr/openwin/include -I/usr/dt/include -DMOTIF12_HEADERS
+#xinc	= -I/usr/openwin/include -I/usr/dt/include -DMOTIF12_HEADERS
+xinc    = -I${LOCALBASE}/include -I${X11BASE}/include
 
 
 ##
@@ -168,9 +169,12 @@
 # Irix
 #xlibs	= -L/usr/lib32 -lXm -lXmu -lXt -lXext -lX11 -lm 
 # Solaris 2.x
-xlibs	= -L/usr/openwin/lib -R/usr/openwin/lib -L/usr/dt/lib -R/usr/dt/lib
+#xlibs	= -L/usr/openwin/lib -R/usr/openwin/lib -L/usr/dt/lib -R/usr/dt/lib
 #xlibs	+= -lXm -lXmu -lXt -lXext -lX11 -lm
-xlibs	+= -lXm12 -lXmu -lXt -lXext -lX11 -lm
+#xlibs	+= -lXm12 -lXmu -lXt -lXext -lX11 -lm
+xlibs	= -L${X11BASE}/lib -L${LOCALBASE}/lib 
+xlibs	+= -lXm -lXmu -lXt -lXext -lX11 -lm
+xlibs	+= -Wl,-R${X11BASE}/lib -Wl,-R${LOCALBASE}/lib
 
 #
 # private
@@ -190,8 +194,10 @@
 #pnginc  = /usr/local/include
 #pnglibs = /usr/local/lib/libpng.a /usr/lib/libz.a
 # Solaris
-pnginc  = /usr/local/include
-pnglibs = /usr/local/lib/libpng.a /usr/local/lib/libz.a
+#pnginc  = /usr/local/include
+#pnglibs = /usr/local/lib/libpng.a /usr/local/lib/libz.a
+pnginc  = ${LOCALBASE}/include
+pnglibs = -lpng -lz -Wl,-R${LOCALBASE}/lib
 
 # To disable PNG support comment this.
 
@@ -208,8 +214,10 @@
 #jpeginc   = /usr/include
 #jpeglibs  = /usr/lib32/libjpeg.so
 # Solaris FreeBSD
-jpeginc  = /usr/local/include
-jpeglibs = /usr/local/lib/libjpeg.a
+#jpeginc  = /usr/local/include
+#jpeglibs = /usr/local/lib/libjpeg.a
+jpeginc  = ${LOCALBASE}/include
+jpeglibs = -ljpeg -Wl,-R${LOCALBASE}/lib
 
 # To disable JPEG support (not recommended) comment this.
 
@@ -259,12 +267,12 @@
 INSTALL_PLUG_DIR = /usr/local/mMosaic/plugins
 explugdir = $(PWD)/plugins/examples
 # for gcc
-#explugccflag = -fpic
-#explugldflag = -shared
+explugccflag = -fpic
+explugldflag = -shared
 #
 # for Solaris cc workshop
-explugccflag = -I$(plugdir) -KPIC
-explugldflag = -G
+#explugccflag = -I$(plugdir) -KPIC
+#explugldflag = -G
 
 ##
 ## Customization flags
@@ -290,7 +298,7 @@
 #
 # Common
 
-customflags =
+#customflags = -DIPV6
 
 ##
 ## ---------------------- END OF CUSTOMIZABLE OPTIONS -------------------------