]>
Commit | Line | Data |
---|---|---|
20ce40f7 AM |
1 | diff -urNp -x '*.orig' irssi-1.2.2.org/configure.ac irssi-1.2.2/configure.ac |
2 | --- irssi-1.2.2.org/configure.ac 2019-08-29 15:48:46.000000000 +0200 | |
3 | +++ irssi-1.2.2/configure.ac 2021-05-04 21:23:17.308905879 +0200 | |
4 | @@ -212,6 +212,10 @@ case "$host_os" in | |
bd1b19f5 | 5 | ;; |
6 | esac | |
7 | ||
8 | +AC_CHECK_LIB(popt, poptGetInvocationName, [ | |
9 | + LIBS="$LIBS -lpopt" | |
10 | +]) | |
11 | + | |
12 | ||
20ce40f7 | 13 | AC_SEARCH_LIBS([socket], [network socket]) |
bd1b19f5 | 14 | |
20ce40f7 | 15 | @@ -472,20 +476,20 @@ if test "$want_perl" != "no"; then |
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" | |
8d00258f | 21 | + PERL_LINK_LIBS="../perl/libirssi_perl_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 | |
8d00258f | 31 | + perl_static_lib=libirssi_perl_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 | |
8d00258f | 37 | + perl_module_lib=libirssi_perl_core.la |
bd1b19f5 | 38 | + perl_module_fe_lib=libirssife_perl.la |
39 | perl_static_lib= | |
40 | perl_static_fe_lib= | |
39c30ae8 | 41 | fi |
20ce40f7 | 42 | @@ -641,7 +645,7 @@ dnl ************************************ |
bd1b19f5 | 43 | AC_SUBST(CHAT_MODULES) |
44 | AC_SUBST(irc_MODULES) | |
45 | ||
39c30ae8 | 46 | -CORE_LIBS="../core/libcore.a ../lib-config/libirssi_config.a" |
8d00258f | 47 | +CORE_LIBS="../core/libirssi_core.la ../lib-config/libirssi_config.la" |
bd1b19f5 | 48 | FE_COMMON_LIBS="" |
49 | ||
50 | CHAT_LIBS="" | |
20ce40f7 | 51 | @@ -650,16 +654,16 @@ for c in $CHAT_MODULES; do |
bd1b19f5 | 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 | |
20ce40f7 | 72 | @@ -689,7 +693,7 @@ for c in $CHAT_MODULES; do |
bd1b19f5 | 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" | |
20ce40f7 AM |
81 | diff -urNp -x '*.orig' irssi-1.2.2.org/src/core/Makefile.am irssi-1.2.2/src/core/Makefile.am |
82 | --- irssi-1.2.2.org/src/core/Makefile.am 2019-08-29 15:48:46.000000000 +0200 | |
83 | +++ irssi-1.2.2/src/core/Makefile.am 2021-05-04 21:23:17.308905879 +0200 | |
bd1b19f5 | 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 | |
20ce40f7 | 90 | AM_CPPFLAGS = \ |
bd1b19f5 | 91 | -I$(top_srcdir)/src \ |
20ce40f7 AM |
92 | @@ -13,7 +15,7 @@ else |
93 | regex_impl=iregex-regexh.c | |
94 | endif | |
bd1b19f5 | 95 | |
96 | -libcore_a_SOURCES = \ | |
97 | +libirssi_core_la_SOURCES = \ | |
98 | args.c \ | |
99 | channels.c \ | |
100 | channels-setup.c \ | |
20ce40f7 AM |
101 | diff -urNp -x '*.orig' irssi-1.2.2.org/src/fe-common/core/Makefile.am irssi-1.2.2/src/fe-common/core/Makefile.am |
102 | --- irssi-1.2.2.org/src/fe-common/core/Makefile.am 2019-08-29 15:48:46.000000000 +0200 | |
103 | +++ irssi-1.2.2/src/fe-common/core/Makefile.am 2021-05-04 21:23:17.308905879 +0200 | |
bd1b19f5 | 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 | ||
20ce40f7 | 109 | AM_CPPFLAGS = \ |
bd1b19f5 | 110 | -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \ |
20ce40f7 | 111 | @@ -6,7 +7,7 @@ AM_CPPFLAGS = \ |
bd1b19f5 | 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 \ |
20ce40f7 AM |
120 | diff -urNp -x '*.orig' irssi-1.2.2.org/src/fe-common/irc/Makefile.am irssi-1.2.2/src/fe-common/irc/Makefile.am |
121 | --- irssi-1.2.2.org/src/fe-common/irc/Makefile.am 2019-08-29 15:48:46.000000000 +0200 | |
122 | +++ irssi-1.2.2/src/fe-common/irc/Makefile.am 2021-05-04 21:23:17.308905879 +0200 | |
bd1b19f5 | 123 | @@ -1,6 +1,7 @@ |
124 | SUBDIRS = dcc notifylist | |
125 | ||
126 | -noinst_LIBRARIES = libfe_common_irc.a | |
127 | +libirssife_common_irc_LTLIBRARIES = libirssife_common_irc.la | |
128 | +libirssife_common_ircdir = $(libdir) | |
129 | ||
20ce40f7 | 130 | AM_CPPFLAGS = \ |
bd1b19f5 | 131 | -I$(top_srcdir)/src \ |
20ce40f7 | 132 | @@ -31,7 +32,7 @@ real_sources = \ |
bd1b19f5 | 133 | irc-completion.c \ |
134 | module-formats.c | |
135 | ||
136 | -libfe_common_irc_a_SOURCES = \ | |
137 | +libirssife_common_irc_la_SOURCES = \ | |
138 | $(real_sources) \ | |
139 | irc-modules.c | |
140 | ||
20ce40f7 AM |
141 | diff -urNp -x '*.orig' irssi-1.2.2.org/src/fe-common/irc/dcc/Makefile.am irssi-1.2.2/src/fe-common/irc/dcc/Makefile.am |
142 | --- irssi-1.2.2.org/src/fe-common/irc/dcc/Makefile.am 2019-08-29 15:48:46.000000000 +0200 | |
143 | +++ irssi-1.2.2/src/fe-common/irc/dcc/Makefile.am 2021-05-04 21:23:17.308905879 +0200 | |
144 | @@ -1,4 +1,5 @@ | |
145 | -noinst_LIBRARIES = libfe_irc_dcc.a | |
146 | +libirssife_irc_dcc_LTLIBRARIES = libirssife_irc_dcc.la | |
147 | +libirssife_irc_dccdir = $(libdir) | |
148 | ||
149 | AM_CPPFLAGS = \ | |
150 | -I$(top_srcdir)/src \ | |
151 | @@ -10,7 +11,7 @@ AM_CPPFLAGS = \ | |
152 | -DHELPDIR=\""$(datadir)/irssi/help"\" \ | |
153 | -DSYSCONFDIR=\""$(sysconfdir)"\" | |
154 | ||
155 | -libfe_irc_dcc_a_SOURCES = \ | |
156 | +libirssife_irc_dcc_la_SOURCES = \ | |
157 | fe-dcc.c \ | |
158 | fe-dcc-chat.c \ | |
159 | fe-dcc-chat-messages.c \ | |
160 | diff -urNp -x '*.orig' irssi-1.2.2.org/src/fe-common/irc/notifylist/Makefile.am irssi-1.2.2/src/fe-common/irc/notifylist/Makefile.am | |
161 | --- irssi-1.2.2.org/src/fe-common/irc/notifylist/Makefile.am 2019-08-29 15:48:46.000000000 +0200 | |
162 | +++ irssi-1.2.2/src/fe-common/irc/notifylist/Makefile.am 2021-05-04 21:23:17.308905879 +0200 | |
bd1b19f5 | 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 | ||
20ce40f7 | 168 | AM_CPPFLAGS = \ |
bd1b19f5 | 169 | -I$(top_srcdir)/src \ |
20ce40f7 | 170 | @@ -9,7 +10,7 @@ AM_CPPFLAGS = \ |
bd1b19f5 | 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 | ||
20ce40f7 AM |
179 | diff -urNp -x '*.orig' irssi-1.2.2.org/src/irc/Makefile.am irssi-1.2.2/src/irc/Makefile.am |
180 | --- irssi-1.2.2.org/src/irc/Makefile.am 2019-08-29 15:48:46.000000000 +0200 | |
181 | +++ irssi-1.2.2/src/irc/Makefile.am 2021-05-04 21:23:17.308905879 +0200 | |
182 | @@ -4,9 +4,10 @@ endif | |
183 | ||
184 | SUBDIRS = core dcc flood notifylist $(PROXY) | |
185 | ||
186 | -noinst_LIBRARIES = libirc.a | |
187 | +libirssi_irc_LTLIBRARIES = libirssi_irc.la | |
188 | +libirssi_ircdir = $(libdir) | |
189 | ||
190 | -libirc_a_SOURCES = irc.c | |
191 | +libirssi_irc_la_SOURCES = irc.c | |
192 | ||
193 | DISTFILES = $(DIST_COMMON) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) | |
194 | ||
195 | diff -urNp -x '*.orig' irssi-1.2.2.org/src/irc/core/Makefile.am irssi-1.2.2/src/irc/core/Makefile.am | |
196 | --- irssi-1.2.2.org/src/irc/core/Makefile.am 2019-08-29 15:48:46.000000000 +0200 | |
197 | +++ irssi-1.2.2/src/irc/core/Makefile.am 2021-05-04 21:23:17.308905879 +0200 | |
bd1b19f5 | 198 | @@ -1,4 +1,5 @@ |
199 | -noinst_LIBRARIES = libirc_core.a | |
200 | +libirssi_irc_core_LTLIBRARIES = libirssi_irc_core.la | |
201 | +libirssi_irc_coredir = $(libdir) | |
202 | ||
20ce40f7 | 203 | AM_CPPFLAGS = \ |
bd1b19f5 | 204 | -I$(top_srcdir)/src \ |
20ce40f7 | 205 | @@ -6,7 +7,7 @@ AM_CPPFLAGS = \ |
bd1b19f5 | 206 | -DSYSCONFDIR=\""$(sysconfdir)"\" \ |
207 | $(GLIB_CFLAGS) | |
208 | ||
209 | -libirc_core_a_SOURCES = \ | |
210 | +libirssi_irc_core_la_SOURCES = \ | |
211 | bans.c \ | |
212 | ctcp.c \ | |
213 | channels-query.c \ | |
20ce40f7 AM |
214 | diff -urNp -x '*.orig' irssi-1.2.2.org/src/irc/dcc/Makefile.am irssi-1.2.2/src/irc/dcc/Makefile.am |
215 | --- irssi-1.2.2.org/src/irc/dcc/Makefile.am 2019-08-29 15:48:46.000000000 +0200 | |
216 | +++ irssi-1.2.2/src/irc/dcc/Makefile.am 2021-05-04 21:23:17.308905879 +0200 | |
bd1b19f5 | 217 | @@ -1,4 +1,5 @@ |
218 | -noinst_LIBRARIES = libirc_dcc.a | |
219 | +libirssi_irc_dcc_LTLIBRARIES = libirssi_irc_dcc.la | |
220 | +libirssi_irc_dccdir = $(libdir) | |
221 | ||
20ce40f7 | 222 | AM_CPPFLAGS = \ |
bd1b19f5 | 223 | -I$(top_srcdir)/src \ |
20ce40f7 | 224 | @@ -6,7 +7,7 @@ AM_CPPFLAGS = \ |
bd1b19f5 | 225 | -I$(top_srcdir)/src/irc/core/ \ |
226 | $(GLIB_CFLAGS) | |
227 | ||
228 | -libirc_dcc_a_SOURCES = \ | |
229 | +libirssi_irc_dcc_la_SOURCES = \ | |
230 | dcc.c \ | |
231 | dcc-chat.c \ | |
232 | dcc-get.c \ | |
20ce40f7 AM |
233 | diff -urNp -x '*.orig' irssi-1.2.2.org/src/irc/flood/Makefile.am irssi-1.2.2/src/irc/flood/Makefile.am |
234 | --- irssi-1.2.2.org/src/irc/flood/Makefile.am 2019-08-29 15:48:46.000000000 +0200 | |
235 | +++ irssi-1.2.2/src/irc/flood/Makefile.am 2021-05-04 21:23:17.308905879 +0200 | |
bd1b19f5 | 236 | @@ -1,4 +1,5 @@ |
237 | -noinst_LIBRARIES = libirc_flood.a | |
238 | +libirssi_irc_flood_LTLIBRARIES = libirssi_irc_flood.la | |
239 | +libirssi_irc_flooddir = $(libdir) | |
240 | ||
20ce40f7 | 241 | AM_CPPFLAGS = \ |
bd1b19f5 | 242 | -I$(top_srcdir)/src \ |
20ce40f7 | 243 | @@ -6,7 +7,7 @@ AM_CPPFLAGS = \ |
bd1b19f5 | 244 | -I$(top_srcdir)/src/irc/core/ \ |
245 | $(GLIB_CFLAGS) | |
246 | ||
247 | -libirc_flood_a_SOURCES = \ | |
248 | +libirssi_irc_flood_la_SOURCES = \ | |
249 | autoignore.c \ | |
250 | flood.c | |
251 | ||
20ce40f7 AM |
252 | diff -urNp -x '*.orig' irssi-1.2.2.org/src/irc/notifylist/Makefile.am irssi-1.2.2/src/irc/notifylist/Makefile.am |
253 | --- irssi-1.2.2.org/src/irc/notifylist/Makefile.am 2019-08-29 15:48:46.000000000 +0200 | |
254 | +++ irssi-1.2.2/src/irc/notifylist/Makefile.am 2021-05-04 21:23:17.308905879 +0200 | |
bd1b19f5 | 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 | ||
20ce40f7 | 260 | AM_CPPFLAGS = \ |
bd1b19f5 | 261 | -I$(top_srcdir)/src \ |
20ce40f7 | 262 | @@ -6,7 +7,7 @@ AM_CPPFLAGS = \ |
bd1b19f5 | 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 \ | |
20ce40f7 AM |
271 | diff -urNp -x '*.orig' irssi-1.2.2.org/src/lib-config/Makefile.am irssi-1.2.2/src/lib-config/Makefile.am |
272 | --- irssi-1.2.2.org/src/lib-config/Makefile.am 2019-08-29 15:48:46.000000000 +0200 | |
273 | +++ irssi-1.2.2/src/lib-config/Makefile.am 2021-05-04 21:23:17.308905879 +0200 | |
bd1b19f5 | 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 | |
c7d2e44a | 279 | AM_CPPFLAGS = \ |
bd1b19f5 | 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 \ | |
20ce40f7 AM |
288 | diff -urNp -x '*.orig' irssi-1.2.2.org/src/perl/Makefile.am irssi-1.2.2/src/perl/Makefile.am |
289 | --- irssi-1.2.2.org/src/perl/Makefile.am 2019-08-29 15:48:46.000000000 +0200 | |
290 | +++ irssi-1.2.2/src/perl/Makefile.am 2021-05-04 21:23:17.308905879 +0200 | |
291 | @@ -5,11 +5,11 @@ perl_dirs = common irc ui textui | |
bd1b19f5 | 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 | |
20ce40f7 AM |
305 | perl-core.lo: irssi-core.pl.h |
306 | perl-signals.lo: perl-signals-list.h | |
307 | @@ -43,16 +43,16 @@ noinst_HEADERS = \ | |
308 | perl-signals.h \ | |
309 | perl-sources.h | |
bd1b19f5 | 310 | |
311 | -libperl_core_la_SOURCES = \ | |
312 | +libirssi_perl_core_la_SOURCES = \ | |
313 | $(perl_sources) | |
314 | ||
315 | -libperl_core_static_la_SOURCES = \ | |
316 | +libirssi_perl_core_static_la_SOURCES = \ | |
317 | $(perl_sources) | |
318 | ||
319 | -libfe_perl_la_SOURCES = \ | |
320 | +libirssife_perl_la_SOURCES = \ | |
321 | $(perl_fe_sources) | |
322 | ||
323 | -libfe_perl_static_la_SOURCES = \ | |
324 | +libirssife_perl_static_la_SOURCES = \ | |
325 | $(perl_fe_sources) | |
326 | ||
327 | perl-signals-list.h: $(top_srcdir)/docs/signals.txt $(srcdir)/get-signals.pl | |
20ce40f7 | 328 | @@ -162,4 +162,4 @@ distclean-generic: |
bd1b19f5 | 329 | cd ..; \ |
330 | done | |
331 | ||
332 | -libperl_core_la_LIBADD = $(PERL_LDFLAGS) | |
333 | +libirssi_perl_core_la_LIBADD = $(PERL_LDFLAGS) |