Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 207025 | Differences between
and this patch

Collapse All | Expand All

(-)enchant-1.3.0/configure.in (-8 / +8 lines)
Lines 114-120 AC_ARG_ENABLE(myspell, [ --disable-mysp Link Here
114
if test "x$have_cxx" = "xno"; then
114
if test "x$have_cxx" = "xno"; then
115
   build_myspell=no
115
   build_myspell=no
116
fi
116
fi
117
AM_CONDITIONAL(WITH_MYSPELL, test "x$build_myspell" = "xyes")
117
118
if test "x$build_myspell" = "xexternal"; then
119
   PKG_CHECK_MODULES([HUNSPELL], [hunspell >= 1.1.9])
120
fi
121
122
AM_CONDITIONAL(WITH_SYSTEM_HUNSPELL, test "x$build_myspell" = "xexternal")
123
AM_CONDITIONAL(WITH_MYSPELL, test "x$build_myspell" != "xno")
118
124
119
myspell_dir=${datadir}/enchant/myspell
125
myspell_dir=${datadir}/enchant/myspell
120
AC_ARG_WITH(myspell-dir, [  --with-myspell-dir=PATH    path to installed myspell dicts ])
126
AC_ARG_WITH(myspell-dir, [  --with-myspell-dir=PATH    path to installed myspell dicts ])
Lines 123-135 if test "x$with_myspell_dir" != "x" ; th Link Here
123
   myspell_dir=$with_myspell_dir
129
   myspell_dir=$with_myspell_dir
124
fi
130
fi
125
131
126
MYSPELL_CFLAGS="$MYSPELL_CFLAGS -DENCHANT_MYSPELL_DICT_DIR='\"$myspell_dir\"'"
132
HUNSPELL_CFLAGS="$HUNSPELL_CFLAGS -DENCHANT_MYSPELL_DICT_DIR='\"$myspell_dir\"'"
127
if test "x$with_system_myspell" != "xno"; then
128
   MYSPELL_CFLAGS="$MYSPELL_CFLAGS -DWITH_SYSTEM_MYSPELL=1"
129
fi
130
131
AC_SUBST(MYSPELL_CFLAGS)
132
AC_SUBST(MYSPELL_LIBS)
133
133
134
check_aspell=yes
134
check_aspell=yes
135
build_aspell=no
135
build_aspell=no
(-)enchant-1.3.0/src/myspell/Makefile.am (-4 / +9 lines)
Lines 4-19 else Link Here
4
target_lib =
4
target_lib =
5
endif
5
endif
6
6
7
INCLUDES=-I$(top_srcdir)/src $(ENCHANT_CFLAGS) $(MYSPELL_CFLAGS) -D_ENCHANT_BUILD=1
7
INCLUDES=-I$(top_srcdir)/src $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS) -D_ENCHANT_BUILD=1
8
8
9
myspell_LTLIBRARIES = $(target_lib)
9
myspell_LTLIBRARIES = $(target_lib)
10
myspelldir= $(libdir)/enchant
10
myspelldir= $(libdir)/enchant
11
11
12
libenchant_myspell_lalibdir=$(libdir)/enchant
12
libenchant_myspell_lalibdir=$(libdir)/enchant
13
libenchant_myspell_la_LIBADD= $(MYSPELL_LIBS) $(ENCHANT_LIBS) $(top_builddir)/src/libenchant.la
13
libenchant_myspell_la_LIBADD= $(HUNSPELL_LIBS) $(ENCHANT_LIBS) $(top_builddir)/src/libenchant.la
14
libenchant_myspell_la_LDFLAGS = -module -avoid-version -no-undefined
14
libenchant_myspell_la_LDFLAGS = -module -avoid-version -no-undefined
15
15
16
libenchant_myspell_la_SOURCES =	\
16
if !WITH_SYSTEM_HUNSPELL
17
hunspell_sources = \
17
	affentry.hxx		\
18
	affentry.hxx		\
18
	affixmgr.hxx		\
19
	affixmgr.hxx		\
19
	atypes.hxx		\
20
	atypes.hxx		\
Lines 31-37 libenchant_myspell_la_SOURCES = \ Link Here
31
	dictmgr.cxx		\
32
	dictmgr.cxx		\
32
	hashmgr.cxx		\
33
	hashmgr.cxx		\
33
	hunspell.cxx		\
34
	hunspell.cxx		\
34
	suggestmgr.cxx		\
35
	suggestmgr.cxx
36
endif
37
38
libenchant_myspell_la_SOURCES =	\
39
	$(hunspell_sources)	\
35
	myspell_checker.cpp
40
	myspell_checker.cpp
36
41
37
EXTRA_DIST=			\
42
EXTRA_DIST=			\

Return to bug 207025