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.0dev,[lyx-devel@lists.lyx.org],[lyx])
# Use ISO format only. The frontend needs to parse this
-AC_SUBST(LYX_DATE, ["2011-03-29"])
+AC_SUBST(LYX_DATE, ["2011-04-29"])
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_HEADERS([config.h])
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
[AC_CHECK_LIB(z, gzopen, [LIBS="$LIBS -lz"], LYX_LIB_ERROR(libz,zlib))],
[LYX_LIB_ERROR(zlib.h,zlib)])
+### check for file magic support (currently optional)
+AC_CHECK_HEADERS(magic.h,
+ [AC_CHECK_LIB(magic, magic_open, [LIBS="$LIBS -lmagic"],
+ LYX_WARNING([Cannot find limagic. Please check that the libmagic library
+ is correctly installed on your system.
+ Falling back to builtin file format detection.]))],
+ [LYX_WARNING([Cannot find magic.h. Please check that the libmagic library
+ is correctly installed on your system.
+ Falling back to builtin file format detection.])])
+
### check which frontend we want to use
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
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');;
VERSION_INFO="Configuration\n\
Host type: ${host}\n\
Special build flags: ${lyx_flags}\n\
- C Compiler: ${CC} ${CC_VERSION}\n\
- C Compiler LyX flags: ${AM_CPPFLAGS} ${AM_CFLAGS}\n\
- C Compiler flags: ${CPPFLAGS} ${CFLAGS}\n\
C++ Compiler: ${CXX} ${CXX_VERSION}\n\
C++ Compiler LyX flags: ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\
C++ Compiler flags: ${CPPFLAGS} ${CXXFLAGS}\n\
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 \