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