X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=864763c9e3cfbc791eeecd9295abd5bf70c0fe94;hb=bdf4a016f752cda0b11625764de0dcaf8418793f;hp=76c87bdd657101493ad05838f66c008d2057d7a0;hpb=cc951ca5b4d7be7f7628e02b982050d95ce64fa0;p=lyx.git diff --git a/configure.ac b/configure.ac index 76c87bdd65..864763c9e3 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-02-07"]) 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-lzma no-define 1.8]) +AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) PACKAGE=$save_PACKAGE @@ -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) @@ -183,6 +184,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 @@ -220,7 +223,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\ @@ -289,6 +292,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