4 files changed, 31 insertions, 14 deletions
diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am
index a3ffadda..66f5bde0 100644
--- a/src/fe-text/Makefile.am
+++ b/src/fe-text/Makefile.am
@@ -15,7 +15,6 @@ irssi_DEPENDENCIES = @COMMON_LIBS@
 irssi_LDADD = \
 	@COMMON_LIBS@ \
 	$(PROG_LIBS) \
-	$(PERL_LDFLAGS) \
         $(CURSES_LIBS)
 
 irssi_SOURCES = \
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index ec7f979a..56932326 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -46,11 +46,6 @@ void irc_deinit(void);
 void mainwindow_activity_init(void);
 void mainwindow_activity_deinit(void);
 
-#ifdef HAVE_PERL
-void irssi_perl_init(void);
-void irssi_perl_deinit(void);
-#endif
-
 static GMainLoop *main_loop;
 int quitting;
 
@@ -110,9 +105,6 @@ static void textui_finish_init(void)
 	fe_common_core_finish_init();
 	fe_common_irc_finish_init();
 
-#ifdef HAVE_PERL
-	irssi_perl_init();
-#endif
 	signal_emit("irssi init finished", 0);
 
 	screen_refresh_thaw();
@@ -124,9 +116,6 @@ static void textui_deinit(void)
 	signal(SIGINT, SIG_DFL);
 
 	signal_remove("gui exit", (SIGNAL_FUNC) sig_exit);
-#ifdef HAVE_PERL
-	irssi_perl_deinit();
-#endif
 	gui_textwidget_deinit();
 	gui_special_vars_deinit();
 	statusbar_deinit();
diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am
index 6cae6a40..4022876d 100644
--- a/src/perl/Makefile.am
+++ b/src/perl/Makefile.am
@@ -1,4 +1,5 @@
-noinst_LIBRARIES = libperl.a
+moduledir = $(libdir)/irssi/modules
+module_LTLIBRARIES = libirssi_perl.la
 
 irssi-perl.c: perl-signals.h
 
@@ -8,7 +9,7 @@ INCLUDES = $(GLIB_CFLAGS) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/core
 
-libperl_a_SOURCES = \
+libirssi_perl_la_SOURCES = \
 	irssi-perl.c \
 	xsinit.c
 
@@ -16,6 +17,7 @@ perl-signals.h: $(top_srcdir)/docs/signals.txt $(srcdir)/get-signals.pl
 	cat $(top_srcdir)/docs/signals.txt | $(perlpath) $(srcdir)/get-signals.pl > perl-signals.h
 
 EXTRA_DIST = \
+	libperl_dynaloader.la \
 	get-signals.pl \
 	xs/Irssi-bans.xs \
 	xs/Irssi-channel.xs \
@@ -47,3 +49,5 @@ all-local:
 
 install-exec-local:
 	cd xs && make install && cd ..
+
+libirssi_perl_la_LIBADD = $(PERL_LDFLAGS)
diff --git a/src/perl/libperl_dynaloader.la b/src/perl/libperl_dynaloader.la
new file mode 100644
index 00000000..9117cdbd
--- /dev/null
+++ b/src/perl/libperl_dynaloader.la
@@ -0,0 +1,25 @@
+# libsilc.la - a libtool library file
+# Generated by ltmain.sh - GNU libtool 1.3.5 (1.385.2.206 2000/05/27 11:12:27)
+
+# The name that we can dlopen(3).
+dlname=''
+
+# Names of this library.
+library_names=''
+
+# The name of the static archive.
+old_library='DynaLoader.a'
+
+# Libraries that this one depends upon.
+dependency_libs=''
+
+# Version information for libsilc.
+current=0
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=no
+
+# Directory that this library needs to be installed in:
+libdir=''