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
8 +AC_CHECK_LIB(popt, poptGetInvocationName, [
13 AC_CHECK_FUNCS(mkfifo fcntl nl_langinfo)
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"
24 AC_DEFINE(HAVE_STATIC_PERL)
26 dnl * build only static library of perl module
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'
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
42 PERL_LIBTOOL='$(SHELL) $(top_builddir)/libtool'
44 AC_SUBST(CHAT_MODULES)
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"
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 "
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"
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"
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
86 -noinst_LIBRARIES = libcore.a
87 +libirssi_core_LTLIBRARIES = libirssi_core.la
89 +libirssi_coredir = $(libdir)
94 -DSYSCONFDIR=\""$(sysconfdir)"\" \
95 -DMODULEDIR=\""$(libdir)/irssi/modules"\"
97 -libcore_a_SOURCES = \
98 +libirssi_core_la_SOURCES = \
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
106 -noinst_LIBRARIES = libfe_common_core.a
107 +libirssife_common_core_LTLIBRARIES = libirssife_common_core.la
108 +libirssife_common_coredir = $(libdir)
111 -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \
113 -DHELPDIR=\""$(datadir)/irssi/help"\" \
114 -DTHEMESDIR=\""$(datadir)/irssi/themes"\"
116 -libfe_common_core_a_SOURCES = \
117 +libirssife_common_core_la_SOURCES = \
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
125 -noinst_LIBRARIES = libfe_irc_dcc.a
126 +libirssife_irc_dcc_LTLIBRARIES = libirssife_irc_dcc.la
127 +libirssife_irc_dccdir = $(libdir)
130 -I$(top_srcdir)/src \
132 -DHELPDIR=\""$(datadir)/irssi/help"\" \
133 -DSYSCONFDIR=\""$(sysconfdir)"\"
135 -libfe_irc_dcc_a_SOURCES = \
136 +libirssife_irc_dcc_la_SOURCES = \
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
144 SUBDIRS = dcc notifylist
146 -noinst_LIBRARIES = libfe_common_irc.a
147 +libirssife_common_irc_LTLIBRARIES = libirssife_common_irc.la
148 +libirssife_common_ircdir = $(libdir)
151 -I$(top_srcdir)/src \
156 -libfe_common_irc_a_SOURCES = \
157 +libirssife_common_irc_la_SOURCES = \
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
165 -noinst_LIBRARIES = libfe_irc_notifylist.a
166 +libirssife_irc_notifylist_LTLIBRARIES = libirssife_irc_notifylist.la
167 +libirssife_irc_notifylistdir = $(libdir)
170 -I$(top_srcdir)/src \
172 -DHELPDIR=\""$(datadir)/irssi/help"\" \
173 -DSYSCONFDIR=\""$(sysconfdir)"\"
175 -libfe_irc_notifylist_a_SOURCES = \
176 +libirssife_irc_notifylist_la_SOURCES = \
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
184 -noinst_LIBRARIES = libirc_core.a
185 +libirssi_irc_core_LTLIBRARIES = libirssi_irc_core.la
186 +libirssi_irc_coredir = $(libdir)
189 -I$(top_srcdir)/src \
191 -DSYSCONFDIR=\""$(sysconfdir)"\" \
194 -libirc_core_a_SOURCES = \
195 +libirssi_irc_core_la_SOURCES = \
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
203 -noinst_LIBRARIES = libirc_dcc.a
204 +libirssi_irc_dcc_LTLIBRARIES = libirssi_irc_dcc.la
205 +libirssi_irc_dccdir = $(libdir)
208 -I$(top_srcdir)/src \
210 -I$(top_srcdir)/src/irc/core/ \
213 -libirc_dcc_a_SOURCES = \
214 +libirssi_irc_dcc_la_SOURCES = \
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
222 -noinst_LIBRARIES = libirc_flood.a
223 +libirssi_irc_flood_LTLIBRARIES = libirssi_irc_flood.la
224 +libirssi_irc_flooddir = $(libdir)
227 -I$(top_srcdir)/src \
229 -I$(top_srcdir)/src/irc/core/ \
232 -libirc_flood_a_SOURCES = \
233 +libirssi_irc_flood_la_SOURCES = \
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
242 SUBDIRS = core dcc flood notifylist $(PROXY)
244 -noinst_LIBRARIES = libirc.a
245 +libirssi_irc_LTLIBRARIES = libirssi_irc.la
246 +libirssi_ircdir = $(libdir)
248 -libirc_a_SOURCES = irc.c
249 +libirssi_irc_la_SOURCES = irc.c
251 DISTFILES = $(DIST_COMMON) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
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
257 -noinst_LIBRARIES = libirc_notifylist.a
258 +libirssi_irc_notifylist_LTLIBRARIES = libirssi_irc_notifylist.la
259 +libirssi_irc_notifylistdir = $(libdir)
262 -I$(top_srcdir)/src \
264 -I$(top_srcdir)/src/irc/core/ \
267 -libirc_notifylist_a_SOURCES = \
268 +libirssi_irc_notifylist_la_SOURCES = \
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
276 -noinst_LIBRARIES = libirssi_config.a
277 +libirssi_config_LTLIBRARIES = libirssi_config.la
278 +libirssi_configdir = $(libdir)
281 -I$(top_srcdir)/src \
284 -libirssi_config_a_SOURCES = \
285 +libirssi_config_la_SOURCES = \
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
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
297 + libirssi_perl_core.la libirssife_perl.la \
298 + libirssi_perl_core_static.la libirssife_perl_static.la
300 -libperl_core_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
301 -libfe_perl_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
302 +libirssi_perl_core_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
303 +libirssife_perl_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
305 perl-core.c: perl-signals-list.h irssi-core.pl.h
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
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
317 .libs/libperl_orig.a:
318 if [ ! -d .libs ]; then mkdir .libs; fi
320 rm -f .libs/DynaLoader.a
321 $(LN_S) $(DYNALOADER_A) .libs/DynaLoader.a
323 -libperl_core_la_SOURCES = \
324 +libirssi_perl_core_la_SOURCES = \
327 -libperl_core_static_la_SOURCES = \
328 +libirssi_perl_core_static_la_SOURCES = \
331 -libfe_perl_la_SOURCES = \
332 +libirssife_perl_la_SOURCES = \
335 -libfe_perl_static_la_SOURCES = \
336 +libirssife_perl_static_la_SOURCES = \
339 perl-signals-list.h: $(top_srcdir)/docs/signals.txt $(srcdir)/get-signals.pl
344 -libperl_core_la_LIBADD = $(PERL_LDFLAGS)
345 +libirssi_perl_core_la_LIBADD = $(PERL_LDFLAGS)