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