X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=81e3a123eb5048b35d3f0ea58b3da5ac2fa5a0e8;hb=4e61a40a926683adc7af102e5299619349bf19eb;hp=9d3e31aa0274403dac6bac8cee4bb02429d4f844;hpb=a25b9babe0aa4f53b09250e88b2f2e6dbf7f874f;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 9d3e31aa02..81e3a123eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,8 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(LyX,1.6.0svn,[lyx-devel@lists.lyx.org],[lyx])
-AC_SUBST(LYX_DATE, ["Tue, Oct 28, 2008"])
+AC_INIT(LyX,2.0.0svn,[lyx-devel@lists.lyx.org],[lyx])
+# Use ISO format only. The frontend needs to parse this
+AC_SUBST(LYX_DATE, ["2008-11-15"])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])
@@ -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,19 +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
-AC_LIBTOOL_WIN32_DLL
-#AM_PROG_LIBTOOL
-LYX_PROG_LIBTOOL
-
 ### We need iconv for unicode support (Qt4 frontend requires it too)
 AM_ICONV
 if test "$am_cv_func_iconv" = no; then
@@ -462,6 +469,7 @@ 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/support/Makefile \