From d93e1bf6f2c0fdb1e7cb6adea89afcb638e231f4 Mon Sep 17 00:00:00 2001
From: Pekka Riikonen <priikone@silcnet.org>
Date: Mon, 12 May 2014 22:16:44 +0300
Subject: [PATCH] silc-client: SILC Plugin compilation changes

Update the README.PLUGIN instructions and include the silc-mime.pl
script in installation.
---
 README.PLUGIN                  | 64 ++++++++++++++++++++++++++++++----
 apps/irssi/Makefile.am         |  1 -
 apps/irssi/scripts/Makefile.am |  2 +-
 configure.ad                   |  2 +-
 4 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/README.PLUGIN b/README.PLUGIN
index 29ff37d2..f5023687 100644
--- a/README.PLUGIN
+++ b/README.PLUGIN
@@ -1,18 +1,68 @@
-In order to compile the SILC Plugin (instead of the SILC Client), pass the
-following options to configure, if your Irssi is installed into /usr:
+Compiling SILC Plugin for Irssi
+===============================
+
+In order to compile the SILC Plugin (instead of the SILC Client), pass 
+the following options to configure, if your Irssi is installed into
+/usr/bin/irssi and /usrlib/irssi:
 
 	--prefix=/usr
 	--with-silc-plugin
 	--without-silc-includes
+	--enable-shared
 
-If your Irssi is installed in some other location than /usr, then pass its
-location to --prefix and --with-silc-plugin, for example:
+If your Irssi is installed in some other location than /usr/lib, then 
+pass its location to --prefix and --with-silc-plugin, for example:
 
 	--prefix=/usr/local
 	--with-silc-plugin=/usr/local/lib/irssi
 	--without-silc-includes
+	--enable-shared
+
+On some Linux systems Irssi libs may actually be in /usr/lib64/irssi.
+In that case pass that path as argument to --with-silc-plugin.
+
+Depending on your OS/architecture you may also need to pass the 
+following options to configure:
+
+	--with-pic
+	--without-pthreads
+
+
+Using SILC Plugin with Irssi
+============================
+
+After you have compiled and installed the plugin, you can load the 
+plugin in Irssi using:
+
+        /LOAD silc
+
+You can configure the SILC plugin run time with the /SILC command.  See
+the help with:
+
+        /HELP silc/silc
+
+To list all SILC commands available, use normal /HELP command.  To get 
+help about specific SILC command, use (replace <command> with the command 
+of your choice):
+
+        /HELP silc/<command>
+
+For a more detailed help on SILC commands or some FAQs, please refer to 
+the SILCNet homepage. Once you have successfully load the SILC plugin, 
+you can connect to the SILCNet:
+
+        /SERVER silc.silcnet.org
+
+or,
+
+        /CONNECT -silcnet SILCNet silc.silcnet.org
+
+You might want to join the channel "silc" then...
+
+        /JOIN -silcnet silc
 
-Depending on your OS/architecture you may also need to pass the following
-options to configure:
+If you have compiled Irssi with perl support, you should also load the 
+silc and silc-mime scripts:
 
-	--with-pic --without-pthreads
+        /SCRIPT LOAD silc
+        /SCRIPT LOAD silc-mime
diff --git a/apps/irssi/Makefile.am b/apps/irssi/Makefile.am
index b34e482f..d947fe19 100644
--- a/apps/irssi/Makefile.am
+++ b/apps/irssi/Makefile.am
@@ -42,7 +42,6 @@ EXTRA_DIST = \
 	$(theme_DATA) \
 	irssi-config.in \
 	irssi-icon.png \
-	irssi-version.sh \
 	syntax.pl \
 	Makefile.defines.in \
 	Makefile.defines_int.in
diff --git a/apps/irssi/scripts/Makefile.am b/apps/irssi/scripts/Makefile.am
index 1697d3d2..14ee465e 100644
--- a/apps/irssi/scripts/Makefile.am
+++ b/apps/irssi/scripts/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = examples
 
-PLUGIN_SCR = silc.pl
+PLUGIN_SCR = silc.pl silc-mime.pl
 
 if SILCPLUGIN
 scriptdir = $(datadir)/irssi/scripts
diff --git a/configure.ad b/configure.ad
index 856aaf4b..3bac080f 100644
--- a/configure.ad
+++ b/configure.ad
@@ -1414,7 +1414,7 @@ s_includedir=`eval echo $includedir`;s_includedir=`eval echo $s_includedir`
 
 echo ""
 echo "$PACKAGE Configuration Summary:"
-echo "---------------------------"
+echo "-------------------------------------"
 echo " Target host ...................: $target"
 echo " Compiler ......................: $CC"
 echo " CFLAGS ........................: $CFLAGS"
-- 
2.24.0