[prev in list] [next in list] [prev in thread] [next in thread] 

List:       koffice-devel
Subject:    [PATCH] KoSpell without aspell
From:       Nicolas Goutte <nicolasg () snafu ! de>
Date:       2003-04-09 22:10:59
[Download RAW message or body]

Attached is a patch to koffice for being able to compile KOffice without 
aspell.

The patch has been made as "brute force", trying to compile at all costs. That 
is why I have not commited it. The basic idea is that as koffice/lib/kospell 
is compiled even without aspell, then the kospell libraray always exists and 
therefore the code should be the same with and without aspell.

Have a nice day/evening/night!
["koffice.diff" (text/x-diff)]

Index: kword/kwview.cc
===================================================================
RCS file: /home/kde/koffice/kword/kwview.cc,v
retrieving revision 1.952
diff -u -r1.952 kwview.cc
--- kword/kwview.cc	9 Apr 2003 10:48:52 -0000	1.952
+++ kword/kwview.cc	9 Apr 2003 22:03:22 -0000
@@ -117,9 +117,7 @@
 #include <kformulamimesource.h>
 
 #include <stdlib.h>
-#ifdef HAVE_LIBASPELL
 #include <koSpell.h>
-#endif
 
 #include "kwinsertpagedia.h"
 
Index: lib/kofficeui/Makefile.am
===================================================================
RCS file: /home/kde/koffice/lib/kofficeui/Makefile.am,v
retrieving revision 1.69
diff -u -r1.69 Makefile.am
--- lib/kofficeui/Makefile.am	9 Apr 2003 12:58:22 -0000	1.69
+++ lib/kofficeui/Makefile.am	9 Apr 2003 22:03:26 -0000
@@ -19,7 +19,7 @@
 	tkaction.cpp tkcoloractions.cpp tkcombobox.cpp tktoolbarbutton.cpp \
 	koCharSelectDia.cc koInsertLink.cc koeditpath.cc koSpellConfig.cc kocommandhistory.cpp
 libkofficeui_la_LDFLAGS	= -version-info 2:0:0 -no-undefined $(all_libraries)
-libkofficeui_la_LIBADD  = $(LIB_KOFFICECORE) -lkospell
+libkofficeui_la_LIBADD  = $(LIB_KOFFICECORE) $(LIBKOSPELL)
 
 include_HEADERS = koFind.h koReplace.h \
 	koPageLayoutDia.h \
Index: lib/kospell/configure.in.in
===================================================================
RCS file: /home/kde/koffice/lib/kospell/configure.in.in,v
retrieving revision 1.8
diff -u -r1.8 configure.in.in
--- lib/kospell/configure.in.in	3 Dec 2002 07:24:29 -0000	1.8
+++ lib/kospell/configure.in.in	9 Apr 2003 22:03:27 -0000
@@ -10,16 +10,17 @@
        echo "See http://aspell.net/. Spell-checking disabled."
        echo ""
        LIBASPELL=""
-       LIBKOSPELL=""
+#       LIBKOSPELL=""
    else
        if test -n "$LIBASPELL"; then
            dnl the header and the lib exist -> ok
-           LIBKOSPELL='$(top_builddir)/lib/kospell/libkospell.la'
+#           LIBKOSPELL='$(top_builddir)/lib/kospell/libkospell.la'
            dnl this is for config.h
            AC_DEFINE(HAVE_LIBASPELL, 1, [If we are going to use libaspell for spell-checking])
        fi
    fi
-   dnl this is for lib/Makefile.am, to know whether to compile kospell
+  LIBKOSPELL='$(top_builddir)/lib/kospell/libkospell.la'
+  dnl this is for lib/Makefile.am, to know whether to compile kospell
    AM_CONDITIONAL(include_KOSPELL, test -n "$LIBASPELL")
    dnl this is for lib/kospell/Makefile.am, to link to libaspell
    AC_SUBST(LIBASPELL)


_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/koffice-devel


[prev in list] [next in list] [prev in thread] [next in thread]