try some pspell stuff

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6435 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/config/ChangeLog b/config/ChangeLog
index c39e15a8cc1df86911fc47b6b1ce144020ded9bd..2de1d3c7647abeee0e727d7b74e40b20722f6d21 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -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
 

diff --git a/config/pspell.m4 b/config/pspell.m4
index ad626abd4b762c9c57a670a19cd699038bb69401..08b0f8b4d5c77daf0c3969d391b98bc82d308ee3 100644 (file)
--- a/config/pspell.m4
+++ b/config/pspell.m4
@@ -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

diff --git a/src/Makefile.am b/src/Makefile.am
index fe8665c74ee4455b7735709e11924b3cd2360cdf..843f2d16751eccbd03ec283138ab43ba3982ba8d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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