dnl Process with autoconf to generate configure script -*- sh -*-
-AC_INIT(LyX,2.1.0,[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, ["2014-04-13"])
+AC_SUBST(LYX_DATE, ["2014-04-14"])
AC_PREREQ(2.60)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_HEADERS([config.h])
# First check the version
LYX_CHECK_VERSION
LYX_VERSION_SUFFIX
+LYX_CHECK_QT5
# Check how the files should be packaged
AC_CANONICAL_TARGET
LYX_USE_PACKAGING
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
# 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
chmod 755 ${srcdir}/${file}
done
-AM_PATH_PYTHON(2.4.0,, :)
+# Find a suitable python interpreter
+LYX_PATH_PYTHON23([2.7.0], [3.3.0])
+# do the usual python setup stuff
+AM_PATH_PYTHON
+
+# Tools for creating libraries (note that we do not use libtool)
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) dnl AM_PROG_AR requires automake 1.12
AC_PROG_RANLIB
### Check for a C++ compiler
+dnl We have to do weird tricks so that autoconf does not touch CXXFLAGS even
+dnl if it is not set. We do not use autoconf defaults.
+lyx_has_CXXFLAGS=${CXXFLAGS+yes}
+if ! test "$lyx_has_CXXFLAGS" = yes; then
+ dnl set to a dummy value so that AC_PROG_CXX does not try to set CXXFLAGS
+ CXXFLAGS=" "
+fi
LYX_PROG_CXX
+if ! test "$lyx_has_CXXFLAGS" = yes; then
+ unset CXXFLAGS
+fi
AC_LANG(C++)
### Objective-C compiler
### Add both includes and libraries
LYX_WITH_DIR([extra-prefix],[extra lib+include directory],extra_prefix, NONE, ${prefix})
LYX_LOOP_DIR($lyx_cv_extra_prefix,[
-LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
- LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)])
+ LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
+ LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)
+])
### These are needed in windows
AC_CHECK_LIB(shlwapi, main, [LIBSHLWAPI=-lshlwapi])
### 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 ${QTLIB_VERSION}\n"
# fix the value of the prefixes.
test "x$prefix" = xNONE && prefix=$default_prefix
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: ${CXX} ${CXX_VERSION}\n\
- C++ Compiler LyX flags: ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\
- C++ Compiler flags: ${CPPFLAGS} ${CXXFLAGS}\n\
- Linker flags: ${AM_LDFLAGS}\n\
- Linker user flags: ${LDFLAGS}\n\
+ Host type: ${host}\n\
+ Special build flags: ${lyx_flags}\n\
+ C++ Compiler: ${CXX} ${CXX_VERSION}\n\
+ C++ Compiler flags: ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\
+ C++ Compiler user flags: ${CPPFLAGS} ${CXXFLAGS}\n\
+ Linker flags: ${AM_LDFLAGS}\n\
+ Linker user flags: ${LDFLAGS}\n\
${FRONTEND_INFO}\
- Packaging: ${lyx_use_packaging}\n\
- LyX binary dir: ${real_bindir}\n\
- LyX files dir: ${real_pkgdatadir}\n"
+ Packaging: ${lyx_use_packaging}\n\
+ LyX binary dir: ${real_bindir}\n\
+ LyX files dir: ${real_pkgdatadir}\n"
AC_SUBST(VERSION_INFO)
AC_SUBST(AM_CPPFLAGS)
AC_SUBST(AM_CXXFLAGS)
-AC_SUBST(AM_CFLAGS)
AC_SUBST(AM_LDFLAGS)
AC_SUBST(real_pkgdatadir)
#define BOOST_DISABLE_THREADS 1
#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
+#define BOOST_SIGNALS_NO_DEPRECATION_WARNING 1
#ifdef __CYGWIN__
# define NOMINMAX
# 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
projects / lyx.git / blobdiff