X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=fb1e49ca5345dbec19555a166c1ba9822f16a439;hb=3c2d3caf278bf8b0c708845aec1ec8f00424392e;hp=e245fdea30a72e835160681fabdac2375c9dd6e1;hpb=fde16219ca7860fdfe8adf171d109a7cce61e7b4;p=lyx.git diff --git a/configure.ac b/configure.ac index e245fdea30..fb1e49ca53 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ 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, ["2016-02-12"]) AC_PREREQ(2.60) AC_CONFIG_SRCDIR(src/main.cpp) AC_CONFIG_HEADERS([config.h]) @@ -13,6 +13,7 @@ AC_CONFIG_AUX_DIR(config) # 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 @@ -27,12 +28,19 @@ fi 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],)) +# Automake is pulling the historical V7 format. This tar format supports +# file names only up to 99 characters. tar-ustar selects the ustar format defined +# by POSIX 1003.1-1988. This format is believed to be old enough to be portable. +AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8 tar-ustar] 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)]), @@ -51,18 +59,34 @@ AM_CONDITIONAL(MONOLITHIC_INSETS, test "x$enable_monolithic_insets" = "xyes") 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 @@ -82,8 +106,9 @@ test ! x"$lyx_cppflags" = x && CPPFLAGS="$lyx_cppflags $CPPFLAGS" ### 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]) @@ -98,6 +123,9 @@ 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) @@ -124,14 +152,14 @@ AC_CHECK_HEADERS(magic.h, 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 @@ -145,13 +173,13 @@ if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then fi ### Setup po directory -AM_PO_SUBDIRS AM_NLS if test $USE_NLS = "yes" ; then AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if translation of program messages to the user's native language is requested.])dnl' fi +AM_PO_SUBDIRS # some standard header files AC_HEADER_MAJOR @@ -188,7 +216,7 @@ save_LIBS="$LIBS" LIBS= AC_CHECK_FUNCS(fcntl, [AC_SEARCH_LIBS([gethostbyname], [nsl]) - AC_SEARCH_LIBS([socket], [socket], [], + AC_SEARCH_LIBS([socket], [socket network], [], [AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket -lnsl $LIBS"], [], [-lnsl])])], [lyx_client_subdir=false]) @@ -210,22 +238,21 @@ real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"` 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) @@ -252,6 +279,10 @@ AH_BOTTOM([ /************************************************************ ** You should not need to change anything beyond this point */ +#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) +#define LYX_USE_CXX11 +#endif + #ifndef HAVE_STRERROR #if defined(__cplusplus) extern "C" @@ -275,13 +306,7 @@ char * strerror(int n); #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 @@ -290,6 +315,12 @@ char * strerror(int n); # 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 @@ -321,7 +352,12 @@ AC_DEFINE_UNQUOTED([LYX_RELEASE_PATCH],$lyx_patch,[Patch version number]) AC_CONFIG_FILES([Makefile \ lyx.1:lyx.1in \ - boost/Makefile \ + 3rdparty/Makefile \ + 3rdparty/boost/Makefile \ + 3rdparty/hunspell/Makefile \ + 3rdparty/libiconv/Makefile \ + 3rdparty/zlib/Makefile \ + autotests/Makefile \ config/Makefile \ development/Makefile \ development/MacOSX/Makefile \