From: Pekka Riikonen Date: Mon, 4 Jun 2007 18:29:35 +0000 (+0000) Subject: Removed --enable-silc-plugin. Added --with-silc-plugin. X-Git-Tag: silc.toolkit.1.1.1~50 X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=ea3a5809967d56924ff8f81106fd1c373cf41994 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 d99964a4..e5710510 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,13 @@ +Mon Jun 4 21:24:17 EEST 2007 Pekka Riikonen + + * 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 * SILC Client 1.1. diff --git a/README.PLUGIN b/README.PLUGIN index d290bd1f..29ff37d2 100644 --- 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 18500f2f..a5fd056d 100644 --- 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 94559d06..33290a13 100644 --- 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 12acfaff..109e5b2c 100644 --- 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 69fa88a4..1697d3d2 100644 --- 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 82362a0c..c8ae64e9 100644 --- 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 8c11695f..d9ea60a9 100644 --- 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 770b8129..51a5a0cd 100644 --- 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 46502980..43a6a341 100644 --- 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 0a8a9dfd..46b85d10 100644 --- 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 88d674f8..e79611b4 100644 --- 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 #