diff -urNp -x '*.orig' irssi-1.2.2.org/configure.ac irssi-1.2.2/configure.ac --- irssi-1.2.2.org/configure.ac 2019-08-29 15:48:46.000000000 +0200 +++ irssi-1.2.2/configure.ac 2021-05-04 21:23:17.308905879 +0200 @@ -212,6 +212,10 @@ case "$host_os" in ;; esac +AC_CHECK_LIB(popt, poptGetInvocationName, [ + LIBS="$LIBS -lpopt" +]) + AC_SEARCH_LIBS([socket], [network socket]) @@ -472,20 +476,20 @@ if test "$want_perl" != "no"; then dnl * building with static perl support dnl * all PERL_LDFLAGS linking is done in fe-text PERL_LINK_FLAGS="$PERL_LDFLAGS" - PERL_LINK_LIBS="../perl/libperl_core_static.la" - PERL_FE_LINK_LIBS="../perl/libfe_perl_static.la" + PERL_LINK_LIBS="../perl/libirssi_perl_core_static.la" + PERL_FE_LINK_LIBS="../perl/libirssife_perl_static.la" PERL_LDFLAGS= AC_DEFINE(HAVE_STATIC_PERL) dnl * build only static library of perl module perl_module_lib= perl_module_fe_lib= - perl_static_lib=libperl_core_static.la - perl_static_fe_lib=libfe_perl_static.la + perl_static_lib=libirssi_perl_core_static.la + perl_static_fe_lib=libirssife_perl_static.la else dnl * build dynamic library of perl module - perl_module_lib=libperl_core.la - perl_module_fe_lib=libfe_perl.la + perl_module_lib=libirssi_perl_core.la + perl_module_fe_lib=libirssife_perl.la perl_static_lib= perl_static_fe_lib= fi @@ -641,7 +645,7 @@ dnl ************************************ AC_SUBST(CHAT_MODULES) AC_SUBST(irc_MODULES) -CORE_LIBS="../core/libcore.a ../lib-config/libirssi_config.a" +CORE_LIBS="../core/libirssi_core.la ../lib-config/libirssi_config.la" FE_COMMON_LIBS="" CHAT_LIBS="" @@ -650,16 +654,16 @@ for c in $CHAT_MODULES; do module_deinits="" fe_module_inits="" fe_module_deinits="" - CHAT_LIBS="$CHAT_LIBS ../$c/lib$c.a ../$c/core/lib${c}_core.a" + CHAT_LIBS="$CHAT_LIBS ../$c/libirssi_$c.la ../$c/core/libirssi_${c}_core.la" if test -f $srcdir/src/fe-common/$c/module.h; then - FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/libfe_common_$c.a " + FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/libirssife_common_$c.la " fi for s in `eval echo \\$${c}_MODULES`; do - CHAT_LIBS="$CHAT_LIBS ../$c/$s/lib${c}_$s.a" + CHAT_LIBS="$CHAT_LIBS ../$c/$s/libirssi_${c}_$s.la" module_inits="$module_inits ${c}_${s}_init();" module_deinits="${c}_${s}_deinit(); $module_deinits" if test -f $srcdir/src/fe-common/$c/$s/module.h; then - FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/$s/libfe_${c}_$s.a " + FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/$s/libirssife_${c}_$s.la " fe_module_inits="$fe_module_inits fe_${c}_${s}_init();" fe_module_deinits="fe_${c}_${s}_deinit(); $fe_module_deinits" fi @@ -689,7 +693,7 @@ for c in $CHAT_MODULES; do fi done -FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/core/libfe_common_core.a" +FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/core/libirssife_common_core.la" dnl ** common libraries needed by frontends COMMON_NOUI_LIBS="$CHAT_LIBS $CORE_LIBS" diff -urNp -x '*.orig' irssi-1.2.2.org/src/core/Makefile.am irssi-1.2.2/src/core/Makefile.am --- irssi-1.2.2.org/src/core/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ irssi-1.2.2/src/core/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -1,4 +1,6 @@ -noinst_LIBRARIES = libcore.a +libirssi_core_LTLIBRARIES = libirssi_core.la + +libirssi_coredir = $(libdir) AM_CPPFLAGS = \ -I$(top_srcdir)/src \ @@ -13,7 +15,7 @@ else regex_impl=iregex-regexh.c endif -libcore_a_SOURCES = \ +libirssi_core_la_SOURCES = \ args.c \ channels.c \ channels-setup.c \ 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 --- irssi-1.2.2.org/src/fe-common/core/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ irssi-1.2.2/src/fe-common/core/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -1,4 +1,5 @@ -noinst_LIBRARIES = libfe_common_core.a +libirssife_common_core_LTLIBRARIES = libirssife_common_core.la +libirssife_common_coredir = $(libdir) AM_CPPFLAGS = \ -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \ @@ -6,7 +7,7 @@ AM_CPPFLAGS = \ -DHELPDIR=\""$(datadir)/irssi/help"\" \ -DTHEMESDIR=\""$(datadir)/irssi/themes"\" -libfe_common_core_a_SOURCES = \ +libirssife_common_core_la_SOURCES = \ chat-completion.c \ command-history.c \ completion.c \ 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 --- irssi-1.2.2.org/src/fe-common/irc/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ irssi-1.2.2/src/fe-common/irc/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -1,6 +1,7 @@ SUBDIRS = dcc notifylist -noinst_LIBRARIES = libfe_common_irc.a +libirssife_common_irc_LTLIBRARIES = libirssife_common_irc.la +libirssife_common_ircdir = $(libdir) AM_CPPFLAGS = \ -I$(top_srcdir)/src \ @@ -31,7 +32,7 @@ real_sources = \ irc-completion.c \ module-formats.c -libfe_common_irc_a_SOURCES = \ +libirssife_common_irc_la_SOURCES = \ $(real_sources) \ irc-modules.c 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 --- irssi-1.2.2.org/src/fe-common/irc/dcc/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ irssi-1.2.2/src/fe-common/irc/dcc/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -1,4 +1,5 @@ -noinst_LIBRARIES = libfe_irc_dcc.a +libirssife_irc_dcc_LTLIBRARIES = libirssife_irc_dcc.la +libirssife_irc_dccdir = $(libdir) AM_CPPFLAGS = \ -I$(top_srcdir)/src \ @@ -10,7 +11,7 @@ AM_CPPFLAGS = \ -DHELPDIR=\""$(datadir)/irssi/help"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" -libfe_irc_dcc_a_SOURCES = \ +libirssife_irc_dcc_la_SOURCES = \ fe-dcc.c \ fe-dcc-chat.c \ fe-dcc-chat-messages.c \ 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 --- irssi-1.2.2.org/src/fe-common/irc/notifylist/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ irssi-1.2.2/src/fe-common/irc/notifylist/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -1,4 +1,5 @@ -noinst_LIBRARIES = libfe_irc_notifylist.a +libirssife_irc_notifylist_LTLIBRARIES = libirssife_irc_notifylist.la +libirssife_irc_notifylistdir = $(libdir) AM_CPPFLAGS = \ -I$(top_srcdir)/src \ @@ -9,7 +10,7 @@ AM_CPPFLAGS = \ -DHELPDIR=\""$(datadir)/irssi/help"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" -libfe_irc_notifylist_a_SOURCES = \ +libirssife_irc_notifylist_la_SOURCES = \ fe-notifylist.c \ module-formats.c diff -urNp -x '*.orig' irssi-1.2.2.org/src/irc/Makefile.am irssi-1.2.2/src/irc/Makefile.am --- irssi-1.2.2.org/src/irc/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ irssi-1.2.2/src/irc/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -4,9 +4,10 @@ endif SUBDIRS = core dcc flood notifylist $(PROXY) -noinst_LIBRARIES = libirc.a +libirssi_irc_LTLIBRARIES = libirssi_irc.la +libirssi_ircdir = $(libdir) -libirc_a_SOURCES = irc.c +libirssi_irc_la_SOURCES = irc.c DISTFILES = $(DIST_COMMON) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) diff -urNp -x '*.orig' irssi-1.2.2.org/src/irc/core/Makefile.am irssi-1.2.2/src/irc/core/Makefile.am --- irssi-1.2.2.org/src/irc/core/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ irssi-1.2.2/src/irc/core/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -1,4 +1,5 @@ -noinst_LIBRARIES = libirc_core.a +libirssi_irc_core_LTLIBRARIES = libirssi_irc_core.la +libirssi_irc_coredir = $(libdir) AM_CPPFLAGS = \ -I$(top_srcdir)/src \ @@ -6,7 +7,7 @@ AM_CPPFLAGS = \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ $(GLIB_CFLAGS) -libirc_core_a_SOURCES = \ +libirssi_irc_core_la_SOURCES = \ bans.c \ ctcp.c \ channels-query.c \ diff -urNp -x '*.orig' irssi-1.2.2.org/src/irc/dcc/Makefile.am irssi-1.2.2/src/irc/dcc/Makefile.am --- irssi-1.2.2.org/src/irc/dcc/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ irssi-1.2.2/src/irc/dcc/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -1,4 +1,5 @@ -noinst_LIBRARIES = libirc_dcc.a +libirssi_irc_dcc_LTLIBRARIES = libirssi_irc_dcc.la +libirssi_irc_dccdir = $(libdir) AM_CPPFLAGS = \ -I$(top_srcdir)/src \ @@ -6,7 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/irc/core/ \ $(GLIB_CFLAGS) -libirc_dcc_a_SOURCES = \ +libirssi_irc_dcc_la_SOURCES = \ dcc.c \ dcc-chat.c \ dcc-get.c \ diff -urNp -x '*.orig' irssi-1.2.2.org/src/irc/flood/Makefile.am irssi-1.2.2/src/irc/flood/Makefile.am --- irssi-1.2.2.org/src/irc/flood/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ irssi-1.2.2/src/irc/flood/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -1,4 +1,5 @@ -noinst_LIBRARIES = libirc_flood.a +libirssi_irc_flood_LTLIBRARIES = libirssi_irc_flood.la +libirssi_irc_flooddir = $(libdir) AM_CPPFLAGS = \ -I$(top_srcdir)/src \ @@ -6,7 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/irc/core/ \ $(GLIB_CFLAGS) -libirc_flood_a_SOURCES = \ +libirssi_irc_flood_la_SOURCES = \ autoignore.c \ flood.c diff -urNp -x '*.orig' irssi-1.2.2.org/src/irc/notifylist/Makefile.am irssi-1.2.2/src/irc/notifylist/Makefile.am --- irssi-1.2.2.org/src/irc/notifylist/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ irssi-1.2.2/src/irc/notifylist/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -1,4 +1,5 @@ -noinst_LIBRARIES = libirc_notifylist.a +libirssi_irc_notifylist_LTLIBRARIES = libirssi_irc_notifylist.la +libirssi_irc_notifylistdir = $(libdir) AM_CPPFLAGS = \ -I$(top_srcdir)/src \ @@ -6,7 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/irc/core/ \ $(GLIB_CFLAGS) -libirc_notifylist_a_SOURCES = \ +libirssi_irc_notifylist_la_SOURCES = \ notifylist.c \ notify-commands.c \ notify-ison.c \ diff -urNp -x '*.orig' irssi-1.2.2.org/src/lib-config/Makefile.am irssi-1.2.2/src/lib-config/Makefile.am --- irssi-1.2.2.org/src/lib-config/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ irssi-1.2.2/src/lib-config/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -1,10 +1,11 @@ -noinst_LIBRARIES = libirssi_config.a +libirssi_config_LTLIBRARIES = libirssi_config.la +libirssi_configdir = $(libdir) AM_CPPFLAGS = \ -I$(top_srcdir)/src \ $(GLIB_CFLAGS) -libirssi_config_a_SOURCES = \ +libirssi_config_la_SOURCES = \ get.c \ set.c \ parse.c \ diff -urNp -x '*.orig' irssi-1.2.2.org/src/perl/Makefile.am irssi-1.2.2/src/perl/Makefile.am --- irssi-1.2.2.org/src/perl/Makefile.am 2019-08-29 15:48:46.000000000 +0200 +++ irssi-1.2.2/src/perl/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -5,11 +5,11 @@ perl_dirs = common irc ui textui module_LTLIBRARIES = $(perl_module_lib) $(perl_module_fe_lib) noinst_LTLIBRARIES = $(perl_static_lib) $(perl_static_fe_lib) EXTRA_LTLIBRARIES = \ - libperl_core.la libfe_perl.la \ - libperl_core_static.la libfe_perl_static.la + libirssi_perl_core.la libirssife_perl.la \ + libirssi_perl_core_static.la libirssife_perl_static.la -libperl_core_la_LDFLAGS = -module -avoid-version -rpath $(moduledir) -libfe_perl_la_LDFLAGS = -module -avoid-version -rpath $(moduledir) +libirssi_perl_core_la_LDFLAGS = -module -avoid-version -rpath $(moduledir) +libirssife_perl_la_LDFLAGS = -module -avoid-version -rpath $(moduledir) perl-core.lo: irssi-core.pl.h perl-signals.lo: perl-signals-list.h @@ -43,16 +43,16 @@ noinst_HEADERS = \ perl-signals.h \ perl-sources.h -libperl_core_la_SOURCES = \ +libirssi_perl_core_la_SOURCES = \ $(perl_sources) -libperl_core_static_la_SOURCES = \ +libirssi_perl_core_static_la_SOURCES = \ $(perl_sources) -libfe_perl_la_SOURCES = \ +libirssife_perl_la_SOURCES = \ $(perl_fe_sources) -libfe_perl_static_la_SOURCES = \ +libirssife_perl_static_la_SOURCES = \ $(perl_fe_sources) perl-signals-list.h: $(top_srcdir)/docs/signals.txt $(srcdir)/get-signals.pl @@ -162,4 +162,4 @@ distclean-generic: cd ..; \ done -libperl_core_la_LIBADD = $(PERL_LDFLAGS) +libirssi_perl_core_la_LIBADD = $(PERL_LDFLAGS)