Removed --enable-silc-plugin. Added --with-silc-plugin.

	Using --with-simdir no longer required to compile SILC Plugin.

diff --git a/CHANGES b/CHANGES
index d99964a417168db9ef07c7c7d98a2ffcf0171cc2..e57105105429438c9bde959cd49a46f40b16d43a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+Mon Jun  4 21:24:17 EEST 2007  Pekka Riikonen <priikone@silcnet.org>
+
+       * Removed --enable-silc-plugin.  Added --with-silc-plugin.
+         Affected files are configure.ad, lib/configure.ad,
+         apps/irssi/configure.ad, apps/irssi/configure.in,
+         apps/irssi/scripts/Makefile.am,
+         apps/irssi/scripts/examples/Makefile.am,
+         apps/irssi/src/silc/core/silc/Makefile.am,
+         apps/irssi/src/fe-common/silc/Makefile.am.
+
 Mon Jun  4 08:35:59 EEST 2007  Pekka Riikonen <priikone@silcnet.org>
 
        * SILC Client 1.1.

diff --git a/README.PLUGIN b/README.PLUGIN
index d290bd1fd6ed5f84309893d9e465e1c7a1211b8c..29ff37d29e5da9380df6216f4fdef864d8a51576 100644 (file)
--- a/README.PLUGIN
+++ b/README.PLUGIN
@@ -1,14 +1,18 @@
 In order to compile the SILC Plugin (instead of the SILC Client), pass the
-following options to configure:
+following options to configure, if your Irssi is installed into /usr:
 
-       --enable-silc-plugin --without-silc-includes
+       --prefix=/usr
+       --with-silc-plugin
+       --without-silc-includes
 
-Depending on your OS/architecture you may also need to pass:
+If your Irssi is installed in some other location than /usr, then pass its
+location to --prefix and --with-silc-plugin, for example:
 
-       --with-pic --without-pthreads
+       --prefix=/usr/local
+       --with-silc-plugin=/usr/local/lib/irssi
+       --without-silc-includes
 
-For installing the SILC Plugin to the appropriate directories, you have to
-define the following paths (assuming Irssi is installed to /usr)
+Depending on your OS/architecture you may also need to pass the following
+options to configure:
 
-       --prefix=/usr
-       --with-simdir=/usr/lib/irssi
+       --with-pic --without-pthreads

diff --git a/apps/irssi/Makefile.am b/apps/irssi/Makefile.am
index 18500f2f7a2566783d71803e72268b825a6f232c..a5fd056def06bd10e2868b4868f3b792b32b7e0d 100644 (file)
--- a/apps/irssi/Makefile.am
+++ b/apps/irssi/Makefile.am
@@ -23,10 +23,11 @@ conffile = silc.conf
 
 if SILCPLUGIN
 themedir = $(datadir)/irssi/themes
+theme_DATA = plugin.theme
 else
 themedir = $(datadir)/silc/themes
-endif
 theme_DATA = default.theme plugin.theme
+endif
 
 noinst_HEADERS = irssi-version.h.in
 

diff --git a/apps/irssi/configure.ad b/apps/irssi/configure.ad
index 94559d06923e706c70ccb063c74e48efdf6dd36d..33290a13716223990a0a1a4daa87ace796d5af5b 100644 (file)
--- a/apps/irssi/configure.ad
+++ b/apps/irssi/configure.ad
@@ -54,8 +54,20 @@ AC_ARG_WITH(perl,
 
 # Irssi SILC Plugin support
 #
-AC_ARG_ENABLE(silc-plugin,
-[  --enable-silc-plugin    Compile the SILC Plugin instead of the SILC Client])
+AC_MSG_CHECKING(whether to compile SILC Plugin for Irssi)
+AC_ARG_WITH(silc-plugin,
+  [[  --with-silc-plugin[=DIR] Compile the SILC Plugin for Irssi, specify
+                           Irssi location [/usr/lib/irssi]]],
+  [
+    case "${withval}" in
+      no)
+        AC_MSG_RESULT(no)
+        ;;
+       *)
+        AC_MSG_RESULT(yes)
+       ;;
+    esac
+  ])
 
 AC_CONFIG_SUBDIRS(apps/irssi)
 AC_CONFIG_FILES(

diff --git a/apps/irssi/configure.in b/apps/irssi/configure.in
index 12acfaffcdb45239d6096d1f1e1e31c17a3f5fad..109e5b2cf11e94d6845595b5422f7c7fa72e886b 100644 (file)
--- a/apps/irssi/configure.in
+++ b/apps/irssi/configure.in
@@ -191,14 +191,33 @@ AC_ARG_WITH(perl,
 
 # Irssi SILC Plugin support
 #
-AC_ARG_ENABLE(silc-plugin,
-[  --enable-silc-plugin    Compile the SILC Plugin instead of the SILC Client],
-[case "${enableval}" in
-  yes) silc_plugin=true ;;
-  no)  silc_plugin=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-silc-plugin) ;;
-esac],[silc_plugin=false])
+SILC_IRSSIDIR=
+silc_plugin=false
+AC_MSG_CHECKING(whether to compile SILC Plugin for Irssi)
+AC_ARG_WITH(silc-plugin,
+  [[  --with-silc-plugin[=DIR] Compile the SILC Plugin for Irssi, specify
+                           Irssi location [/usr/lib/irssi]]],
+  [
+    case "${withval}" in
+      no)
+        AC_MSG_RESULT(no)
+        silc_plugin=false
+        ;;
+      yes)
+        AC_MSG_RESULT(yes)
+        silc_plugin=true
+       SILC_IRSSIDIR="/usr/lib/irssi/modules"
+       ;;
+      *)
+        AC_MSG_RESULT(yes)
+        silc_plugin=true
+        SILC_IRSSIDIR="$withval/modules"
+        ;;
+    esac
+  ])
+
 AM_CONDITIONAL(SILCPLUGIN, test x$silc_plugin = xtrue)
+AC_SUBST(SILC_IRSSIDIR)
 
 AC_ARG_WITH(file-offset-size,
 [  --with-file-offset-size=BITS  Set size of file offsets. Usually 32 or 64.

diff --git a/apps/irssi/scripts/Makefile.am b/apps/irssi/scripts/Makefile.am
index 69fa88a4d6678c14d22051aca31863b544c73569..1697d3d2ad0285331d0d19ce742edcb736146d19 100644 (file)
--- a/apps/irssi/scripts/Makefile.am
+++ b/apps/irssi/scripts/Makefile.am
@@ -1,12 +1,13 @@
 SUBDIRS = examples
 
+PLUGIN_SCR = silc.pl
+
 if SILCPLUGIN
 scriptdir = $(datadir)/irssi/scripts
+IRSSI_SCR =
 else
 scriptdir = $(datadir)/silc/scripts
-endif
-
-script_DATA = \
+IRSSI_SCR = \
        autoop.pl \
        autorejoin.pl \
        buf.pl \
@@ -16,8 +17,12 @@ script_DATA = \
        mlock.pl \
        quitmsg.pl \
        scriptassist.pl \
-       silc.pl \
        splitlong.pl \
        usercount.pl
+endif
+
+script_DATA = \
+        $(PLUGIN_SCR) \
+        $(IRSSI_SCR)
 
 EXTRA_DIST = $(script_DATA)

diff --git a/apps/irssi/scripts/examples/Makefile.am b/apps/irssi/scripts/examples/Makefile.am
index 82362a0c35799d2cd7c2ee6d5c522571920e7cda..c8ae64e9e75d598714d941a8c64469cfbcdfe948 100644 (file)
--- a/apps/irssi/scripts/examples/Makefile.am
+++ b/apps/irssi/scripts/examples/Makefile.am
@@ -1,13 +1,15 @@
 
 if SILCPLUGIN
 scriptdir = $(datadir)/irssi/scripts
+IRSSI_EX_SCR =
 else
 scriptdir = $(datadir)/silc/scripts
-endif
-
-script_DATA = \
+IRSSI_EX_SCR = \
        command.pl \
        msg-event.pl \
        redirect.pl
+endif
+
+script_DATA = $(IRSSI_EX_SCR)
 
 EXTRA_DIST = $(script_DATA)

diff --git a/apps/irssi/src/core/Makefile.am b/apps/irssi/src/core/Makefile.am
index 8c11695fe97581af12547f4c71135aa7dcef6c21..d9ea60a943d38c88539000fc03ff952d42ad8c43 100644 (file)
--- a/apps/irssi/src/core/Makefile.am
+++ b/apps/irssi/src/core/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES += \
        -I$(top_srcdir)/src/core \
        $(GLIB_CFLAGS) \
        -DSYSCONFDIR=\""$(silc_etcdir)"\" \
-       -DMODULEDIR=\""$(silc_modulesdir)"\"
+       -DMODULEDIR=\""@SILC_IRSSIDIR@"\"
 
 libcore_a_SOURCES = \
        args.c \

diff --git a/apps/irssi/src/fe-common/silc/Makefile.am b/apps/irssi/src/fe-common/silc/Makefile.am
index 770b8129017cc92ea7982421612db9446628f1ce..51a5a0cdb6fca65d693096d3eaa7881e509bcf1e 100644 (file)
--- a/apps/irssi/src/fe-common/silc/Makefile.am
+++ b/apps/irssi/src/fe-common/silc/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.defines.in
 
-moduledir = $(silc_modulesdir)
+moduledir = @SILC_IRSSIDIR@
 
 IRSSI_INCLUDE=../../..
 
@@ -79,5 +79,5 @@ libfe_common_silc.a: libfe_common_silc.la
 
 if SILCPLUGIN
 install-data-hook: libfe_common_silc.la
-       -ln -s libfe_common_silc.so $(moduledir)/libfe_silc.so
+       -ln -s libfe_common_silc.so $(DESTDIR)$(moduledir)/libfe_silc.so
 endif

diff --git a/apps/irssi/src/perl/Makefile.am b/apps/irssi/src/perl/Makefile.am
index 46502980cddb53b04ed58929be1584502696fb97..43a6a341ad6813834aba498830cf0d0bab067f44 100644 (file)
--- a/apps/irssi/src/perl/Makefile.am
+++ b/apps/irssi/src/perl/Makefile.am
@@ -2,7 +2,7 @@ LIBTOOL = $(PERL_LIBTOOL)
 
 include $(top_srcdir)/Makefile.defines.in
 
-moduledir = $(silc_modulesdir)
+moduledir = @SILC_IRSSIDIR@
 
 if SILCPLUGIN
 perl_dirs = silc

diff --git a/apps/irssi/src/silc/core/Makefile.am b/apps/irssi/src/silc/core/Makefile.am
index 0a8a9dfd6b49014864d35e18fa2007e741ef7a90..46b85d10506294f293bb1509328da572a33d8798 100644 (file)
--- a/apps/irssi/src/silc/core/Makefile.am
+++ b/apps/irssi/src/silc/core/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.defines.in
 
-moduledir = $(silc_modulesdir)
+moduledir = @SILC_IRSSIDIR@
 
 
 IRSSI_INCLUDE=../../..

diff --git a/lib/configure.ad b/lib/configure.ad
index 88d674f89b3e3da929000eff749bf1e9d1160185..e79611b4c08e40d7633353d184ef4ccf88578dfa 100644 (file)
--- a/lib/configure.ad
+++ b/lib/configure.ad
@@ -133,7 +133,7 @@ AC_CHECK_FUNC(epoll_wait,
     )
   ])
 
-MODULESDIR="$silc_prefix/modules"
+MODULESDIR="$silc_prefix/lib/modules"
 #ifdef SILC_DIST_SIM
 # SIM modules directory
 #