From 04fbe821c960a6ab656c988cb5443b27230dfd6e Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Thu, 7 May 2009 23:47:46 +0200 Subject: [PATCH] Disable jabber and relay plugins compilation by default --- CMakeLists.txt | 4 ++-- configure.in | 4 ++-- src/plugins/CMakeLists.txt | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d102dc78..e96548621 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,9 +47,9 @@ OPTION(DISABLE_CHARSET "Disable Charset plugin") OPTION(ENABLE_DEMO "Enable Demo plugin") OPTION(DISABLE_FIFO "Disable FIFO plugin") OPTION(DISABLE_IRC "Disable IRC plugin") -OPTION(DISABLE_JABBER "Disable Jabber plugin") +OPTION(ENABLE_JABBER "Enable Jabber plugin") OPTION(DISABLE_LOGGER "Disable Logger plugin") -OPTION(DISABLE_RELAY "Disable Relay plugin") +OPTION(ENABLE_RELAY "Enable Relay plugin") OPTION(DISABLE_SCRIPTS "Disable script plugins") OPTION(DISABLE_PERL "Disable Perl scripting language") OPTION(DISABLE_PYTHON "Disable Python scripting language") diff --git a/configure.in b/configure.in index e742ba83f..68b85dfaf 100644 --- a/configure.in +++ b/configure.in @@ -126,9 +126,9 @@ AC_ARG_ENABLE(charset, [ --disable-charset turn off Charset plugin ( AC_ARG_ENABLE(demo, [ --enable-demo turn on Demo plugin (default=off)],enable_demo=$enableval,enable_demo=no) AC_ARG_ENABLE(fifo, [ --disable-fifo turn off Fifo plugin (default=compiled)],enable_fifo=$enableval,enable_fifo=yes) AC_ARG_ENABLE(irc, [ --disable-irc turn off IRC plugin (default=compiled)],enable_irc=$enableval,enable_irc=yes) -AC_ARG_ENABLE(jabber, [ --disable-jabber turn off Jabber plugin (default=compiled)],enable_jabber=$enableval,enable_jabber=yes) +AC_ARG_ENABLE(jabber, [ --enable-jabber turn off Jabber plugin (default=off)],enable_jabber=$enableval,enable_jabber=no) AC_ARG_ENABLE(logger, [ --disable-logger turn off Logger plugin (default=compiled)],enable_logger=$enableval,enable_logger=yes) -AC_ARG_ENABLE(relay, [ --disable-relay turn off Relay plugin (default=compiled)],enable_relay=$enableval,enable_relay=yes) +AC_ARG_ENABLE(relay, [ --enable-relay turn on Relay plugin (default=off)],enable_relay=$enableval,enable_relay=no) AC_ARG_ENABLE(scripts, [ --disable-scripts turn off script plugins (default=compiled if found)],enable_scripts=$enableval,enable_scripts=yes) AC_ARG_ENABLE(perl, [ --disable-perl turn off Perl script plugin (default=compiled if found)],enable_perl=$enableval,enable_perl=yes) AC_ARG_ENABLE(python, [ --disable-python turn off Python script plugin (default=compiled if found)],enable_python=$enableval,enable_python=yes) diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 3fddaf1d3..a35473cbb 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -58,21 +58,21 @@ IF(NOT DISABLE_IRC) ADD_SUBDIRECTORY( irc ) ENDIF(NOT DISABLE_IRC) -IF(NOT DISABLE_JABBER) +IF(ENABLE_JABBER) # Check for iksemel library FIND_PACKAGE(Iksemel) IF(IKSEMEL_FOUND) ADD_SUBDIRECTORY( jabber ) ENDIF(IKSEMEL_FOUND) -ENDIF(NOT DISABLE_JABBER) +ENDIF(ENABLE_JABBER) IF(NOT DISABLE_LOGGER) ADD_SUBDIRECTORY( logger ) ENDIF(NOT DISABLE_LOGGER) -IF(NOT DISABLE_RELAY) +IF(ENABLE_RELAY) ADD_SUBDIRECTORY( relay ) -ENDIF(NOT DISABLE_RELAY) +ENDIF(ENABLE_RELAY) IF(NOT DISABLE_SCRIPTS AND NOT DISABLE_PERL AND NOT DISABLE_PYTHON AND NOT DISABLE_RUBY AND NOT DISABLE_LUA AND NOT DISABLE_TCL) ADD_SUBDIRECTORY( scripts )