diff --git a/ChangeLog b/ChangeLog index ea72491ee..5d1c2308d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,10 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2006-06-30 +ChangeLog - 2006-07-07 Version 0.2.0 (under dev!): + * added configure option for doc XSL prefix (bug #16991) * fixed bug with spaces in script names (bug #16957) * fixed random crash when "MODE #chan -l" is received * fixed bug in IRC parser (random crash with malformed IRC messages) diff --git a/configure.in b/configure.in index 77e5a2a43..6b9871afa 100644 --- a/configure.in +++ b/configure.in @@ -103,21 +103,22 @@ AH_VERBATIM([DEBUG], [#undef DEBUG]) # Arguments for ./configure -AC_ARG_ENABLE(ncurses, [ --disable-ncurses Turn off ncurses interface (default=compiled if found)],enable_ncurses=$enableval,enable_ncurses=yes) -AC_ARG_ENABLE(wxwidgets, [ --enable-wxwidgets Turn on WxWidgets interface (default=no wxwidgets)],enable_wxwidgets=$enableval,enable_wxwidgets=no) -AC_ARG_ENABLE(gtk, [ --enable-gtk Turn on Gtk interface (default=no Gtk)],enable_gtk=$enableval,enable_gtk=no) -AC_ARG_ENABLE(qt, [ --enable-qt Turn on Qt interface (default=no Qt)],enable_qt=$enableval,enable_qt=no) -AC_ARG_ENABLE(plugins, [ --disable-plugins Turn off plugins support (default=plugins enabled)],enable_plugins=$enableval,enable_plugins=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) -AC_ARG_ENABLE(ruby, [ --disable-ruby Turn off Ruby script plugin (default=compiled if found)],enable_ruby=$enableval,enable_ruby=yes) -AC_ARG_ENABLE(lua, [ --disable-lua Turn off Lua script plugin (default=compiled if found)],enable_lua=$enableval,enable_lua=yes) -AC_ARG_WITH(lua-inc, [ --with-lua-inc=DIR, Lua include files are in DIR (default=autodetect)],lua_inc=$withval,lua_inc='') -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_ENABLE(aspell, [ --disable-aspell Turn off Aspell plugin (default=compiled if found)],enable_aspell=$enableval,enable_aspell=yes) -AC_ARG_ENABLE(gnutls, [ --disable-gnutls Turn off gnutls support (default=compiled if found)],enable_gnutls=$enableval,enable_gnutls=yes) -AC_ARG_WITH(debug, [ --with-debug Debugging: 0=no debug, 1=debug compilation, 2=debug compilation + verbose msgs (default=1)],debug=$withval,debug=1) +AC_ARG_ENABLE(ncurses, [ --disable-ncurses Turn off ncurses interface (default=compiled if found)],enable_ncurses=$enableval,enable_ncurses=yes) +AC_ARG_ENABLE(wxwidgets, [ --enable-wxwidgets Turn on WxWidgets interface (default=no wxwidgets)],enable_wxwidgets=$enableval,enable_wxwidgets=no) +AC_ARG_ENABLE(gtk, [ --enable-gtk Turn on Gtk interface (default=no Gtk)],enable_gtk=$enableval,enable_gtk=no) +AC_ARG_ENABLE(qt, [ --enable-qt Turn on Qt interface (default=no Qt)],enable_qt=$enableval,enable_qt=no) +AC_ARG_ENABLE(plugins, [ --disable-plugins Turn off plugins support (default=plugins enabled)],enable_plugins=$enableval,enable_plugins=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) +AC_ARG_ENABLE(ruby, [ --disable-ruby Turn off Ruby script plugin (default=compiled if found)],enable_ruby=$enableval,enable_ruby=yes) +AC_ARG_ENABLE(lua, [ --disable-lua Turn off Lua script plugin (default=compiled if found)],enable_lua=$enableval,enable_lua=yes) +AC_ARG_WITH(lua-inc, [ --with-lua-inc=DIR, Lua include files are in DIR (default=autodetect)],lua_inc=$withval,lua_inc='') +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_ENABLE(aspell, [ --disable-aspell Turn off Aspell plugin (default=compiled if found)],enable_aspell=$enableval,enable_aspell=yes) +AC_ARG_ENABLE(gnutls, [ --disable-gnutls Turn off gnutls support (default=compiled if found)],enable_gnutls=$enableval,enable_gnutls=yes) +AC_ARG_WITH(doc_xsl_prefix, [ --with-doc-xsl-prefix=DIR Docbook html/chunk.xsl is in DIR (default=autodetect)],doc_xsl_prefix=$withval,doc_xsl_prefix='') +AC_ARG_WITH(debug, [ --with-debug Debugging: 0=no debug, 1=debug compilation, 2=debug compilation + verbose msgs (default=1)],debug=$withval,debug=1) not_found="" @@ -612,6 +613,39 @@ if test "x$debug" != "x0" ; then fi fi +# ------------------------------------------------------------------------------ +# documentation +# ------------------------------------------------------------------------------ + +AC_MSG_CHECKING(for html/chunk.xsl) +DOC_XSL_PREFIX="" + +if test -n "$doc_xsl_prefix"; then + doc_xsl_prefix_path="$doc_xsl_prefix" +else + doc_xsl_prefix_path="/usr/share/xml/docbook/xsl-stylesheets-1.69" + doc_xsl_prefix_path="${doc_xsl_prefix_arr} /usr/share/xml/docbook/stylesheet/nwalsh" +fi + +for p in $doc_xsl_prefix_path; do + if test -f ${p}/html/chunk.xsl; then + DOC_XSL_PREFIX="$p" + fi +done + +if test "x$DOC_XSL_PREFIX" == "x"; then + AC_MSG_RESULT(no) + enable_doc="no" + AC_MSG_WARN([ +*** Docbook XSL files not found +*** WeeChat will be built without documentation. +*** Try ./configure --with-doc-xsl-prefix=DIR if you have DIR/html/chunk.xsl file]) +else + AC_MSG_RESULT($DOC_XSL_PREFIX) + AC_SUBST(DOC_XSL_PREFIX) + enable_doc="yes" +fi + # ------------------------------------------------------------------------------ # general vars # ------------------------------------------------------------------------------ @@ -772,6 +806,7 @@ echo " Lua plugin.......... : $enable_lua" echo " Aspell plugin....... : $enable_aspell" echo "Compile with debug info........... : $msg_debug_compiler" echo " Backtrace........... : $enable_backtrace" +echo "Build doc..........................: $enable_doc" echo "Print debugging messages.......... : $msg_debug_verbose" echo "" eval echo "WeeChat will be installed in $bindir." diff --git a/doc/Makefile.am b/doc/Makefile.am index c92087c0b..b895b6750 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -15,8 +15,19 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -SUBDIRS = en fr de ru pl cs +SUBDIRS = . en fr de ru pl cs man_MANS = weechat-curses.1 EXTRA_DIST = $(man_MANS) weechat-doc.css weechat-html-one.xsl weechat-html.xsl + +all-local: weechat-html.xsl weechat-html-one.xsl + +weechat-html.xsl: weechat-html.xsl.in + sed -e 's,\@DOC_XSL_PREFIX\@,$(DOC_XSL_PREFIX),g' < weechat-html.xsl.in > weechat-html.xsl + +weechat-html-one.xsl: weechat-html-one.xsl.in + sed -e 's,\@DOC_XSL_PREFIX\@,$(DOC_XSL_PREFIX),g' < weechat-html-one.xsl.in > weechat-html-one.xsl + +clean-local: + -rm -f weechat-html.xsl weechat-html-one.xsl diff --git a/weechat/ChangeLog b/weechat/ChangeLog index ea72491ee..5d1c2308d 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -1,9 +1,10 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2006-06-30 +ChangeLog - 2006-07-07 Version 0.2.0 (under dev!): + * added configure option for doc XSL prefix (bug #16991) * fixed bug with spaces in script names (bug #16957) * fixed random crash when "MODE #chan -l" is received * fixed bug in IRC parser (random crash with malformed IRC messages) diff --git a/weechat/configure.in b/weechat/configure.in index 77e5a2a43..6b9871afa 100644 --- a/weechat/configure.in +++ b/weechat/configure.in @@ -103,21 +103,22 @@ AH_VERBATIM([DEBUG], [#undef DEBUG]) # Arguments for ./configure -AC_ARG_ENABLE(ncurses, [ --disable-ncurses Turn off ncurses interface (default=compiled if found)],enable_ncurses=$enableval,enable_ncurses=yes) -AC_ARG_ENABLE(wxwidgets, [ --enable-wxwidgets Turn on WxWidgets interface (default=no wxwidgets)],enable_wxwidgets=$enableval,enable_wxwidgets=no) -AC_ARG_ENABLE(gtk, [ --enable-gtk Turn on Gtk interface (default=no Gtk)],enable_gtk=$enableval,enable_gtk=no) -AC_ARG_ENABLE(qt, [ --enable-qt Turn on Qt interface (default=no Qt)],enable_qt=$enableval,enable_qt=no) -AC_ARG_ENABLE(plugins, [ --disable-plugins Turn off plugins support (default=plugins enabled)],enable_plugins=$enableval,enable_plugins=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) -AC_ARG_ENABLE(ruby, [ --disable-ruby Turn off Ruby script plugin (default=compiled if found)],enable_ruby=$enableval,enable_ruby=yes) -AC_ARG_ENABLE(lua, [ --disable-lua Turn off Lua script plugin (default=compiled if found)],enable_lua=$enableval,enable_lua=yes) -AC_ARG_WITH(lua-inc, [ --with-lua-inc=DIR, Lua include files are in DIR (default=autodetect)],lua_inc=$withval,lua_inc='') -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_ENABLE(aspell, [ --disable-aspell Turn off Aspell plugin (default=compiled if found)],enable_aspell=$enableval,enable_aspell=yes) -AC_ARG_ENABLE(gnutls, [ --disable-gnutls Turn off gnutls support (default=compiled if found)],enable_gnutls=$enableval,enable_gnutls=yes) -AC_ARG_WITH(debug, [ --with-debug Debugging: 0=no debug, 1=debug compilation, 2=debug compilation + verbose msgs (default=1)],debug=$withval,debug=1) +AC_ARG_ENABLE(ncurses, [ --disable-ncurses Turn off ncurses interface (default=compiled if found)],enable_ncurses=$enableval,enable_ncurses=yes) +AC_ARG_ENABLE(wxwidgets, [ --enable-wxwidgets Turn on WxWidgets interface (default=no wxwidgets)],enable_wxwidgets=$enableval,enable_wxwidgets=no) +AC_ARG_ENABLE(gtk, [ --enable-gtk Turn on Gtk interface (default=no Gtk)],enable_gtk=$enableval,enable_gtk=no) +AC_ARG_ENABLE(qt, [ --enable-qt Turn on Qt interface (default=no Qt)],enable_qt=$enableval,enable_qt=no) +AC_ARG_ENABLE(plugins, [ --disable-plugins Turn off plugins support (default=plugins enabled)],enable_plugins=$enableval,enable_plugins=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) +AC_ARG_ENABLE(ruby, [ --disable-ruby Turn off Ruby script plugin (default=compiled if found)],enable_ruby=$enableval,enable_ruby=yes) +AC_ARG_ENABLE(lua, [ --disable-lua Turn off Lua script plugin (default=compiled if found)],enable_lua=$enableval,enable_lua=yes) +AC_ARG_WITH(lua-inc, [ --with-lua-inc=DIR, Lua include files are in DIR (default=autodetect)],lua_inc=$withval,lua_inc='') +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_ENABLE(aspell, [ --disable-aspell Turn off Aspell plugin (default=compiled if found)],enable_aspell=$enableval,enable_aspell=yes) +AC_ARG_ENABLE(gnutls, [ --disable-gnutls Turn off gnutls support (default=compiled if found)],enable_gnutls=$enableval,enable_gnutls=yes) +AC_ARG_WITH(doc_xsl_prefix, [ --with-doc-xsl-prefix=DIR Docbook html/chunk.xsl is in DIR (default=autodetect)],doc_xsl_prefix=$withval,doc_xsl_prefix='') +AC_ARG_WITH(debug, [ --with-debug Debugging: 0=no debug, 1=debug compilation, 2=debug compilation + verbose msgs (default=1)],debug=$withval,debug=1) not_found="" @@ -612,6 +613,39 @@ if test "x$debug" != "x0" ; then fi fi +# ------------------------------------------------------------------------------ +# documentation +# ------------------------------------------------------------------------------ + +AC_MSG_CHECKING(for html/chunk.xsl) +DOC_XSL_PREFIX="" + +if test -n "$doc_xsl_prefix"; then + doc_xsl_prefix_path="$doc_xsl_prefix" +else + doc_xsl_prefix_path="/usr/share/xml/docbook/xsl-stylesheets-1.69" + doc_xsl_prefix_path="${doc_xsl_prefix_arr} /usr/share/xml/docbook/stylesheet/nwalsh" +fi + +for p in $doc_xsl_prefix_path; do + if test -f ${p}/html/chunk.xsl; then + DOC_XSL_PREFIX="$p" + fi +done + +if test "x$DOC_XSL_PREFIX" == "x"; then + AC_MSG_RESULT(no) + enable_doc="no" + AC_MSG_WARN([ +*** Docbook XSL files not found +*** WeeChat will be built without documentation. +*** Try ./configure --with-doc-xsl-prefix=DIR if you have DIR/html/chunk.xsl file]) +else + AC_MSG_RESULT($DOC_XSL_PREFIX) + AC_SUBST(DOC_XSL_PREFIX) + enable_doc="yes" +fi + # ------------------------------------------------------------------------------ # general vars # ------------------------------------------------------------------------------ @@ -772,6 +806,7 @@ echo " Lua plugin.......... : $enable_lua" echo " Aspell plugin....... : $enable_aspell" echo "Compile with debug info........... : $msg_debug_compiler" echo " Backtrace........... : $enable_backtrace" +echo "Build doc..........................: $enable_doc" echo "Print debugging messages.......... : $msg_debug_verbose" echo "" eval echo "WeeChat will be installed in $bindir." diff --git a/weechat/doc/Makefile.am b/weechat/doc/Makefile.am index c92087c0b..b895b6750 100644 --- a/weechat/doc/Makefile.am +++ b/weechat/doc/Makefile.am @@ -15,8 +15,19 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -SUBDIRS = en fr de ru pl cs +SUBDIRS = . en fr de ru pl cs man_MANS = weechat-curses.1 EXTRA_DIST = $(man_MANS) weechat-doc.css weechat-html-one.xsl weechat-html.xsl + +all-local: weechat-html.xsl weechat-html-one.xsl + +weechat-html.xsl: weechat-html.xsl.in + sed -e 's,\@DOC_XSL_PREFIX\@,$(DOC_XSL_PREFIX),g' < weechat-html.xsl.in > weechat-html.xsl + +weechat-html-one.xsl: weechat-html-one.xsl.in + sed -e 's,\@DOC_XSL_PREFIX\@,$(DOC_XSL_PREFIX),g' < weechat-html-one.xsl.in > weechat-html-one.xsl + +clean-local: + -rm -f weechat-html.xsl weechat-html-one.xsl