5 files changed, 49 insertions, 11 deletions
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index 56932326..df11ea66 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -40,6 +40,11 @@
 
 #include <signal.h>
 
+#ifdef HAVE_STATIC_PERL
+void perl_init(void);
+void perl_deinit(void);
+#endif
+
 void irc_init(void);
 void irc_deinit(void);
 
@@ -105,6 +110,9 @@ static void textui_finish_init(void)
 	fe_common_core_finish_init();
 	fe_common_irc_finish_init();
 
+#ifdef HAVE_STATIC_PERL
+        perl_init();
+#endif
 	signal_emit("irssi init finished", 0);
 
 	screen_refresh_thaw();
@@ -127,6 +135,10 @@ static void textui_deinit(void)
 	gui_entry_deinit();
 	deinit_screen();
 
+#ifdef HAVE_STATIC_PERL
+        perl_deinit();
+#endif
+
 	theme_unregister();
 
 	fe_common_irc_deinit();
diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am
index ae038bc8..785b8205 100644
--- a/src/perl/Makefile.am
+++ b/src/perl/Makefile.am
@@ -1,9 +1,9 @@
 moduledir = $(libdir)/irssi/modules
-module_LTLIBRARIES = libirssi_perl.la
+module_LTLIBRARIES = libperl.la
 
-libirssi_perl_la_LDFLAGS = -avoid-version
+libperl_la_LDFLAGS = -avoid-version
 
-irssi-perl.c: perl-signals.h
+perl.c: perl-signals.h
 
 INCLUDES = $(GLIB_CFLAGS) \
 	-DSCRIPTDIR=\""$(libdir)/irssi/scripts"\" \
@@ -11,8 +11,8 @@ INCLUDES = $(GLIB_CFLAGS) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/core
 
-libirssi_perl_la_SOURCES = \
-	irssi-perl.c \
+libperl_la_SOURCES = \
+	perl.c \
 	perl-common.c \
 	xsinit.c
 
@@ -54,6 +54,7 @@ IRC_SOURCES = \
 
 EXTRA_DIST = \
 	libperl_dynaloader.la \
+	libperl_orig.la \
 	get-signals.pl \
 	$(CORE_SOURCES) \
 	$(IRC_SOURCES)
@@ -63,9 +64,9 @@ noinst_HEADERS = \
 	perl-common.h
 
 all-local:
-	for dir in core irc; do cd $$dir && if [ ! -f Makefile ]; then if [ "x$(PERL_LIB_DIR)" = "x" ]; then $(perlpath) Makefile.PL; else $(perlpath) Makefile.PL LIB=$(PERL_LIB_DIR); fi; fi && $(MAKE) && cd ..; done
+	for dir in common irc; do cd $$dir && if [ ! -f Makefile ]; then if [ "x$(PERL_LIB_DIR)" = "x" ]; then $(perlpath) Makefile.PL; else $(perlpath) Makefile.PL LIB=$(PERL_LIB_DIR); fi; fi && $(MAKE) && cd ..; done
 
 install-exec-local:
-	for dir in core irc; do cd $$dir && make install && cd ..; done
+	for dir in common irc; do cd $$dir && make install && cd ..; done
 
-libirssi_perl_la_LIBADD = $(PERL_LDFLAGS)
+libperl_la_LIBADD = $(PERL_LDFLAGS)
diff --git a/src/perl/irc/module.h b/src/perl/irc/module.h
index 58a0b31f..2e0e7823 100644
--- a/src/perl/irc/module.h
+++ b/src/perl/irc/module.h
@@ -1,4 +1,4 @@
-#include "../core/module.h"
+#include "../common/module.h"
 
 #include "irc-servers.h"
 #include "irc-channels.h"
diff --git a/src/perl/libperl_orig.la b/src/perl/libperl_orig.la
new file mode 100644
index 00000000..c83ffc42
--- /dev/null
+++ b/src/perl/libperl_orig.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='libperl_orig.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=''
diff --git a/src/perl/irssi-perl.c b/src/perl/perl.c
index 44dcd7b6..bf1ae551 100644
--- a/src/perl/irssi-perl.c
+++ b/src/perl/perl.c
@@ -666,7 +666,7 @@ static void irssi_perl_autorun(void)
 	g_free(path);
 }
 
-void irssi_perl_init(void)
+void perl_init(void)
 {
 	perl_common_init();
 
@@ -681,7 +681,7 @@ void irssi_perl_init(void)
 	irssi_perl_autorun();
 }
 
-void irssi_perl_deinit(void)
+void perl_deinit(void)
 {
 	irssi_perl_stop();
 	perl_common_deinit();