X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=fb1e49ca5345dbec19555a166c1ba9822f16a439;hb=f16b2cab75752e7b0fbec5520e231b068eb29072;hp=0c4d833c765e78ed7819a2837dffae28c77dd872;hpb=1d08d5232d0ab6093267678a1f3cfae23913c9b5;p=lyx.git diff --git a/configure.ac b/configure.ac index 0c4d833c76..fb1e49ca53 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,9 @@ 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, ["2011-04-29"]) +AC_SUBST(LYX_DATE, ["2016-02-12"]) AC_PREREQ(2.60) AC_CONFIG_SRCDIR(src/main.cpp) AC_CONFIG_HEADERS([config.h]) @@ -12,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 @@ -26,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)]), @@ -50,24 +59,35 @@ 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 -# Check for installed python -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 -### we need to know the byte order for unicode conversions -AC_C_BIGENDIAN - -### check which frontend we want to use -LYX_USE_FRONTENDS +# 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 AC_PROG_OBJC @@ -86,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]) @@ -99,13 +120,19 @@ AC_CHECK_LIB(gdi32, main) 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) ### We need iconv for unicode support (Qt4 frontend requires it too) AM_ICONV if test "$am_cv_func_iconv" = no; then - LYX_ERROR([Cannot find required library iconv]) + AC_MSG_ERROR([cannot find required library iconv.]) else LIBS="$LIBS $LIBICONV" fi @@ -118,88 +145,64 @@ AC_CHECK_HEADERS(zlib.h, ### check for file magic support (currently optional) AC_CHECK_HEADERS(magic.h, [AC_CHECK_LIB(magic, magic_open, [LIBS="$LIBS -lmagic"], - LYX_WARNING([Cannot find limagic. Please check that the libmagic library + LYX_WARNING([cannot find libmagic. Please check that the libmagic library is correctly installed on your system. Falling back to builtin file format detection.]))], - [LYX_WARNING([Cannot find magic.h. Please check that the libmagic library + [LYX_WARNING([cannot find magic.h. Please check that the libmagic library is correctly installed on your system. Falling back to builtin file format detection.])]) - -### check which frontend we want to use - +### 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. -for frontend in $FRONTENDS ; do - case "$frontend" in - qt4) - QT4_DO_IT_ALL([4.5.0]) - FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt4\$(EXEEXT)" - FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt4" - RPM_FRONTEND="qt4" - FRONTEND_INFO="${FRONTEND_INFO}\ - Qt 4 Frontend:\n\ - Qt 4 version:\t\t${QT4_VERSION}\n" -dnl qt 4 build will fail without moc, uic, or bc - if test -z "$MOC4"; then - LYX_ERROR([moc 4 binary not found !]) - fi - if test -z "$UIC4"; then - LYX_ERROR([uic 4 binary not found !]) - fi - if test -z "$QT4_LIB"; then - LYX_ERROR([qt 4 library not found !]) - fi - if test "$bc_found" = "no"; then - LYX_ERROR([bc binary not found !]) - fi - ;; - *) - LYX_ERROR(Unknown frontend '$frontend');; - esac -done +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 Frontend:\n\ + Qt version:\t ${QTLIB_VERSION}\n" # fix the value of the prefixes. test "x$prefix" = xNONE && prefix=$default_prefix test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then - LYX_WARNING([The installation prefix \"${prefix}\" contains a space, which + LYX_WARNING([the installation prefix \"${prefix}\" contains a space, which causes problems with the Makefiles. The installation will be done in directory \"`pwd`/installprefix\" instead. Please move its contents to the right place after installation.]) prefix=`pwd`/installprefix fi -### Setup GNU gettext -dnl GNU gettext is written in C -AC_LANG_PUSH(C) -dnl Dirty trick ahead: disable macro AC_GNU_SOURCE because it triggers a bug with autoconf 2.62. -dnl this can be removed if gettext is been updated to avoid that. -m4_undefine([AC_GNU_SOURCE]) -m4_defun([AC_GNU_SOURCE],[]) -AM_GNU_GETTEXT([no-libtool]) -AM_GNU_GETTEXT_VERSION([0.16.1]) -AC_LANG_POP(C) +### Setup po directory +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 AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h locale.h utime.h sys/utime.h) -# some standard structures -AC_HEADER_STAT -AC_HEADER_TIME - # some standard types AC_CHECK_TYPE(mode_t,[AC_DEFINE(HAVE_MODE_T, 1, [Define this to 1 if your compiler supports the mode_t type.])]) AC_TYPE_OFF_T AC_TYPE_PID_T -AC_TYPE_SIGNAL AC_TYPE_SIZE_T AC_TYPE_UID_T +# Taken from gettext +AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t], + [AC_TRY_COMPILE([#include + wchar_t foo = (wchar_t)'\0';], , + [gt_cv_c_wchar_t=yes], [gt_cv_c_wchar_t=no])]) +if test $gt_cv_c_wchar_t = yes; then + AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.]) +fi 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 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 @@ -207,20 +210,20 @@ 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_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]) 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 @@ -235,23 +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(RPM_FRONTEND) AC_SUBST(AM_CPPFLAGS) AC_SUBST(AM_CXXFLAGS) -AC_SUBST(AM_CFLAGS) AC_SUBST(AM_LDFLAGS) AC_SUBST(real_pkgdatadir) @@ -278,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" @@ -301,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 @@ -316,17 +315,13 @@ char * strerror(int n); # 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 @@ -357,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 \ @@ -367,7 +367,6 @@ AC_CONFIG_FILES([Makefile \ development/cygwin/Makefile \ development/cygwin/lyxrc.dist \ development/lyx.spec \ - intl/Makefile \ lib/lyx.desktop-temp:lib/lyx.desktop.in lib/Makefile \ lib/doc/Makefile \ @@ -395,5 +394,11 @@ echo printf "$VERSION_INFO" echo -# Display a final warning if there has been a LYX_ERROR -LYX_CHECK_ERRORS +# Display a final warning if there has been a LYX_WARNING +LYX_CHECK_WARNINGS + +cat <