--with-modules=xxx builds now specified extra modules to irssi binary.

memdebug (if enabled) doesn't now by default check for buffer overflows
since it's a huge slowup.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@250 dbcabf3a-b0e7-0310-adc4-f8d773084564

8 files changed, 21 insertions, 21 deletions

diff --git a/configure.in b/configure.in
index baf20e95..5b1cd06d 100644
--- a/configure.in
+++ b/configure.in
@@ -68,18 +68,9 @@ AC_ARG_WITH(bot,
 	fi,
 	want_irssibot=yes)
 
-AC_ARG_WITH(plugins,
-[  --with-plugins          Build plugins],
-	if test x$withval = xyes; then
-    		want_plugins=yes
-	else
-		if test "x$withval" = xno; then
-			want_plugins=no
-		else
-        		want_plugins=yes
-		fi
-	fi,
-	want_plugins=yes)
+AC_ARG_WITH(modules,
+[  --with-modules          Specify what modules to build in binary],
+	build_modules="$withval")
 
 AC_ARG_ENABLE(perl,
 [  --enable-perl           Enable Perl scripting],
@@ -276,6 +267,9 @@ dnl ** (these could be made configurable)
 
 CHAT_MODULES="irc"
 irc_MODULES="dcc flood notifylist"
+if test "$build_modules" != ""; then
+	irc_MODULES="$irc_MODULES $build_modules"
+fi
 
 dnl ****************************************
 
@@ -295,11 +289,11 @@ for c in $CHAT_MODULES; do
 	CHAT_LIBS="$CHAT_LIBS ../$c/lib$c.la ../$c/core/lib${c}_core.la"
 	FE_COMMON_LIBS="$FE_COMMON_LIBS ../fe-common/$c/libfe_common_$c.la"
 	for s in `eval echo \\$${c}_MODULES`; do
-		CHAT_LIBS="$CHAT_LIBS ../$c/$s/lib${c}_$s.la"
+		CHAT_LIBS="$CHAT_LIBS ../$c/$s/.libs/lib${c}_$s.a"
 		module_inits="$module_inits ${c}_${s}_init();"
 		module_deinits="${c}_${s}_deinit(); $module_deinits"
 		if test -d $srcdir/src/fe-common/$c/$s; then
-			FE_COMMON_LIBS="$FE_COMMON_LIBS ../fe-common/$c/$s/libfe_common_${c}_$s.la"
+			FE_COMMON_LIBS="$FE_COMMON_LIBS ../fe-common/$c/$s/.libs/libfe_common_${c}_$s.a"
 			fe_module_inits="$fe_module_inits fe_${c}_${s}_init();"
 			fe_module_deinits="fe_${c}_${s}_deinit(); $fe_module_deinits"
 		fi
diff --git a/src/core/memdebug.c b/src/core/memdebug.c
index fcd92659..765fe5d1 100644
--- a/src/core/memdebug.c
+++ b/src/core/memdebug.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <glib.h>
 
-#define ENABLE_BUFFER_CHECKS
+/*#define ENABLE_BUFFER_CHECKS*/
 #define BUFFER_CHECK_SIZE 5
 #define MIN_BUFFER_CHECK_SIZE 2
 
diff --git a/src/fe-common/irc/dcc/Makefile.am b/src/fe-common/irc/dcc/Makefile.am
index 54647bc9..98846e33 100644
--- a/src/fe-common/irc/dcc/Makefile.am
+++ b/src/fe-common/irc/dcc/Makefile.am
@@ -1,4 +1,5 @@
-noinst_LTLIBRARIES = libfe_common_irc_dcc.la
+plugindir = $(libdir)/irssi/plugins
+plugin_LTLIBRARIES = libfe_common_irc_dcc.la
 
 INCLUDES = \
 	$(GLIB_CFLAGS) \
diff --git a/src/fe-common/irc/flood/Makefile.am b/src/fe-common/irc/flood/Makefile.am
index 46ca4f25..eded09f6 100644
--- a/src/fe-common/irc/flood/Makefile.am
+++ b/src/fe-common/irc/flood/Makefile.am
@@ -1,4 +1,5 @@
-noinst_LTLIBRARIES = libfe_common_irc_flood.la
+plugindir = $(libdir)/irssi/plugins
+plugin_LTLIBRARIES = libfe_common_irc_flood.la
 
 INCLUDES = \
 	$(GLIB_CFLAGS) \
diff --git a/src/fe-common/irc/notifylist/Makefile.am b/src/fe-common/irc/notifylist/Makefile.am
index 53dd7374..30834273 100644
--- a/src/fe-common/irc/notifylist/Makefile.am
+++ b/src/fe-common/irc/notifylist/Makefile.am
@@ -1,4 +1,5 @@
-noinst_LTLIBRARIES = libfe_common_irc_notifylist.la
+plugindir = $(libdir)/irssi/plugins
+plugin_LTLIBRARIES = libfe_common_irc_notifylist.la
 
 INCLUDES = \
 	$(GLIB_CFLAGS) \
diff --git a/src/irc/dcc/Makefile.am b/src/irc/dcc/Makefile.am
index 6e2b68c7..4edc3c5d 100644
--- a/src/irc/dcc/Makefile.am
+++ b/src/irc/dcc/Makefile.am
@@ -1,4 +1,5 @@
-noinst_LTLIBRARIES = libirc_dcc.la
+plugindir = $(libdir)/irssi/plugins
+plugin_LTLIBRARIES = libirc_dcc.la
 
 INCLUDES = $(GLIB_CFLAGS) \
 	-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ -I$(top_srcdir)/src/irc/core/
diff --git a/src/irc/flood/Makefile.am b/src/irc/flood/Makefile.am
index 1ebebff4..bea84e52 100644
--- a/src/irc/flood/Makefile.am
+++ b/src/irc/flood/Makefile.am
@@ -1,4 +1,5 @@
-noinst_LTLIBRARIES = libirc_flood.la
+plugindir = $(libdir)/irssi/plugins
+plugin_LTLIBRARIES = libirc_flood.la
 
 INCLUDES = $(GLIB_CFLAGS) \
 	-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ -I$(top_srcdir)/src/irc/core/
diff --git a/src/irc/notifylist/Makefile.am b/src/irc/notifylist/Makefile.am
index 48dd5640..169f7ce6 100644
--- a/src/irc/notifylist/Makefile.am
+++ b/src/irc/notifylist/Makefile.am
@@ -1,4 +1,5 @@
-noinst_LTLIBRARIES = libirc_notifylist.la
+plugindir = $(libdir)/irssi/plugins
+plugin_LTLIBRARIES = libirc_notifylist.la
 
 INCLUDES = $(GLIB_CFLAGS) \
 	-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ -I$(top_srcdir)/src/irc/core/