dnl Process with autoconf to generate configure script -*- sh -*-
-AC_INIT(LyX,2.1.0dev,[lyx-devel@lists.lyx.org],[lyx])
+AC_INIT(LyX,2.2.0dev,[lyx-devel@lists.lyx.org],[lyx])
AC_PRESERVE_HELP_ORDER
# Use ISO format only. The frontend needs to parse this
-AC_SUBST(LYX_DATE, ["2013-11-10"])
+AC_SUBST(LYX_DATE, ["2014-04-14"])
AC_PREREQ(2.60)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE
save_PACKAGE=$PACKAGE
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8])
+dnl The test for _AM_PROG_CC_C_O intends to test for automake 1.14 or newer,
+dnl which are the versions where subdir-objects can beused.
+dnl see: https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg181023.html
+m4_define([LYX_OBJECTS_LAYOUT], m4_ifdef([_AM_PROG_CC_C_O],[subdir-objects],))
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8] LYX_OBJECTS_LAYOUT)
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
PACKAGE=$save_PACKAGE
#define BOOST_DISABLE_THREADS 1
#define BOOST_NO_WREGEX 1
#define BOOST_NO_WSTRING 1
+#define BOOST_SIGNALS_NO_DEPRECATION_WARNING 1
// TR1 regex not supported in GCC <= 4.5
#ifndef LYX_USE_TR1
# define BOOST_POSIX_PATH 1
#endif
+#ifdef __sparc__
+# ifndef __BIG_ENDIAN__
+# define __BIG_ENDIAN__ 1
+# endif
+#endif
+
#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4
# define USE_WCHAR_T
#endif