X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=83f4c99da2595ab2bd535761203c163afaf8a99c;hb=f6cd5ab863cc9a460efb7a1dc7eb48b87d867655;hp=e8dfe8face8e83c410a3cc343530a6859fc3f318;hpb=d23a75a3dc70e5c22ff624d02acaf1ac499b02d8;p=lyx.git

diff --git a/configure.ac b/configure.ac
index e8dfe8face..83f4c99da2 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.0dev,[lyx-devel@lists.lyx.org],[lyx])
 # Use ISO format only. The frontend needs to parse this
-AC_SUBST(LYX_DATE, ["2009-03-25"])
+AC_SUBST(LYX_DATE, ["2011-04-29"])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])
@@ -27,6 +27,7 @@ AM_MAINTAINER_MODE
 
 save_PACKAGE=$PACKAGE
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8])
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 PACKAGE=$save_PACKAGE
 
 # Allow to build some parts of the code as one big chunk
@@ -57,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
@@ -96,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)
@@ -113,6 +115,16 @@ AC_CHECK_HEADERS(zlib.h,
  [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
 
@@ -128,7 +140,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
@@ -138,6 +150,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');;
@@ -168,7 +183,7 @@ AC_LANG_POP(C)
 
 # some standard header files
 AC_HEADER_MAJOR
-AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h locale.h NewAPIs.h utime.h sys/utime.h)
+AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h locale.h utime.h sys/utime.h)
 
 # some standard structures
 AC_HEADER_STAT
@@ -182,6 +197,8 @@ AC_TYPE_SIGNAL
 AC_TYPE_SIZE_T
 AC_TYPE_UID_T
 
+LYX_CHECK_DEF(PATH_MAX, limits.h, [int n = PATH_MAX;])
+
 AC_CHECK_FUNCS(chmod close _close fork getpid _getpid lstat mkfifo open _open pclose _pclose popen _popen readlink strerror)
 # Check the form of mkdir()
 AC_FUNC_MKDIR
@@ -219,10 +236,7 @@ real_pkgdatadir=`eval "echo \`eval \"echo \\\`eval \\\"echo ${pkgdatadir}\\\"\\\
 real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"`
 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\
+  Special build flags:         ${lyx_flags}\n\
   C++ Compiler:                 ${CXX} ${CXX_VERSION}\n\
   C++ Compiler LyX flags:       ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\
   C++ Compiler flags:           ${CPPFLAGS} ${CXXFLAGS}\n\
@@ -288,6 +302,13 @@ char * strerror(int n);
 #define BOOST_NO_WREGEX 1
 #define BOOST_NO_WSTRING 1
 
+// TR1 regex not supported in GCC <= 4.5
+#ifndef LYX_USE_TR1
+#  if __GNUC__ == 4 
+#    define LYX_USE_TR1
+#  endif
+#endif
+
 #ifdef __CYGWIN__
 #  define NOMINMAX
 #  define BOOST_POSIX 1
@@ -295,10 +316,6 @@ char * strerror(int n);
 #  define BOOST_POSIX_PATH 1
 #endif
 
-#if defined(HAVE_NEWAPIS_H)
-#  define WANT_GETFILEATTRIBUTESEX_WRAPPER 1
-#endif
-
 /*
  * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t
  * support compiled in:
@@ -351,6 +368,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 \