try some pspell stuff

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6435 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2003-03-10 19:18:42 +00:00
parent 4b0033da60
commit 43f489b357
3 changed files with 9 additions and 27 deletions

View File

@ -1,6 +1,10 @@
2003-03-10 Lars Gullik Bjønnes <larsbj@birdstep.com>
* pspell.m4: simplify pspell checking even more
2003-03-10 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* configure.ac:
* configure.ac:
* configure.in: remove special handling of linking order for
cygwin

View File

@ -16,34 +16,12 @@ AC_DEFUN(CHECK_WITH_PSPELL,
USE_PSPELL="yes"
])
AC_ARG_WITH(pspell-includes,
AC_HELP_STRING([--with-pspell-include],[where the pspell.h is located]),
pspell_use_include="$withval",
[])
AC_ARG_WITH(pspell-libs,
AC_HELP_STRING([--with-pspell-lib],[where the libpspell.a is located]),
pspell_use_lib="$withval",
[])
if test "$USE_PSPELL" = "yes" ; then
AC_CHECK_HEADER(pspell/pspell.h)
AC_CHECK_LIB(pspell, delete_pspell_config)
if test "$pspell_use_include" = "NO" || \
test "$pspell_use_lib" = "NO"; then
if test "$USE_PSPELL" = "yes"; then
USE_PSPELL="not found"
fi
fi
AC_CHECK_HEADERS(pspell/pspell.h, break, USE_PSPELL=no)
AC_CHECK_LIB(pspell, new_pspell_config)
if test "$USE_PSPELL" = "yes"; then
AC_DEFINE(USE_PSPELL, 1, [Define as 1 to use the pspell library])
# PSPELL_INCLUDES="-I$pspell_use_include"
# PSPELL_LIBS="-L$pspell_use_lib -lpspell"
# USE_PSPELL="yes ($pspell_use_include $pspell_use_lib)"
AC_SUBST(PSPELL_INCLUDES)
AC_SUBST(PSPELL_LIBS)
lyx_flags="$lyx_flags use-pspell"
fi
fi

View File

@ -17,7 +17,7 @@ BOOST_LIBS = ../boost/libs/regex/src/libboostregex.la \
../boost/libs/signals/src/libboostsignals.la
lyx_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS) \
$(PSPELL_LIBS) $(AIKSAURUS_LIBS) @LIBS@
$(AIKSAURUS_LIBS) @LIBS@
#lyx_LDFLAGS=-Wl,-O1
@ -29,7 +29,7 @@ EXTRA_DIST = config.h.in stamp-h.in cheaders version.C.in \
tracer.C \
tracer.h
INCLUDES = $(BOOST_INCLUDES) $(PSPELL_INCLUDES)
INCLUDES = $(BOOST_INCLUDES)
localedir = $(datadir)/locale