Add 'tab-group-next' to emacs.bind

[lyx.git] / config / spell.m4

diff --git a/config/spell.m4 b/config/spell.m4
index 3cefc82ee697587f3c122381be12fc2495f18b9d..f291670437730df64471e9aaa0c0bdbae7a4db34 100644 (file)
--- a/config/spell.m4
+++ b/config/spell.m4
@@ -29,12 +29,9 @@ AC_DEFUN([LYX_HAVE_ENCHANT2],
   save_CXXFLAGS=$CXXFLAGS
   CXXFLAGS="$ENCHANT_CFLAGS $AM_CXXFLAGS $CXXFLAGS"
 
-  AC_TRY_COMPILE([#include <enchant++.h>],
-      [enchant::Broker broker;],
-      [AC_MSG_RESULT(yes)
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <enchant++.h>]], [[enchant::Broker broker;]])],[AC_MSG_RESULT(yes)
        AC_DEFINE(HAVE_ENCHANT2, 1, [Define to 1 if enchant 2.x is detected])
-      ],
-      [AC_MSG_RESULT(no)])
+      ],[AC_MSG_RESULT(no)])
   CXXFLAGS=$save_CXXFLAGS
 ])
 
@@ -67,14 +64,11 @@ AC_DEFUN([LYX_HAVE_HUNSPELL_CXXABI],
   CXXFLAGS="$ENCHANT_CFLAGS $AM_CXXFLAGS $CXXFLAGS"
 
 # in the C++ ABI, stem() returns a vector, in the C ABI, it returns an int
-  AC_TRY_COMPILE([#include <hunspell/hunspell.hxx>],
-      [Hunspell sp("foo", "bar");
-       int i = sp.stem("test").size();],
-      [AC_MSG_RESULT(yes)
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <hunspell/hunspell.hxx>]], [[Hunspell sp("foo", "bar");
+       int i = sp.stem("test").size();]])],[AC_MSG_RESULT(yes)
        AC_DEFINE(HAVE_HUNSPELL_CXXABI, 1, [Define to 1 if hunspell C++ (rather than C) ABI is detected])
        have_hunspell_cxx_abi=yes
-      ],
-      [AC_MSG_RESULT(no)])
+      ],[AC_MSG_RESULT(no)])
   CXXFLAGS=$save_CXXFLAGS
 ])
 
@@ -92,21 +86,20 @@ AC_DEFUN([CHECK_WITH_HUNSPELL],
                         [lyx_use_hunspell=false])
                         AC_CHECK_LIB(hunspell, main, LIBS="-lhunspell $LIBS", lyx_use_hunspell=false)
                ])
+       fi
        AC_MSG_CHECKING([whether to use hunspell])
        if $lyx_use_hunspell ; then
                AC_MSG_RESULT(yes)
                AC_DEFINE(USE_HUNSPELL, 1, [Define as 1 to use the hunspell library])
                lyx_flags="$lyx_flags use-hunspell"
+               LYX_HAVE_HUNSPELL_CXXABI
+               if test $enable_stdlib_debug = "yes" -a -n "$have_hunspell_cxx_abi" ; then
+                   LYX_WARNING([Compiling LyX with stdlib-debug and system hunspell libraries may lead to
+   crashes. Consider using --disable-stdlib-debug or --with-included-hunspell.])
+               fi
        else
                AC_MSG_RESULT(no)
        fi
-    fi
-       LYX_HAVE_HUNSPELL_CXXABI
-       if test $enable_stdlib_debug = "yes" -a -n "$have_hunspell_cxx_abi" ; then
-               LYX_WARNING([Compiling LyX with stdlib-debug and system hunspell libraries may lead to
-   crashes. Consider using --disable-stdlib-debug or --with-included-hunspell.])
-             fi
-
     ])
 
 dnl Usage: LYX_USE_INCLUDED_HUNSPELL : select if the included hunspell should