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
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
|
--- /a/gimp-0.99.6/ltmain.sh Wed Feb 26 03:39:50 1997
+++ ltmain.sh Wed Mar 12 20:20:40 1997
@@ -334,7 +335,9 @@
exit 1
;;
esac
- deplibs="$deplibs $arg"
+ compile_shlibpath="$compile_shlibpath$dir:"
+ printf "compile_shlibpath: $compile_shlibpath\n"
+ arg=""
;;
-l*) deplibs="$deplibs $arg" ;;
--- /a/gimp-0.99.6/gtk+/ltmain.sh Wed Feb 26 03:39:50 1997
+++ gtk+/ltmain.sh Wed Mar 12 20:20:40 1997
@@ -334,7 +335,9 @@
exit 1
;;
esac
- deplibs="$deplibs $arg"
+ compile_shlibpath="$compile_shlibpath$dir:"
+ printf "compile_shlibpath: $compile_shlibpath\n"
+ arg=""
;;
-l*) deplibs="$deplibs $arg" ;;
--- /a/gimp-0.99.6/gtk+/glib/ltmain.sh Wed Feb 26 03:39:50 1997
+++ gtk+/glib/ltmain.sh Wed Mar 12 20:20:40 1997
@@ -334,7 +335,9 @@
exit 1
;;
esac
- deplibs="$deplibs $arg"
+ compile_shlibpath="$compile_shlibpath$dir:"
+ printf "compile_shlibpath: $compile_shlibpath\n"
+ arg=""
;;
-l*) deplibs="$deplibs $arg" ;;
--- /a/gimp-0.99.6/gtk+/gtk/Makefile.am Mon Mar 10 05:58:16 1997
+++ gtk+/gtk/Makefile.am Wed Mar 12 21:10:32 1997
@@ -149,23 +149,23 @@
X_LIBS = @x_libs@
EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtkrc
+INCLUDES = -I$(top_srcdir) $(X_CFLAGS)
-INCLUDES = $(X_CFLAGS) -I$(top_srcdir)
noinst_PROGRAMS = testgtk simple
testgtk_LDADD = \
libgtk.la \
$(top_builddir)/gdk/libgdk.la \
+ $(top_builddir)/glib/libglib.la \
$(X_LDFLAGS) \
$(X_LIBS) \
- $(top_builddir)/glib/libglib.la \
-lm
simple_LDADD = \
libgtk.la \
$(top_builddir)/gdk/libgdk.la \
+ $(top_builddir)/glib/libglib.la \
$(X_LDFLAGS) \
$(X_LIBS) \
- $(top_builddir)/glib/libglib.la \
-lm
--- /a/gimp-0.99.6/gtk+/gtk/Makefile.in Mon Mar 10 07:13:59 1997
+++ gtk+/gtk/Makefile.in Wed Mar 12 21:09:50 1997
@@ -198,23 +198,23 @@
X_LIBS = @x_libs@
EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtkrc
+INCLUDES = -I$(top_srcdir) $(X_CFLAGS)
-INCLUDES = $(X_CFLAGS) -I$(top_srcdir)
noinst_PROGRAMS = testgtk simple
testgtk_LDADD = \
libgtk.la \
$(top_builddir)/gdk/libgdk.la \
+ $(top_builddir)/glib/libglib.la \
$(X_LDFLAGS) \
$(X_LIBS) \
- $(top_builddir)/glib/libglib.la \
-lm
simple_LDADD = \
libgtk.la \
$(top_builddir)/gdk/libgdk.la \
+ $(top_builddir)/glib/libglib.la \
$(X_LDFLAGS) \
$(X_LIBS) \
- $(top_builddir)/glib/libglib.la \
-lm
DEPS = \
DEPS = \
--- /a/gimp-0.99.6/plug-ins/Makefile.am Mon Mar 10 06:36:32 1997
+++ plug-ins/Makefile.am Wed Mar 12 21:49:12 1997
@@ -43,9 +43,9 @@
mosaic_SOURCES = mosaic.c mosaic_logo.h
INCLUDES = \
- $(X_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/gtk+ \
+ $(X_CFLAGS) \
-I/usr/local/include
x_LDADD = \
--- /a/gimp-0.99.6/plug-ins/Makefile.in Mon Mar 10 07:13:47 1997
+++ plug-ins/Makefile.in Wed Mar 12 21:48:51 1997
@@ -89,9 +89,9 @@
mosaic_SOURCES = mosaic.c mosaic_logo.h
INCLUDES = \
- $(X_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/gtk+ \
+ $(X_CFLAGS) \
-I/usr/local/include
x_LDADD = \
--- /a/gimp-0.99.6/plug-ins/script-fu/Makefile.am Mon Mar 10 06:36:21 1997
+++ plug-ins/script-fu/Makefile.am Wed Mar 12 21:52:31 1997
@@ -29,9 +29,9 @@
siodp.h
INCLUDES = \
- $(X_CFLAGS) \
-I$(top_srcdir) \
- -I$(top_srcdir)/gtk+
+ -I$(top_srcdir)/gtk+ \
+ $(X_CFLAGS)
LDADD = \
$(top_builddir)/libgimp/libgimp.la \
--- /a/gimp-0.99.6/plug-ins/script-fu/Makefile.in Mon Mar 10 07:13:48 1997
+++ plug-ins/script-fu/Makefile.in Wed Mar 12 21:52:47 1997
@@ -76,9 +76,9 @@
siodp.h
INCLUDES = \
- $(X_CFLAGS) \
-I$(top_srcdir) \
- -I$(top_srcdir)/gtk+
+ -I$(top_srcdir)/gtk+ \
+ $(X_CFLAGS)
LDADD = \
$(top_builddir)/libgimp/libgimp.la \
--- /a/gimp-0.99.6/app/Makefile.am Mon Mar 10 06:36:39 1997
+++ app/Makefile.am Wed Mar 12 21:58:49 1997
@@ -267,21 +267,21 @@
CPPFLAGS = \
-DLIBDIR=\""$(pkglibdir)"\" \
- -DDATADIR=\""$(pkgdatadir)"\" \
+ -DDATADIR=\""$(gimpdatadir)"\" \
-DVERSION=\"$(VERSION)\"
INCLUDES = \
- $(X_CFLAGS) \
-I$(top_srcdir)/gtk+ \
- -I$(top_srcdir)
+ -I$(top_srcdir) \
+ $(X_CFLAGS)
gimp_LDADD = \
$(top_builddir)/gtk+/gtk/libgtk.la \
$(top_builddir)/gtk+/gdk/libgdk.la \
- $(X_LDFLAGS) \
- $(X_LIBS) \
$(top_builddir)/libgimp/libgimpi.a \
$(top_builddir)/gtk+/glib/libglib.la \
+ $(X_LDFLAGS) \
+ $(X_LIBS) \
-lm
DEPS = \
--- /a/gimp-0.99.6/app/Makefile.in Mon Mar 10 07:13:52 1997
+++ app/Makefile.in Wed Mar 12 21:59:15 1997
@@ -314,21 +314,21 @@
CPPFLAGS = \
-DLIBDIR=\""$(pkglibdir)"\" \
- -DDATADIR=\""$(pkgdatadir)"\" \
+ -DDATADIR=\""$(gimpdatadir)"\" \
-DVERSION=\"$(VERSION)\"
INCLUDES = \
- $(X_CFLAGS) \
-I$(top_srcdir)/gtk+ \
- -I$(top_srcdir)
+ -I$(top_srcdir) \
+ $(X_CFLAGS)
gimp_LDADD = \
$(top_builddir)/gtk+/gtk/libgtk.la \
$(top_builddir)/gtk+/gdk/libgdk.la \
- $(X_LDFLAGS) \
- $(X_LIBS) \
$(top_builddir)/libgimp/libgimpi.a \
$(top_builddir)/gtk+/glib/libglib.la \
+ $(X_LDFLAGS) \
+ $(X_LIBS) \
-lm
DEPS = \
--- /a/gimp-0.99.6/configure Mon Mar 10 05:19:54 1997
+++ configure Wed Mar 12 22:09:11 1997
@@ -617,7 +617,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
PACKAGE=gimp
@@ -2108,7 +2108,7 @@
gimpdatadir=$datadir/$PACKAGE-$VERSION
-gimpplugindir=$libdir/$PACKAGE-$VERSION
+gimpplugindir=$libexecdir/$PACKAGE-$VERSION
--- gimprc.in~ Thu Mar 13 10:32:12 1997
+++ gimprc.in Thu Mar 13 10:32:25 1997
@@ -68,7 +68,7 @@
# causes the gimp to use more swap space and less memory.
# Note: the gimp will still run even if `tile-cache-size' is
# set to 0. The actual size can contain a suffix of 'm', 'M',
-* 'k', 'K', 'b' or 'B', which makes the gimp interpret the
+# 'k', 'K', 'b' or 'B', which makes the gimp interpret the
# size as being specified in megabytes, kilobytes and bytes
# respectively. If no suffix is specified the size defaults to
# being specified in kilobytes.
@@ -90,7 +90,7 @@
# colors remaining after the allocation of the colorcube
# will be left to the system palette in an effort to reduce
# colormap "flashing".
-(color-cube 6 6 4)
+(color-cube 6 6 4 24)
# Install a GIMP colormap by default -- only for 8-bit displays
# (install-colormap)
|
