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-07-13"])
+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 subdir-objects])
+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
# Allow to build some parts of the code as one big chunk
-m4_define([ALLPARTS],[boost,client,insets,mathed,core,tex2lyx,frontend_qt4])
+m4_define([ALLPARTS],[boost,client,insets,mathed,core,tex2lyx,frontend_qt])
AC_ARG_ENABLE(monolithic-build,
AC_HELP_STRING([--enable-monolithic-build@<:@=LIST@:>@],
[Use monolithic build for modules in LIST (default: ALLPARTS)]),
AM_CONDITIONAL(MONOLITHIC_MATHED, test "x$enable_monolithic_mathed" = "xyes")
AM_CONDITIONAL(MONOLITHIC_CORE, test "x$enable_monolithic_core" = "xyes")
AM_CONDITIONAL(MONOLITHIC_TEX2LYX, test "x$enable_monolithic_tex2lyx" = "xyes")
-AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT4, test "x$enable_monolithic_frontend_qt4" = "xyes")
+AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT, test "x$enable_monolithic_frontend_qt" = "xyes")
### Set the execute permissions of the various scripts correctly
for file in config/install-sh ; do
AM_PATH_PYTHON(2.4.0,, :)
AC_PROG_RANLIB
-### we need to know the byte order for unicode conversions
-AC_C_BIGENDIAN
-
### Check for a C++ compiler
LYX_PROG_CXX
+AC_LANG(C++)
### Objective-C compiler
AC_PROG_OBJC
LYX_USE_INCLUDED_BOOST
LYX_USE_INCLUDED_MYTHES
+### we need to know the byte order for unicode conversions
+AC_C_BIGENDIAN
+
+# Nice to have when an assertion triggers
+LYX_CHECK_CALLSTACK_PRINTING
+
# Needed for our char_type
AC_CHECK_SIZEOF(wchar_t)
is correctly installed on your system.
Falling back to builtin file format detection.])])
-### setup the qt4 frontend.
+### setup the qt frontend.
dnl The code below is not in a macro, because this would cause big
-dnl problems with the AC_REQUIRE contained in QT4_DO_IT_ALL.
-QT4_DO_IT_ALL([4.5.0])
+dnl problems with the AC_REQUIRE contained in QT_DO_IT_ALL.
+QT_DO_IT_ALL([4.5.0])
AC_SUBST([FRONTENDS_SUBDIRS], [qt4])
FRONTEND_INFO="${FRONTEND_INFO}\
- Qt 4 Frontend:\n\
- Qt 4 version:\t\t${QT4_VERSION}\n"
+ Qt Frontend:\n\
+ Qt version:\t\t${QTLIB_VERSION}\n"
# fix the value of the prefixes.
test "x$prefix" = xNONE && prefix=$default_prefix
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 putenv setenv strerror unsetenv)
+AC_CHECK_FUNCS(chmod close _close fork getpid _getpid lockf lstat mkfifo open _open pclose _pclose popen _popen readlink putenv setenv strerror unsetenv)
# Check the form of mkdir()
AC_FUNC_MKDIR
AC_FUNC_SELECT_ARGTYPES
LYX_CHECK_SPELL_ENGINES
lyx_client_subdir=true
-AC_LANG_PUSH(C)
+dnl AC_LANG_PUSH(C)
dnl LIBS already contains some X extra libs that may interfere.
save_LIBS="$LIBS"
LIBS=
AC_SUBST(SOCKET_LIBS,$LIBS)
LIBS="$save_LIBS"
AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, $lyx_client_subdir)
-AC_LANG_POP(C)
+dnl AC_LANG_POP(C)
lyx_win_res=false;
case ${host} in
#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
+// clang defines __GNUC__ but libc++ does not have tr1
#ifndef LYX_USE_TR1
-# if __GNUC__ == 4
+# if __GNUC__ == 4 && !defined(USE_LLVM_LIBCPP)
# define LYX_USE_TR1
# endif
#endif
# define BOOST_POSIX_PATH 1
#endif
-/*
- * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t
- * support compiled in:
- * http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#3_9
- * And we are not interested at all what libc
- * does: What we need is a 32bit wide wchar_t, and a libstdc++ that
- * has the needed wchar_t support and uses UCS4. Whether it
- * implements this with the help of libc, or whether it has own code
- * does not matter for us, because we do not use libc directly (Georg)
-*/
-#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
+#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