X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=c4f1ebeb31236375e0739418e45b5f7b73804ef4;hb=e3f65fd0883c7706aa08fb72e128e7c32fba11b5;hp=cc7b1128c56e59a50e3633abaacecc56763cf599;hpb=98b48a496946b1d8e03c1cd72d78695bb4b32e01;p=lyx.git

diff --git a/configure.ac b/configure.ac
index cc7b1128c5..c4f1ebeb31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(LyX,2.0.0svn,[lyx-devel@lists.lyx.org],[lyx])
+AC_INIT(LyX,2.1.0svn,[lyx-devel@lists.lyx.org],[lyx])
 # Use ISO format only. The frontend needs to parse this
-AC_SUBST(LYX_DATE, ["2011-01-10"])
+AC_SUBST(LYX_DATE, ["2011-04-29"])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])
@@ -58,7 +58,7 @@ for file in config/install-sh ; do
 done
 
 # Check for installed python
-AM_PATH_PYTHON(2.3.4,, :)
+AM_PATH_PYTHON(2.4.0,, :)
 
 ### we need to know the byte order for unicode conversions
 AC_C_BIGENDIAN
@@ -97,6 +97,7 @@ AC_SUBST(LIBPSAPI)
 AC_CHECK_LIB(gdi32, main)
 
 LYX_USE_INCLUDED_BOOST
+LYX_USE_INCLUDED_MYTHES
 
 # Needed for our char_type
 AC_CHECK_SIZEOF(wchar_t)
@@ -129,7 +130,7 @@ for frontend in $FRONTENDS ; do
 	  FRONTEND_INFO="${FRONTEND_INFO}\
   Qt 4 Frontend:\n\
       Qt 4 version:\t\t${QT4_VERSION}\n"
-dnl qt 4 build will fail without moc or uic
+dnl qt 4 build will fail without moc, uic, or bc
 	  if test -z "$MOC4"; then
 	    LYX_ERROR([moc 4 binary not found !])
 	  fi
@@ -139,6 +140,9 @@ dnl qt 4 build will fail without moc or uic
 	  if test -z "$QT4_LIB"; then
 	    LYX_ERROR([qt 4 library not found !])
 	  fi
+	  if test "$bc_found" = "no"; then
+	    LYX_ERROR([bc binary not found !])
+	  fi
       ;;
     *)
 	  LYX_ERROR(Unknown frontend '$frontend');;
@@ -357,6 +361,7 @@ AC_CONFIG_FILES([Makefile \
       development/cygwin/lyxrc.dist \
       development/lyx.spec \
       intl/Makefile \
+      lib/lyx.desktop-temp:lib/lyx.desktop.in
       lib/Makefile \
       lib/doc/Makefile \
       lib/lyx2lyx/lyx2lyx_version.py \