diff --git a/CMakeLists.txt b/CMakeLists.txt index d0f5e981e..c2b0ecda3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,8 +87,8 @@ OPTION(ENABLE_LUA "Enable Lua scripting language" ON) OPTION(ENABLE_TCL "Enable Tcl scripting language" ON) OPTION(ENABLE_GUILE "Enable Scheme (guile) scripting language" ON) OPTION(ENABLE_XFER "Enable Xfer plugin" ON) -OPTION(ENABLE_MAN "Enable Man page" ON) -OPTION(ENABLE_DOC "Enable Documentation" OFF) +OPTION(ENABLE_MAN "Enable build of man page" OFF) +OPTION(ENABLE_DOC "Enable build of documentation" OFF) # option WEECHAT_HOME IF(NOT DEFINED WEECHAT_HOME OR "${WEECHAT_HOME}" STREQUAL "") diff --git a/ChangeLog b/ChangeLog index 77999ba7a..a28162986 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,7 +15,7 @@ Version 0.4.2 (under dev!) -------------------------- * core: disable build of doc by default, add cmake option ENABLE_MAN to compile - man page (on by default) + man page (off by default) * core: add option "-o" for command /color * core: fix priority of logical operators in evaluation of expression (AND takes precedence over the OR) diff --git a/NEWS b/NEWS index 5bbdc6a51..e43cc1f8d 100644 --- a/NEWS +++ b/NEWS @@ -23,7 +23,7 @@ Documentation is not built by default any more, you have to use option The man page is now built with asciidoc and translated in several languages. A new cmake option `ENABLE_MAN` has been added to compile man page -(`ON` by default). +(`OFF` by default). === Aspell colors === diff --git a/configure.ac b/configure.ac index 7cfc2739b..fb3eb8c29 100644 --- a/configure.ac +++ b/configure.ac @@ -152,7 +152,7 @@ AC_ARG_WITH(lua-inc, [ --with-lua-inc=DIR, lua include files are in AC_ARG_WITH(lua-lib, [ --with-lua-lib=DIR, lua library files are in DIR (default=autodetect)],lua_lib=$withval,lua_lib='') AC_ARG_WITH(lua-suffix, [ --with-lua-suffix=ARG lua is suffixed with ARG (default=autodetect)],lua_suffix=$withval,lua_suffix='') AC_ARG_WITH(tclconfig, [ --with-tclconfig=DIR directory containing tcl configuration (tclConfig.sh)],tclconfig=$withval,tclconfig='') -AC_ARG_ENABLE(man, [ --disable-man turn off build of man page (default=built if found)],enable_man=$enableval,enable_man=yes) +AC_ARG_ENABLE(man, [ --enable-man turn on build of man page (default=not built)],enable_man=$enableval,enable_man=no) AC_ARG_ENABLE(doc, [ --enable-doc turn on build of documentation (default=not built)],enable_doc=$enableval,enable_doc=no) AC_ARG_WITH(debug, [ --with-debug debugging: 0=no debug, 1=debug compilation (default=1)],debug=$withval,debug=1) diff --git a/doc/de/weechat_user.de.txt b/doc/de/weechat_user.de.txt index 53e504e36..a5a543fa0 100644 --- a/doc/de/weechat_user.de.txt +++ b/doc/de/weechat_user.de.txt @@ -178,7 +178,7 @@ Liste von häufig verwendeten Optionen: kompiliert Demo-Erweiterung. // TRANSLATION MISSING -| ENABLE_MAN | `ON`, `OFF` | ON | +| ENABLE_MAN | `ON`, `OFF` | OFF | Compile man page. // TRANSLATION MISSING diff --git a/doc/en/weechat_user.en.txt b/doc/en/weechat_user.en.txt index 572d09ebf..5f7ba5471 100644 --- a/doc/en/weechat_user.en.txt +++ b/doc/en/weechat_user.en.txt @@ -175,7 +175,7 @@ List of commonly used options: | ENABLE_DEMO | `ON`, `OFF` | OFF | Compile Demo plugin. -| ENABLE_MAN | `ON`, `OFF` | ON | +| ENABLE_MAN | `ON`, `OFF` | OFF | Compile man page. | ENABLE_DOC | `ON`, `OFF` | OFF | diff --git a/doc/fr/weechat_user.fr.txt b/doc/fr/weechat_user.fr.txt index c77509a80..e57254442 100644 --- a/doc/fr/weechat_user.fr.txt +++ b/doc/fr/weechat_user.fr.txt @@ -177,7 +177,7 @@ Liste des options couramment utilisées : | ENABLE_DEMO | `ON`, `OFF` | OFF | Compiler l'extension Demo. -| ENABLE_MAN | `ON`, `OFF` | ON | +| ENABLE_MAN | `ON`, `OFF` | OFF | Compiler la page man. | ENABLE_DOC | `ON`, `OFF` | OFF | diff --git a/doc/it/weechat_user.it.txt b/doc/it/weechat_user.it.txt index f908d5a6a..3bbfba309 100644 --- a/doc/it/weechat_user.it.txt +++ b/doc/it/weechat_user.it.txt @@ -187,7 +187,7 @@ List of commonly used options: | ENABLE_DEMO | `ON`, `OFF` | OFF | Compile Demo plugin. -| ENABLE_MAN | `ON`, `OFF` | ON | +| ENABLE_MAN | `ON`, `OFF` | OFF | Compile man page. | ENABLE_DOC | `ON`, `OFF` | OFF | diff --git a/doc/ja/weechat_user.ja.txt b/doc/ja/weechat_user.ja.txt index 9da7a2ae0..809aad645 100644 --- a/doc/ja/weechat_user.ja.txt +++ b/doc/ja/weechat_user.ja.txt @@ -173,7 +173,7 @@ List of commonly used options: | ENABLE_DEMO | `ON`, `OFF` | OFF | Compile Demo plugin. -| ENABLE_MAN | `ON`, `OFF` | ON | +| ENABLE_MAN | `ON`, `OFF` | OFF | Compile man page. | ENABLE_DOC | `ON`, `OFF` | OFF |