-diff -ur irssi-0.8.10-rc5-o/configure.in irssi-0.8.10-rc5/configure.in
---- irssi-0.8.10-rc5-o/configure.in 2004-09-15 06:15:05.000000000 -0600
-+++ irssi-0.8.10-rc5/configure.in 2005-05-29 01:32:38.000000000 -0600
-@@ -236,6 +236,10 @@
+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_FUNCS(mkfifo fcntl nl_langinfo)
+ AC_SEARCH_LIBS([socket], [network socket])
-@@ -351,7 +355,7 @@
- AC_MSG_RESULT([yes, using it])
-
- dnl * we have to do this at this point so we know what libs gmodule needs
-- if test ! -f $GLIB_DIR/.libs/libglib.a; then
-+ if test ! -f $GLIB_DIR/.libs/libglib.la; then
- echo
- echo "configuring GLib ..."
- echo
-@@ -745,21 +749,21 @@
+@@ -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_static_fe_lib=libfe_perl_static.la
+ perl_static_lib=libirssi_perl_core_static.la
+ perl_static_fe_lib=libirssife_perl_static.la
- PERL_LIBTOOL='$(SHELL) $(top_builddir)/libtool'
else
dnl * build dynamic library of perl module
- perl_module_lib=libperl_core.la
+ perl_module_fe_lib=libirssife_perl.la
perl_static_lib=
perl_static_fe_lib=
- PERL_LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -833,7 +837,7 @@
+ fi
+@@ -641,7 +645,7 @@ dnl ************************************
AC_SUBST(CHAT_MODULES)
AC_SUBST(irc_MODULES)
--CORE_LIBS="../core/libcore.a ../lib-config/libirssi_config.a ../lib-popt/libpopt.a"
+-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=""
-@@ -842,16 +846,16 @@
+@@ -650,16 +654,16 @@ for c in $CHAT_MODULES; do
module_deinits=""
fe_module_inits=""
fe_module_deinits=""
fe_module_inits="$fe_module_inits fe_${c}_${s}_init();"
fe_module_deinits="fe_${c}_${s}_deinit(); $fe_module_deinits"
fi
-@@ -879,7 +883,7 @@
+@@ -689,7 +693,7 @@ for c in $CHAT_MODULES; do
fi
done
dnl ** common libraries needed by frontends
COMMON_NOUI_LIBS="$CHAT_LIBS $CORE_LIBS"
-diff -ur irssi-0.8.10-rc5-o/src/core/Makefile.am irssi-0.8.10-rc5/src/core/Makefile.am
---- irssi-0.8.10-rc5-o/src/core/Makefile.am 2004-08-19 18:10:01.000000000 -0600
-+++ irssi-0.8.10-rc5/src/core/Makefile.am 2005-05-29 01:32:38.000000000 -0600
+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)
- INCLUDES = \
+ AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-@@ -7,7 +9,7 @@
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DMODULEDIR=\""$(libdir)/irssi/modules"\"
+@@ -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 -ur irssi-0.8.10-rc5-o/src/fe-common/core/Makefile.am irssi-0.8.10-rc5/src/fe-common/core/Makefile.am
---- irssi-0.8.10-rc5-o/src/fe-common/core/Makefile.am 2004-09-15 06:15:05.000000000 -0600
-+++ irssi-0.8.10-rc5/src/fe-common/core/Makefile.am 2005-05-29 01:32:38.000000000 -0600
+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)
- INCLUDES = \
+ AM_CPPFLAGS = \
-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \
-@@ -6,7 +7,7 @@
+@@ -6,7 +7,7 @@ AM_CPPFLAGS = \
-DHELPDIR=\""$(datadir)/irssi/help"\" \
-DTHEMESDIR=\""$(datadir)/irssi/themes"\"
-libfe_common_core_a_SOURCES = \
+libirssife_common_core_la_SOURCES = \
- autorun.c \
chat-completion.c \
command-history.c \
-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
---- irssi-0.8.10-rc5-o/src/fe-common/irc/dcc/Makefile.am 2004-05-10 14:45:03.000000000 -0600
-+++ irssi-0.8.10-rc5/src/fe-common/irc/dcc/Makefile.am 2005-05-29 01:32:38.000000000 -0600
-@@ -1,4 +1,5 @@
--noinst_LIBRARIES = libfe_irc_dcc.a
-+libirssife_irc_dcc_LTLIBRARIES = libirssife_irc_dcc.la
-+libirssife_irc_dccdir = $(libdir)
-
- INCLUDES = \
- -I$(top_srcdir)/src \
-@@ -10,7 +11,7 @@
- -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 -ur irssi-0.8.10-rc5-o/src/fe-common/irc/Makefile.am irssi-0.8.10-rc5/src/fe-common/irc/Makefile.am
---- irssi-0.8.10-rc5-o/src/fe-common/irc/Makefile.am 2004-07-11 09:45:03.000000000 -0600
-+++ irssi-0.8.10-rc5/src/fe-common/irc/Makefile.am 2005-05-29 01:32:38.000000000 -0600
+ 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
+libirssife_common_irc_LTLIBRARIES = libirssife_common_irc.la
+libirssife_common_ircdir = $(libdir)
- INCLUDES = \
+ AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-@@ -29,7 +30,7 @@
+@@ -31,7 +32,7 @@ real_sources = \
irc-completion.c \
module-formats.c
$(real_sources) \
irc-modules.c
-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
---- irssi-0.8.10-rc5-o/src/fe-common/irc/notifylist/Makefile.am 2004-05-10 14:45:03.000000000 -0600
-+++ irssi-0.8.10-rc5/src/fe-common/irc/notifylist/Makefile.am 2005-05-29 01:32:38.000000000 -0600
+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)
- INCLUDES = \
+ AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-@@ -9,7 +10,7 @@
+@@ -9,7 +10,7 @@ AM_CPPFLAGS = \
-DHELPDIR=\""$(datadir)/irssi/help"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\"
fe-notifylist.c \
module-formats.c
-diff -ur irssi-0.8.10-rc5-o/src/irc/core/Makefile.am irssi-0.8.10-rc5/src/irc/core/Makefile.am
---- irssi-0.8.10-rc5-o/src/irc/core/Makefile.am 2004-05-10 14:45:04.000000000 -0600
-+++ irssi-0.8.10-rc5/src/irc/core/Makefile.am 2005-05-29 01:32:38.000000000 -0600
+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)
- INCLUDES = \
+ AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-@@ -6,7 +7,7 @@
+@@ -6,7 +7,7 @@ AM_CPPFLAGS = \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
$(GLIB_CFLAGS)
bans.c \
ctcp.c \
channels-query.c \
-diff -ur irssi-0.8.10-rc5-o/src/irc/dcc/Makefile.am irssi-0.8.10-rc5/src/irc/dcc/Makefile.am
---- irssi-0.8.10-rc5-o/src/irc/dcc/Makefile.am 2004-05-10 14:45:04.000000000 -0600
-+++ irssi-0.8.10-rc5/src/irc/dcc/Makefile.am 2005-05-29 01:32:38.000000000 -0600
+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)
- INCLUDES = \
+ AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-@@ -6,7 +7,7 @@
+@@ -6,7 +7,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/irc/core/ \
$(GLIB_CFLAGS)
dcc.c \
dcc-chat.c \
dcc-get.c \
-diff -ur irssi-0.8.10-rc5-o/src/irc/flood/Makefile.am irssi-0.8.10-rc5/src/irc/flood/Makefile.am
---- irssi-0.8.10-rc5-o/src/irc/flood/Makefile.am 2004-05-10 14:45:04.000000000 -0600
-+++ irssi-0.8.10-rc5/src/irc/flood/Makefile.am 2005-05-29 01:32:38.000000000 -0600
+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)
- INCLUDES = \
+ AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-@@ -6,7 +7,7 @@
+@@ -6,7 +7,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/irc/core/ \
$(GLIB_CFLAGS)
autoignore.c \
flood.c
-diff -ur irssi-0.8.10-rc5-o/src/irc/Makefile.am irssi-0.8.10-rc5/src/irc/Makefile.am
---- irssi-0.8.10-rc5-o/src/irc/Makefile.am 2002-03-15 14:07:19.000000000 -0700
-+++ irssi-0.8.10-rc5/src/irc/Makefile.am 2005-05-29 01:32:38.000000000 -0600
-@@ -4,9 +4,10 @@
-
- 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 -ur irssi-0.8.10-rc5-o/src/irc/notifylist/Makefile.am irssi-0.8.10-rc5/src/irc/notifylist/Makefile.am
---- irssi-0.8.10-rc5-o/src/irc/notifylist/Makefile.am 2004-05-10 14:45:04.000000000 -0600
-+++ irssi-0.8.10-rc5/src/irc/notifylist/Makefile.am 2005-05-29 01:32:38.000000000 -0600
+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)
- INCLUDES = \
+ AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-@@ -6,7 +7,7 @@
+@@ -6,7 +7,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/irc/core/ \
$(GLIB_CFLAGS)
notifylist.c \
notify-commands.c \
notify-ison.c \
-diff -ur irssi-0.8.10-rc5-o/src/lib-config/Makefile.am irssi-0.8.10-rc5/src/lib-config/Makefile.am
---- irssi-0.8.10-rc5-o/src/lib-config/Makefile.am 2004-05-10 14:45:04.000000000 -0600
-+++ irssi-0.8.10-rc5/src/lib-config/Makefile.am 2005-05-29 01:32:38.000000000 -0600
+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)
- INCLUDES = \
+ AM_CPPFLAGS = \
-I$(top_srcdir)/src \
$(GLIB_CFLAGS)
get.c \
set.c \
parse.c \
---- irssi-0.8.10/src/perl/Makefile.am~ 2005-12-11 17:10:06.000000000 +0200
-+++ irssi-0.8.10/src/perl/Makefile.am 2005-12-11 17:12:01.000000000 +0200
-@@ -7,11 +7,11 @@
+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
-+ libirssiperl_core.la libirssife_perl.la \
-+ libirssiperl_core_static.la libirssife_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)
-+libirssiperl_core_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.c: perl-signals-list.h irssi-core.pl.h
-
-diff -ur irssi-0.8.10-rc5-o/src/perl/Makefile.am irssi-0.8.10-rc5/src/perl/Makefile.am
---- irssi-0.8.10-rc5-o/src/perl/Makefile.am 2003-11-16 11:30:02.000000000 -0700
-+++ irssi-0.8.10-rc5/src/perl/Makefile.am 2005-05-29 01:33:18.000000000 -0600
-@@ -44,7 +44,7 @@
+ 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_DEPENDENCIES = .libs/libperl_orig.a .libs/DynaLoader.a
-+libirssi_perl_core_la_DEPENDENCIES = .libs/libperl_orig.a .libs/DynaLoader.a
-
- .libs/libperl_orig.a:
- if [ ! -d .libs ]; then mkdir .libs; fi
-@@ -55,16 +55,16 @@
- rm -f .libs/DynaLoader.a
- $(LN_S) $(DYNALOADER_A) .libs/DynaLoader.a
-
-libperl_core_la_SOURCES = \
+libirssi_perl_core_la_SOURCES = \
$(perl_sources)
$(perl_fe_sources)
perl-signals-list.h: $(top_srcdir)/docs/signals.txt $(srcdir)/get-signals.pl
-@@ -165,4 +165,4 @@
+@@ -162,4 +162,4 @@ distclean-generic:
cd ..; \
done
projects / packages / irssi.git / blobdiff