]>
Commit | Line | Data |
---|---|---|
bd1b19f5 | 1 | diff -ur irssi-0.8.10-rc5-o/configure.in irssi-0.8.10-rc5/configure.in |
2 | --- irssi-0.8.10-rc5-o/configure.in 2004-09-15 06:15:05.000000000 -0600 | |
3 | +++ irssi-0.8.10-rc5/configure.in 2005-05-29 01:32:38.000000000 -0600 | |
4 | @@ -236,6 +236,10 @@ | |
5 | ;; | |
6 | esac | |
7 | ||
8 | +AC_CHECK_LIB(popt, poptGetInvocationName, [ | |
9 | + LIBS="$LIBS -lpopt" | |
10 | +]) | |
11 | + | |
12 | ||
13 | AC_CHECK_FUNCS(mkfifo fcntl nl_langinfo) | |
14 | ||
15 | @@ -351,7 +355,7 @@ | |
16 | AC_MSG_RESULT([yes, using it]) | |
17 | ||
18 | dnl * we have to do this at this point so we know what libs gmodule needs | |
19 | - if test ! -f $GLIB_DIR/.libs/libglib.a; then | |
20 | + if test ! -f $GLIB_DIR/.libs/libglib.la; then | |
21 | echo | |
22 | echo "configuring GLib ..." | |
23 | echo | |
24 | @@ -745,21 +749,21 @@ | |
25 | dnl * building with static perl support | |
26 | dnl * all PERL_LDFLAGS linking is done in fe-text | |
27 | PERL_LINK_FLAGS="$PERL_LDFLAGS" | |
28 | - PERL_LINK_LIBS="../perl/libperl_core_static.la" | |
29 | - PERL_FE_LINK_LIBS="../perl/libfe_perl_static.la" | |
30 | + PERL_LINK_LIBS="../perl/libirssi_perl_core_static.la" | |
31 | + PERL_FE_LINK_LIBS="../perl/libirssife_perl_static.la" | |
32 | PERL_LDFLAGS= | |
33 | AC_DEFINE(HAVE_STATIC_PERL) | |
34 | ||
35 | dnl * build only static library of perl module | |
36 | perl_module_lib= | |
37 | perl_module_fe_lib= | |
38 | - perl_static_lib=libperl_core_static.la | |
39 | - perl_static_fe_lib=libfe_perl_static.la | |
40 | + perl_static_lib=libirssi_perl_core_static.la | |
41 | + perl_static_fe_lib=libirssife_perl_static.la | |
42 | PERL_LIBTOOL='$(SHELL) $(top_builddir)/libtool' | |
43 | else | |
44 | dnl * build dynamic library of perl module | |
45 | - perl_module_lib=libperl_core.la | |
46 | - perl_module_fe_lib=libfe_perl.la | |
47 | + perl_module_lib=libirssi_perl_core.la | |
48 | + perl_module_fe_lib=libirssife_perl.la | |
49 | perl_static_lib= | |
50 | perl_static_fe_lib= | |
51 | PERL_LIBTOOL='$(SHELL) $(top_builddir)/libtool' | |
52 | @@ -833,7 +837,7 @@ | |
53 | AC_SUBST(CHAT_MODULES) | |
54 | AC_SUBST(irc_MODULES) | |
55 | ||
56 | -CORE_LIBS="../core/libcore.a ../lib-config/libirssi_config.a ../lib-popt/libpopt.a" | |
57 | +CORE_LIBS="../core/libirssi_core.la ../lib-config/libirssi_config.la" | |
58 | FE_COMMON_LIBS="" | |
59 | ||
60 | CHAT_LIBS="" | |
61 | @@ -842,16 +846,16 @@ | |
62 | module_deinits="" | |
63 | fe_module_inits="" | |
64 | fe_module_deinits="" | |
65 | - CHAT_LIBS="$CHAT_LIBS ../$c/lib$c.a ../$c/core/lib${c}_core.a" | |
66 | + CHAT_LIBS="$CHAT_LIBS ../$c/libirssi_$c.la ../$c/core/libirssi_${c}_core.la" | |
67 | if test -f $srcdir/src/fe-common/$c/module.h; then | |
68 | - FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/libfe_common_$c.a " | |
69 | + FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/libirssife_common_$c.la " | |
70 | fi | |
71 | for s in `eval echo \\$${c}_MODULES`; do | |
72 | - CHAT_LIBS="$CHAT_LIBS ../$c/$s/lib${c}_$s.a" | |
73 | + CHAT_LIBS="$CHAT_LIBS ../$c/$s/libirssi_${c}_$s.la" | |
74 | module_inits="$module_inits ${c}_${s}_init();" | |
75 | module_deinits="${c}_${s}_deinit(); $module_deinits" | |
76 | if test -f $srcdir/src/fe-common/$c/$s/module.h; then | |
77 | - FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/$s/libfe_${c}_$s.a " | |
78 | + FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/$s/libirssife_${c}_$s.la " | |
79 | fe_module_inits="$fe_module_inits fe_${c}_${s}_init();" | |
80 | fe_module_deinits="fe_${c}_${s}_deinit(); $fe_module_deinits" | |
81 | fi | |
82 | @@ -879,7 +883,7 @@ | |
83 | fi | |
84 | done | |
85 | ||
86 | -FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/core/libfe_common_core.a" | |
87 | +FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/core/libirssife_common_core.la" | |
88 | ||
89 | dnl ** common libraries needed by frontends | |
90 | COMMON_NOUI_LIBS="$CHAT_LIBS $CORE_LIBS" | |
91 | diff -ur irssi-0.8.10-rc5-o/src/core/Makefile.am irssi-0.8.10-rc5/src/core/Makefile.am | |
92 | --- irssi-0.8.10-rc5-o/src/core/Makefile.am 2004-08-19 18:10:01.000000000 -0600 | |
93 | +++ irssi-0.8.10-rc5/src/core/Makefile.am 2005-05-29 01:32:38.000000000 -0600 | |
94 | @@ -1,4 +1,6 @@ | |
95 | -noinst_LIBRARIES = libcore.a | |
96 | +libirssi_core_LTLIBRARIES = libirssi_core.la | |
97 | + | |
98 | +libirssi_coredir = /usr/lib | |
99 | ||
100 | INCLUDES = \ | |
101 | -I$(top_srcdir)/src \ | |
102 | @@ -7,7 +9,7 @@ | |
103 | -DSYSCONFDIR=\""$(sysconfdir)"\" \ | |
104 | -DMODULEDIR=\""$(libdir)/irssi/modules"\" | |
105 | ||
106 | -libcore_a_SOURCES = \ | |
107 | +libirssi_core_la_SOURCES = \ | |
108 | args.c \ | |
109 | channels.c \ | |
110 | channels-setup.c \ | |
111 | diff -ur irssi-0.8.10-rc5-o/src/fe-common/core/Makefile.am irssi-0.8.10-rc5/src/fe-common/core/Makefile.am | |
112 | --- irssi-0.8.10-rc5-o/src/fe-common/core/Makefile.am 2004-09-15 06:15:05.000000000 -0600 | |
113 | +++ irssi-0.8.10-rc5/src/fe-common/core/Makefile.am 2005-05-29 01:32:38.000000000 -0600 | |
114 | @@ -1,4 +1,5 @@ | |
115 | -noinst_LIBRARIES = libfe_common_core.a | |
116 | +libirssife_common_core_LTLIBRARIES = libirssife_common_core.la | |
117 | +libirssife_common_coredir = $(libdir) | |
118 | ||
119 | INCLUDES = \ | |
120 | -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \ | |
121 | @@ -6,7 +7,7 @@ | |
122 | -DHELPDIR=\""$(datadir)/irssi/help"\" \ | |
123 | -DTHEMESDIR=\""$(datadir)/irssi/themes"\" | |
124 | ||
125 | -libfe_common_core_a_SOURCES = \ | |
126 | +libirssife_common_core_la_SOURCES = \ | |
127 | autorun.c \ | |
128 | chat-completion.c \ | |
129 | command-history.c \ | |
130 | diff -ur irssi-0.8.10-rc5-o/src/fe-common/irc/dcc/Makefile.am irssi-0.8.10-rc5/src/fe-common/irc/dcc/Makefile.am | |
131 | --- irssi-0.8.10-rc5-o/src/fe-common/irc/dcc/Makefile.am 2004-05-10 14:45:03.000000000 -0600 | |
132 | +++ irssi-0.8.10-rc5/src/fe-common/irc/dcc/Makefile.am 2005-05-29 01:32:38.000000000 -0600 | |
133 | @@ -1,4 +1,5 @@ | |
134 | -noinst_LIBRARIES = libfe_irc_dcc.a | |
135 | +libirssife_irc_dcc_LTLIBRARIES = libirssife_irc_dcc.la | |
136 | +libirssife_irc_dccdir = $(libdir) | |
137 | ||
138 | INCLUDES = \ | |
139 | -I$(top_srcdir)/src \ | |
140 | @@ -10,7 +11,7 @@ | |
141 | -DHELPDIR=\""$(datadir)/irssi/help"\" \ | |
142 | -DSYSCONFDIR=\""$(sysconfdir)"\" | |
143 | ||
144 | -libfe_irc_dcc_a_SOURCES = \ | |
145 | +libirssife_irc_dcc_la_SOURCES = \ | |
146 | fe-dcc.c \ | |
147 | fe-dcc-chat.c \ | |
148 | fe-dcc-chat-messages.c \ | |
149 | diff -ur irssi-0.8.10-rc5-o/src/fe-common/irc/Makefile.am irssi-0.8.10-rc5/src/fe-common/irc/Makefile.am | |
150 | --- irssi-0.8.10-rc5-o/src/fe-common/irc/Makefile.am 2004-07-11 09:45:03.000000000 -0600 | |
151 | +++ irssi-0.8.10-rc5/src/fe-common/irc/Makefile.am 2005-05-29 01:32:38.000000000 -0600 | |
152 | @@ -1,6 +1,7 @@ | |
153 | SUBDIRS = dcc notifylist | |
154 | ||
155 | -noinst_LIBRARIES = libfe_common_irc.a | |
156 | +libirssife_common_irc_LTLIBRARIES = libirssife_common_irc.la | |
157 | +libirssife_common_ircdir = $(libdir) | |
158 | ||
159 | INCLUDES = \ | |
160 | -I$(top_srcdir)/src \ | |
161 | @@ -29,7 +30,7 @@ | |
162 | irc-completion.c \ | |
163 | module-formats.c | |
164 | ||
165 | -libfe_common_irc_a_SOURCES = \ | |
166 | +libirssife_common_irc_la_SOURCES = \ | |
167 | $(real_sources) \ | |
168 | irc-modules.c | |
169 | ||
170 | diff -ur irssi-0.8.10-rc5-o/src/fe-common/irc/notifylist/Makefile.am irssi-0.8.10-rc5/src/fe-common/irc/notifylist/Makefile.am | |
171 | --- irssi-0.8.10-rc5-o/src/fe-common/irc/notifylist/Makefile.am 2004-05-10 14:45:03.000000000 -0600 | |
172 | +++ irssi-0.8.10-rc5/src/fe-common/irc/notifylist/Makefile.am 2005-05-29 01:32:38.000000000 -0600 | |
173 | @@ -1,4 +1,5 @@ | |
174 | -noinst_LIBRARIES = libfe_irc_notifylist.a | |
175 | +libirssife_irc_notifylist_LTLIBRARIES = libirssife_irc_notifylist.la | |
176 | +libirssife_irc_notifylistdir = $(libdir) | |
177 | ||
178 | INCLUDES = \ | |
179 | -I$(top_srcdir)/src \ | |
180 | @@ -9,7 +10,7 @@ | |
181 | -DHELPDIR=\""$(datadir)/irssi/help"\" \ | |
182 | -DSYSCONFDIR=\""$(sysconfdir)"\" | |
183 | ||
184 | -libfe_irc_notifylist_a_SOURCES = \ | |
185 | +libirssife_irc_notifylist_la_SOURCES = \ | |
186 | fe-notifylist.c \ | |
187 | module-formats.c | |
188 | ||
189 | diff -ur irssi-0.8.10-rc5-o/src/irc/core/Makefile.am irssi-0.8.10-rc5/src/irc/core/Makefile.am | |
190 | --- irssi-0.8.10-rc5-o/src/irc/core/Makefile.am 2004-05-10 14:45:04.000000000 -0600 | |
191 | +++ irssi-0.8.10-rc5/src/irc/core/Makefile.am 2005-05-29 01:32:38.000000000 -0600 | |
192 | @@ -1,4 +1,5 @@ | |
193 | -noinst_LIBRARIES = libirc_core.a | |
194 | +libirssi_irc_core_LTLIBRARIES = libirssi_irc_core.la | |
195 | +libirssi_irc_coredir = $(libdir) | |
196 | ||
197 | INCLUDES = \ | |
198 | -I$(top_srcdir)/src \ | |
199 | @@ -6,7 +7,7 @@ | |
200 | -DSYSCONFDIR=\""$(sysconfdir)"\" \ | |
201 | $(GLIB_CFLAGS) | |
202 | ||
203 | -libirc_core_a_SOURCES = \ | |
204 | +libirssi_irc_core_la_SOURCES = \ | |
205 | bans.c \ | |
206 | ctcp.c \ | |
207 | channels-query.c \ | |
208 | diff -ur irssi-0.8.10-rc5-o/src/irc/dcc/Makefile.am irssi-0.8.10-rc5/src/irc/dcc/Makefile.am | |
209 | --- irssi-0.8.10-rc5-o/src/irc/dcc/Makefile.am 2004-05-10 14:45:04.000000000 -0600 | |
210 | +++ irssi-0.8.10-rc5/src/irc/dcc/Makefile.am 2005-05-29 01:32:38.000000000 -0600 | |
211 | @@ -1,4 +1,5 @@ | |
212 | -noinst_LIBRARIES = libirc_dcc.a | |
213 | +libirssi_irc_dcc_LTLIBRARIES = libirssi_irc_dcc.la | |
214 | +libirssi_irc_dccdir = $(libdir) | |
215 | ||
216 | INCLUDES = \ | |
217 | -I$(top_srcdir)/src \ | |
218 | @@ -6,7 +7,7 @@ | |
219 | -I$(top_srcdir)/src/irc/core/ \ | |
220 | $(GLIB_CFLAGS) | |
221 | ||
222 | -libirc_dcc_a_SOURCES = \ | |
223 | +libirssi_irc_dcc_la_SOURCES = \ | |
224 | dcc.c \ | |
225 | dcc-chat.c \ | |
226 | dcc-get.c \ | |
227 | diff -ur irssi-0.8.10-rc5-o/src/irc/flood/Makefile.am irssi-0.8.10-rc5/src/irc/flood/Makefile.am | |
228 | --- irssi-0.8.10-rc5-o/src/irc/flood/Makefile.am 2004-05-10 14:45:04.000000000 -0600 | |
229 | +++ irssi-0.8.10-rc5/src/irc/flood/Makefile.am 2005-05-29 01:32:38.000000000 -0600 | |
230 | @@ -1,4 +1,5 @@ | |
231 | -noinst_LIBRARIES = libirc_flood.a | |
232 | +libirssi_irc_flood_LTLIBRARIES = libirssi_irc_flood.la | |
233 | +libirssi_irc_flooddir = $(libdir) | |
234 | ||
235 | INCLUDES = \ | |
236 | -I$(top_srcdir)/src \ | |
237 | @@ -6,7 +7,7 @@ | |
238 | -I$(top_srcdir)/src/irc/core/ \ | |
239 | $(GLIB_CFLAGS) | |
240 | ||
241 | -libirc_flood_a_SOURCES = \ | |
242 | +libirssi_irc_flood_la_SOURCES = \ | |
243 | autoignore.c \ | |
244 | flood.c | |
245 | ||
246 | diff -ur irssi-0.8.10-rc5-o/src/irc/Makefile.am irssi-0.8.10-rc5/src/irc/Makefile.am | |
247 | --- irssi-0.8.10-rc5-o/src/irc/Makefile.am 2002-03-15 14:07:19.000000000 -0700 | |
248 | +++ irssi-0.8.10-rc5/src/irc/Makefile.am 2005-05-29 01:32:38.000000000 -0600 | |
249 | @@ -4,9 +4,10 @@ | |
250 | ||
251 | SUBDIRS = core dcc flood notifylist $(PROXY) | |
252 | ||
253 | -noinst_LIBRARIES = libirc.a | |
254 | +libirssi_irc_LTLIBRARIES = libirssi_irc.la | |
255 | +libirssi_ircdir = $(libdir) | |
256 | ||
257 | -libirc_a_SOURCES = irc.c | |
258 | +libirssi_irc_la_SOURCES = irc.c | |
259 | ||
260 | DISTFILES = $(DIST_COMMON) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) | |
261 | ||
262 | diff -ur irssi-0.8.10-rc5-o/src/irc/notifylist/Makefile.am irssi-0.8.10-rc5/src/irc/notifylist/Makefile.am | |
263 | --- irssi-0.8.10-rc5-o/src/irc/notifylist/Makefile.am 2004-05-10 14:45:04.000000000 -0600 | |
264 | +++ irssi-0.8.10-rc5/src/irc/notifylist/Makefile.am 2005-05-29 01:32:38.000000000 -0600 | |
265 | @@ -1,4 +1,5 @@ | |
266 | -noinst_LIBRARIES = libirc_notifylist.a | |
267 | +libirssi_irc_notifylist_LTLIBRARIES = libirssi_irc_notifylist.la | |
268 | +libirssi_irc_notifylistdir = $(libdir) | |
269 | ||
270 | INCLUDES = \ | |
271 | -I$(top_srcdir)/src \ | |
272 | @@ -6,7 +7,7 @@ | |
273 | -I$(top_srcdir)/src/irc/core/ \ | |
274 | $(GLIB_CFLAGS) | |
275 | ||
276 | -libirc_notifylist_a_SOURCES = \ | |
277 | +libirssi_irc_notifylist_la_SOURCES = \ | |
278 | notifylist.c \ | |
279 | notify-commands.c \ | |
280 | notify-ison.c \ | |
281 | diff -ur irssi-0.8.10-rc5-o/src/lib-config/Makefile.am irssi-0.8.10-rc5/src/lib-config/Makefile.am | |
282 | --- irssi-0.8.10-rc5-o/src/lib-config/Makefile.am 2004-05-10 14:45:04.000000000 -0600 | |
283 | +++ irssi-0.8.10-rc5/src/lib-config/Makefile.am 2005-05-29 01:32:38.000000000 -0600 | |
284 | @@ -1,10 +1,11 @@ | |
285 | -noinst_LIBRARIES = libirssi_config.a | |
286 | +libirssi_config_LTLIBRARIES = libirssi_config.la | |
287 | +libirssi_configdir = /usr/lib | |
288 | ||
289 | INCLUDES = \ | |
290 | -I$(top_srcdir)/src \ | |
291 | $(GLIB_CFLAGS) | |
292 | ||
293 | -libirssi_config_a_SOURCES = \ | |
294 | +libirssi_config_la_SOURCES = \ | |
295 | get.c \ | |
296 | set.c \ | |
297 | parse.c \ | |
298 | diff -ur irssi-0.8.10-rc5-o/src/perl/Makefile.am irssi-0.8.10-rc5/src/perl/Makefile.am | |
299 | --- irssi-0.8.10-rc5-o/src/perl/Makefile.am 2003-11-16 11:30:02.000000000 -0700 | |
300 | +++ irssi-0.8.10-rc5/src/perl/Makefile.am 2005-05-29 01:33:18.000000000 -0600 | |
301 | @@ -7,11 +7,11 @@ | |
302 | module_LTLIBRARIES = $(perl_module_lib) $(perl_module_fe_lib) | |
303 | noinst_LTLIBRARIES = $(perl_static_lib) $(perl_static_fe_lib) | |
304 | EXTRA_LTLIBRARIES = \ | |
305 | - libperl_core.la libfe_perl.la \ | |
306 | - libperl_core_static.la libfe_perl_static.la | |
307 | + libirssi_perl_core.la libirssife_perl.la \ | |
308 | + libirssi_perl_core_static.la libirssife_perl_static.la | |
309 | ||
310 | -libperl_core_la_LDFLAGS = -avoid-version -rpath $(moduledir) | |
311 | -libfe_perl_la_LDFLAGS = -avoid-version -rpath $(moduledir) | |
312 | +libirssi_perl_core_la_LDFLAGS = -avoid-version -rpath $(moduledir) | |
313 | +libirssife_perl_la_LDFLAGS = -avoid-version -rpath $(moduledir) | |
314 | ||
315 | perl-core.c: perl-signals-list.h irssi-core.pl.h | |
316 | ||
317 | @@ -44,7 +44,7 @@ | |
318 | perl-signals.h \ | |
319 | perl-sources.h | |
320 | ||
321 | -libperl_core_la_DEPENDENCIES = .libs/libperl_orig.a .libs/DynaLoader.a | |
322 | +libirssi_perl_core_la_DEPENDENCIES = .libs/libperl_orig.a .libs/DynaLoader.a | |
323 | ||
324 | .libs/libperl_orig.a: | |
325 | if [ ! -d .libs ]; then mkdir .libs; fi | |
326 | @@ -55,16 +55,16 @@ | |
327 | rm -f .libs/DynaLoader.a | |
328 | $(LN_S) $(DYNALOADER_A) .libs/DynaLoader.a | |
329 | ||
330 | -libperl_core_la_SOURCES = \ | |
331 | +libirssi_perl_core_la_SOURCES = \ | |
332 | $(perl_sources) | |
333 | ||
334 | -libperl_core_static_la_SOURCES = \ | |
335 | +libirssi_perl_core_static_la_SOURCES = \ | |
336 | $(perl_sources) | |
337 | ||
338 | -libfe_perl_la_SOURCES = \ | |
339 | +libirssife_perl_la_SOURCES = \ | |
340 | $(perl_fe_sources) | |
341 | ||
342 | -libfe_perl_static_la_SOURCES = \ | |
343 | +libirssife_perl_static_la_SOURCES = \ | |
344 | $(perl_fe_sources) | |
345 | ||
346 | perl-signals-list.h: $(top_srcdir)/docs/signals.txt $(srcdir)/get-signals.pl | |
347 | @@ -165,4 +165,4 @@ | |
348 | cd ..; \ | |
349 | done | |
350 | ||
351 | -libperl_core_la_LIBADD = $(PERL_LDFLAGS) | |
352 | +libirssi_perl_core_la_LIBADD = $(PERL_LDFLAGS) |