[Weechat-cvs] weechat/src/plugins Makefile.am configure.in as...

[kolter]

CVSROOT:        /sources/weechat
Module name:    weechat
Changes by:     kolter <kolter> 06/06/11 02:28:23

Modified files:
        src/plugins    : Makefile.am 
        .              : configure.in 
Added files:
        src/plugins/aspell: Makefile.am weechat-aspell.c 
                            weechat-aspell.h 

Log message:
        adding aspell plugin

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/weechat/src/plugins/aspell/Makefile.am?cvsroot=weechat&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/weechat/src/plugins/aspell/weechat-aspell.c?cvsroot=weechat&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/weechat/src/plugins/aspell/weechat-aspell.h?cvsroot=weechat&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/weechat/src/plugins/Makefile.am?cvsroot=weechat&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/weechat/configure.in?cvsroot=weechat&r1=1.122&r2=1.123

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/weechat/weechat/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- Makefile.am 19 Apr 2005 20:08:19 -0000      1.11
+++ Makefile.am 16 Jul 2005 22:46:01 -0000      1.12
@@ -15,9 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-SUBDIRS = po intl src
+SUBDIRS = po doc intl src
 
-EXTRA_DIST = config.rpath  weechat-curses.1 BUGS FAQ FAQ.fr \
+EXTRA_DIST = config.rpath BUGS FAQ FAQ.fr \
              debian/changelog debian/control \
              debian/copyright \
              debian/rules debian/weechat-common.docs \
@@ -25,6 +25,4 @@
              debian/weechat-curses.install debian/weechat-gtk.dirs \
              debian/weechat-gtk.install
 
-man_MANS = weechat-curses.1
-
 ACLOCAL_AMFLAGS = -I m4

Index: configure.in
===================================================================
RCS file: /sources/weechat/weechat/configure.in,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- configure.in        9 Jun 2006 05:35:08 -0000       1.122
+++ configure.in        11 Jun 2006 02:28:23 -0000      1.123
@@ -96,6 +96,7 @@
 AH_VERBATIM([PLUGIN_PYTHON], [#undef PLUGIN_PYTHON])
 AH_VERBATIM([PLUGIN_RUBY], [#undef PLUGIN_RUBY])
 AH_VERBATIM([PLUGIN_LUA], [#undef PLUGIN_LUA])
+AH_VERBATIM([PLUGIN_ASPELL], [#undef PLUGIN_ASPELL])
 AH_VERBATIM([HAVE_GNUTLS], [#undef HAVE_GNUTLS])
 AH_VERBATIM([HAVE_FLOCK], [#undef HAVE_FLOCK])
 AH_VERBATIM([DEBUG], [#undef DEBUG])
@@ -114,6 +115,7 @@
 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)
 
@@ -197,6 +199,7 @@
     enable_python="no"
     enable_ruby="no"
     enable_lua="no"
+    enable_aspell="no"
 fi
 
 # ---------------------------------- perl 
--------------------------------------
@@ -456,6 +459,42 @@
     AC_DEFINE(PLUGIN_LUA)
 fi
 
+# 
------------------------------------------------------------------------------
+#                                   aspell
+# 
------------------------------------------------------------------------------
+
+if test "x$enable_aspell" = "xyes" ; then
+    ASPELL_CFLAGS=""
+    ASPELL_LFLAGS=""
+
+    
AC_CHECK_HEADER(aspell.h,ac_found_aspell_header="yes",ac_found_aspell_header="no")
+    
AC_CHECK_LIB(aspell,new_aspell_speller,ac_found_aspell_lib="yes",ac_found_aspell_lib="no")
+
+    AC_MSG_CHECKING(for aspell headers and librairies)    
+    if test "x$ac_found_aspell_header" = "xno" -o "x$ac_found_aspell_lib" = 
"xno" ; then
+       AC_MSG_RESULT(no)
+       AC_MSG_WARN([
+*** Aspell headers and/or libraries couldn't be found in your system.
+*** Try to install them with your software package manager.
+*** WeeChat will be built without Aspell support.])
+       enable_aspell="no"
+       not_found="$not_found aspell"
+    else
+       AC_MSG_RESULT(yes)
+       ASPELL_LFLAGS="$ASPELL_LFLAGS -laspell"
+    fi
+fi
+
+if test "x$enable_aspell" = "xyes" ; then
+    AC_SUBST(ASPELL_CFLAGS)
+    AC_SUBST(ASPELL_LFLAGS)
+    AC_DEFINE(PLUGIN_ASPELL)
+fi
+
+# 
------------------------------------------------------------------------------
+#                                dynamic loader
+# 
------------------------------------------------------------------------------
+
 if test "x$enable_plugins" = "xyes" ; then
     AC_CHECK_FUNCS(dlopen, LIBDL_FOUND=yes, LIBDL_FOUND=no)
     if test "$LIBDL_FOUND" != "yes"; then
@@ -474,6 +513,7 @@
         enable_python="no"
         enable_ruby="no"
         enable_lua="no"
+       enable_aspell="no"
         not_found="$not_found plugins"
     fi
 fi
@@ -617,6 +657,7 @@
 AM_CONDITIONAL(PLUGIN_PYTHON, test "$enable_python" = "yes")
 AM_CONDITIONAL(PLUGIN_RUBY,   test "$enable_ruby" = "yes")
 AM_CONDITIONAL(PLUGIN_LUA,    test "$enable_lua" = "yes")
+AM_CONDITIONAL(PLUGIN_ASPELL, test "$enable_aspell" = "yes")
 AM_CONDITIONAL(HAVE_GNUTLS,   test "$enable_gnutls" = "yes")
 AM_CONDITIONAL(HAVE_FLOCK,    test "$enable_flock" = "yes")
 
@@ -636,6 +677,7 @@
            src/plugins/scripts/python/Makefile
            src/plugins/scripts/ruby/Makefile
            src/plugins/scripts/lua/Makefile
+          src/plugins/aspell/Makefile
            src/gui/Makefile
            src/gui/curses/Makefile
            src/gui/wxwidgets/Makefile
@@ -692,6 +734,7 @@
 echo "              Python plugin....... : $enable_python"
 echo "              Ruby plugin......... : $enable_ruby"
 echo "              Lua plugin.......... : $enable_lua"
+echo "              Aspell plugin....... : $enable_aspell"
 echo "Compile with debug info........... : $msg_debug_compiler"
 echo "              Backtrace........... : $enable_backtrace"
 echo "Print debugging messages.......... : $msg_debug_verbose"