Transfer some general code from GuiSpellchecker to Buffer and DocIterator.

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9626c704462b49f8a8276c03d7877ae9cc1d3806..d1789d39ad621487a63c2a5cb039d210fe591faf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,8 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
 AC_INIT(LyX,2.0.0svn,[lyx-devel@lists.lyx.org],[lyx])
-AC_SUBST(LYX_DATE, ["Sat, Nov 15, 2008"])
+# Use ISO format only. The frontend needs to parse this
+AC_SUBST(LYX_DATE, ["2009-03-25"])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])
@@ -18,7 +19,7 @@ LYX_USE_PACKAGING
 # AM_INIT_AUTOMAKE above because we alter $PACKAGE in LYX_USE_PACKAGING.
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
 
-dnl default maintainer mode to true for development versions
+dnl Default maintainer mode to true for development versions
 if test "${enable_maintainer_mode+set}" != set; then
   enable_maintainer_mode=$lyx_devel_version
 fi
@@ -113,6 +114,25 @@ AC_CHECK_LIB(shlwapi, main, [LIBSHLWAPI=-lshlwapi])
 AC_SUBST(LIBSHLWAPI)
 AC_CHECK_LIB(gdi32, main)
 
+AC_ARG_WITH(mythes,
+  [  --without-mythes        do not use the MyThes library],
+  [lyx_use_mythes=$withval])
+if test x$lyx_use_mythes != xno; then
+AC_CHECK_LIB(mythes, main,
+       [AC_DEFINE(HAVE_LIBMYTHES,1,[Define this if you have the MyThes library])
+        MYTHES_LIBS="-lmythes"
+        lyx_flags="mythes $lyx_flags"
+       ])
+AC_CHECK_HEADER(mythes.hxx,[
+  ac_cv_header_mythes_h=yes
+  lyx_cv_mythes_h_location="<mythes.hxx>"])
+AC_CHECK_HEADER(mythes/mythes.hxx,[
+  ac_cv_header_mythes_h=yes
+  lyx_cv_mythes_h_location="<mythes/mythes.hxx>"])
+AC_DEFINE_UNQUOTED(MYTHES_H_LOCATION,$lyx_cv_mythes_h_location,[Location of mythes.hxx])
+fi
+AC_SUBST(MYTHES_LIBS)
+
 AC_ARG_WITH(aiksaurus,
   [  --without-aiksaurus     do not use the Aiksaurus library],
   [lyx_use_aiksaurus=$withval])
@@ -137,16 +157,6 @@ LYX_USE_INCLUDED_BOOST
 # Needed for our char_type
 AC_CHECK_SIZEOF(wchar_t)
 
-### Setup libtool
-dnl Dirty trick ahead: disable libtool checking for a fortran compiler
-dnl see http://permalink.gmane.org/gmane.comp.gnu.libtool.general/6699
-dnl Note that this will reportedly not be needed with libtool 2.0
-m4_undefine([AC_PROG_F77])
-m4_defun([AC_PROG_F77],[])
-
-AC_DISABLE_SHARED
-#AC_DISABLE_STATIC
-
 ### We need iconv for unicode support (Qt4 frontend requires it too)
 AM_ICONV
 if test "$am_cv_func_iconv" = no; then
@@ -348,6 +358,7 @@ char * strerror(int n);
 #define BOOST_NO_WSTRING 1
 
 #ifdef __CYGWIN__
+#  define NOMINMAX
 #  define BOOST_POSIX 1
 #  define BOOST_POSIX_API 1
 #  define BOOST_POSIX_PATH 1
@@ -459,8 +470,10 @@ AC_CONFIG_FILES([Makefile \
       sourcedoc/Doxyfile \
       sourcedoc/Makefile \
       src/client/Makefile \
+      src/client/lyxclient.1:src/client/lyxclient.1in \
       src/Makefile \
       src/tex2lyx/Makefile \
+      src/tex2lyx/tex2lyx.1:src/tex2lyx/tex2lyx.1in \
       src/support/Makefile \
       src/frontends/Makefile \
       src/frontends/qt4/Makefile