X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=cc7b1128c56e59a50e3633abaacecc56763cf599;hb=fc4324b07c7d0b69048e6b1f0f82af4e38690983;hp=0cc3e61d4a0a8e476ec0e1478d00d406c5879435;hpb=9b4576b50b704d501a2d65ad347e9bbbed1a0d00;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 0cc3e61d4a..cc7b1128c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process with autoconf to generate configure script   -*- sh -*-
 
 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, ["2010-03-15"])
+AC_SUBST(LYX_DATE, ["2011-01-10"])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])
@@ -26,7 +26,7 @@ fi
 AM_MAINTAINER_MODE
 
 save_PACKAGE=$PACKAGE
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define subdir-objects 1.8])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 PACKAGE=$save_PACKAGE
 
@@ -67,7 +67,6 @@ AC_C_BIGENDIAN
 LYX_USE_FRONTENDS
 
 ### Check for a C++ compiler
-AM_PROG_CC_C_O
 LYX_PROG_CXX
 
 ### Objective-C compiler
@@ -184,6 +183,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
@@ -221,7 +222,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\
+  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\
@@ -290,6 +291,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