X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=d6cae08311dfeb0e76d4fee55010fd92f9bb8298;hb=e4842c77d6e210919d00c103e1d33f973ac96033;hp=1ded61883d4fcdbced95eb834162594680217666;hpb=5733c3a92ff27ce3cbb0ff020b52399f5b9255c1;p=lyx.git diff --git a/configure.ac b/configure.ac index 1ded61883d..d6cae08311 100644 --- a/configure.ac +++ b/configure.ac @@ -1,16 +1,20 @@ -vdnl Process with autoconf to generate configure script -*- sh -*- +dnl Process with autoconf to generate configure script -*- sh -*- -AC_INIT(LyX,1.6.0beta3,[lyx-devel@lists.lyx.org],[lyx]) -AC_SUBST(LYX_DATE, ["Tue, Jun 3, 2008"]) -AC_PREREQ(2.52) +AC_INIT(LyX,2.2.4dev,[lyx-devel@lists.lyx.org],[lyx]) +AC_PRESERVE_HELP_ORDER + +# Use ISO format only. The frontend needs to parse this +AC_SUBST(LYX_DATE, ["2017-05-15"]) +AC_PREREQ(2.60) AC_CONFIG_SRCDIR(src/main.cpp) -AC_CONFIG_HEADERS([src/config.h]) +AC_CONFIG_HEADERS([config.h]) 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 @@ -18,97 +22,81 @@ LYX_USE_PACKAGING # AM_INIT_AUTOMAKE above because we alter $PACKAGE in LYX_USE_PACKAGING. AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -dnl default maintainer mode to true for development versions +dnl Default maintainer mode to true for development versions if test "${enable_maintainer_mode+set}" != set; then enable_maintainer_mode=$lyx_devel_version fi AM_MAINTAINER_MODE save_PACKAGE=$PACKAGE -AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.5]) +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_qt]) +AC_ARG_ENABLE(monolithic-build, + AC_HELP_STRING([--enable-monolithic-build@<:@=LIST@:>@], + [Use monolithic build for modules in LIST (default: ALLPARTS)]), + [test "$enable_monolithic_build" = yes && enable_monolithic_build="ALLPARTS" + test "$enable_monolithic_build" = no && enable_monolithic_build= + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=" ," + for i in $enable_monolithic_build ; do + eval "enable_monolithic_$i=yes" + done + IFS="$ac_save_ifs"], + [enable_monolithic_build=]) + +AM_CONDITIONAL(MONOLITHIC_BOOST, test "x$enable_monolithic_boost" = "xyes") +AM_CONDITIONAL(MONOLITHIC_CLIENT, test "x$enable_monolithic_client" = "xyes") +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_QT, test "x$enable_monolithic_frontend_qt" = "xyes") + ### Set the execute permissions of the various scripts correctly -for file in config/install-sh config/mkinstalldirs ; do +for file in config/install-sh ; do chmod 755 ${srcdir}/${file} done -### Provide a dummy POTFILES.in in po in order to mark it as a PO directory -test -f ${srcdir}/po/POTFILES.in || touch ${srcdir}/po/POTFILES.in - -### Check for programs -AC_PROG_MAKE_SET -AC_PROG_INSTALL - -AC_PROG_AWK -test "$AWK" = gawk && AWK="gawk --posix" - -#AC_PROG_RANLIB -AC_CHECK_PROG(KPSEWHICH, kpsewhich, kpsewhich, :) -if test "x$KPSEWHICH" = xkpsewhich ; then - AC_DEFINE(HAVE_KPSEWHICH, 1, - [Define this if you have the kpsewhich program working on your system.]) -fi -AC_CHECK_PROGS(M4, gm4 gnum4 m4, m4) - -# Check for installed python -AM_PATH_PYTHON(2.3,, :) - -# Work around a problem in automake 1.4: when invoking install-strip, -# INSTALL_PROGRAM is changed to 'install -s', and since -# INSTALL_SCRIPT==INSTALL_PROGRAM, we get errors with fileutils-4.0 -# which returns an error condition when stripping fails. -INSTALL_SCRIPT='${INSTALL}' - -### we will also need a C compiler to compile GNU gettext -AC_PROG_CC - -### check for special systems -AC_ISC_POSIX -AC_AIX - -### we need to know the byte order for unicode conversions -AC_C_BIGENDIAN +# Find a suitable python interpreter +LYX_PATH_PYTHON23([2.7.0], [3.3.0]) +# do the usual python setup stuff +AM_PATH_PYTHON -### 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 +dnl Recent debian/ubuntu (at least) have built 'ar' so that deterministic mode is the default. +dnl This means that it does not make sense to use the 'u' flag (default ARFLAGS is 'cru'). +AC_SUBST([ARFLAGS], [cr]) ### 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 -### Some checks on what the C++ compiler can(not) do +if ! test "$lyx_has_CXXFLAGS" = yes; then + unset CXXFLAGS +fi AC_LANG(C++) -dnl we do not need that currently (and probably all our supported -dnl compiler allow that) -dnl LYX_CXX_PARTIAL -dnl LYX_CXX_EXPLICIT -dnl LYX_CXX_GLOBAL_CSTD -dnl LYX_STD_COUNT -dnl we disable rtti for now -dnl LYX_CXX_RTTI -dnl AC_CHECK_HEADERS(ostream istream sstream locale limits ios) -dnl LYX_CXX_STL_MODERN_STREAMS ### Objective-C compiler AC_PROG_OBJC _AM_DEPENDENCIES([OBJC]) -### and now some special lyx flags. -AC_ARG_ENABLE(assertions, - AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),, - [if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then - enable_assertions=yes; - else - enable_assertions=no; - fi;]) -if test "x$enable_assertions" = xyes ; then - lyx_flags="assertions $lyx_flags" - AC_DEFINE(ENABLE_ASSERTIONS,1, - [Define if you want assertions to be enabled in the code]) -fi - -### Library Files -dnl AC_CHECK_LIB(m, sin) - ### Add extra directories to check for libraries. LYX_WITH_DIR([extra-lib],[extra library directory],extra_lib, NONE) LYX_LOOP_DIR($lyx_cv_extra_lib,LYX_ADD_LIB_DIR(lyx_ldflags,$dir)) @@ -122,55 +110,33 @@ 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]) AC_SUBST(LIBSHLWAPI) +AC_CHECK_LIB(psapi, main, [LIBPSAPI=-lpsapi]) +AC_SUBST(LIBPSAPI) AC_CHECK_LIB(gdi32, main) -AC_ARG_WITH(aiksaurus, - [ --without-aiksaurus do not use the Aiksaurus library], - [lyx_use_aiksaurus=$withval]) -if test x$lyx_use_aiksaurus != xno; then -AC_CHECK_LIB(Aiksaurus, main, - [AC_DEFINE(HAVE_LIBAIKSAURUS,1,[Define this if you have the AikSaurus library]) - AIKSAURUS_LIBS="-lAiksaurus" - lyx_flags="aiksaurus $lyx_flags" - ]) -AC_CHECK_HEADER(Aiksaurus.h,[ - ac_cv_header_aiksaurus_h=yes - lyx_cv_aiksaurus_h_location=""]) -AC_CHECK_HEADER(Aiksaurus/Aiksaurus.h,[ - ac_cv_header_aiksaurus_h=yes - lyx_cv_aiksaurus_h_location=""]) -AC_DEFINE_UNQUOTED(AIKSAURUS_H_LOCATION,$lyx_cv_aiksaurus_h_location,[Location of Aiksaurus.h]) -fi -AC_SUBST(AIKSAURUS_LIBS) - LYX_USE_INCLUDED_BOOST +LYX_USE_INCLUDED_MYTHES -# Needed for our char_type -AC_CHECK_SIZEOF(wchar_t) +### we need to know the byte order for unicode conversions +AC_C_BIGENDIAN -### Setup libtool -dnl Dirty trick ahead: disable libtool checking for a fortran compiler -dnl see http://permalink.gmane.org/gmane.comp.gnu.libtool.general/6699 -dnl Note that this will reportedly not be needed with libtool 2.0 -m4_undefine([AC_PROG_F77]) -m4_defun([AC_PROG_F77],[]) +# Nice to have when an assertion triggers +LYX_CHECK_CALLSTACK_PRINTING -AC_DISABLE_SHARED -#AC_DISABLE_STATIC -AC_LIBTOOL_WIN32_DLL -#AM_PROG_LIBTOOL -LYX_PROG_LIBTOOL +# 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 @@ -180,151 +146,120 @@ AC_CHECK_HEADERS(zlib.h, [AC_CHECK_LIB(z, gzopen, [LIBS="$LIBS -lz"], LYX_LIB_ERROR(libz,zlib))], [LYX_LIB_ERROR(zlib.h,zlib)]) - -### Check for X libraries -AC_PATH_XTRA -case $have_x in - yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" - CPPFLAGS="$CPPFLAGS $X_CFLAGS";; - no) LYX_ERROR(dnl -[Cannot find X window libraries and/or headers. Check your installation. - If you use a Linux system, check that you have installed - the development tools.]);; - disable) ;; -esac - -### check which frontend we want to use - +### 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 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 + is correctly installed on your system. + Falling back to builtin file format detection.])]) + +### 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 QT_DO_IT_ALL. -for frontend in $FRONTENDS ; do - case "$frontend" in - qt4) - QT4_DO_IT_ALL - 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 or uic - 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 - ;; - *) - LYX_ERROR(Unknown frontend '$frontend');; - esac -done +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) -AM_GNU_GETTEXT -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_DIRENT AC_HEADER_MAJOR -AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h io.h process.h NewAPIs.h utime.h sys/utime.h) - -# some standard structures -AC_HEADER_STAT -AC_HEADER_TIME +AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h locale.h utime.h sys/utime.h) # 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 -AC_CHECK_FUNCS(strerror) -LYX_CHECK_DECL(istreambuf_iterator, iterator) -LYX_CHECK_DECL(mkstemp,[unistd.h stdlib.h]) +LYX_CHECK_DEF(PATH_MAX, limits.h, [int n = PATH_MAX;]) +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 - -dnl This is a slight hack: the tests generated by autoconf 2.52 do not -dnl work correctly because of some conflict with stdlib.h with g++ 2.96 -dnl We aim to remove this eventually, since we should test as much as -dnl possible with the compiler which will use the functions (JMarc) -AC_LANG_PUSH(C) -AC_CHECK_FUNCS(chmod close _close getpid _getpid lstat mkfifo mkstemp mktemp open _open pclose _pclose popen _popen readlink) -AC_LANG_POP(C) +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 *mingw*|*cygwin*) lyx_win_res=true;; + *freebsd*) AC_SEARCH_LIBS(backtrace_symbols, [execinfo]) esac AM_CONDITIONAL(LYX_WIN_RESOURCE, $lyx_win_res) LYX_SET_VERSION_INFO -AC_FUNC_SELECT_ARGTYPES ### Some information on what just happened 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: ${CC} ${CC_VERSION}\n\ - C Compiler LyX flags: ${AM_CPPFLAGS} ${AM_CFLAGS}\n\ - C Compiler flags: ${CPPFLAGS} ${CFLAGS}\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) ## Some config.h stuff @@ -349,6 +284,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" @@ -372,82 +311,28 @@ char * strerror(int n); #define BOOST_DISABLE_THREADS 1 #define BOOST_NO_WREGEX 1 #define BOOST_NO_WSTRING 1 +#define BOOST_SIGNALS_NO_DEPRECATION_WARNING 1 #ifdef __CYGWIN__ +# define NOMINMAX # define BOOST_POSIX 1 # define BOOST_POSIX_API 1 # define BOOST_POSIX_PATH 1 #endif -#if defined(HAVE_NEWAPIS_H) -# define WANT_GETFILEATTRIBUTESEX_WRAPPER 1 +#ifdef __sparc__ +# ifndef __BIG_ENDIAN__ +# define __BIG_ENDIAN__ 1 +# endif #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__) +#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 # define USE_WCHAR_T #endif #endif ]) - -AC_ARG_WITH(qmake, - AC_HELP_STRING([--with-qmake], - [Use qmake instead of automake to generate Makefiles]),, - [with_qmake=no]) - -AC_ARG_ENABLE(monolithic-boost, - AC_HELP_STRING([--enable-monolithic-boost], - [Use monolithic boost compilations]),, - [enable_monolithic_boost=no]) -AM_CONDITIONAL(MONOLITHIC_BOOST, test "$enable_monolithic_boost" = "yes") - -AC_ARG_ENABLE(monolithic-client, - AC_HELP_STRING([--enable-monolithic-client], - [Use monolithic client compilations]),, - [enable_monolithic_client=no]) -AM_CONDITIONAL(MONOLITHIC_CLIENT, test "$enable_monolithic_client" = "yes") - -AC_ARG_ENABLE(monolithic-insets, - AC_HELP_STRING([--enable-monolithic-insets], - [Use monolithic insets compilations]),, - [enable_monolithic_insets=no]) -AM_CONDITIONAL(MONOLITHIC_INSETS, test "$enable_monolithic_insets" = "yes") - -AC_ARG_ENABLE(monolithic-mathed, - AC_HELP_STRING([--enable-monolithic-mathed], - [Use monolithic mathed compilations]),, - [enable_monolithic_mathed=no]) -AM_CONDITIONAL(MONOLITHIC_MATHED, test "$enable_monolithic_mathed" = "yes") - -AC_ARG_ENABLE(monolithic-core, - AC_HELP_STRING([--enable-monolithic-core], - [Use monolithic core files compilations]),, - [enable_monolithic_core=no]) -AM_CONDITIONAL(MONOLITHIC_CORE, test "$enable_monolithic_core" = "yes") - -AC_ARG_ENABLE(monolithic-tex2lyx, - AC_HELP_STRING([--enable-monolithic-tex2lyx], - [Use monolithic tex2lyx compilations]),, - [enable_monolithic_tex2lyx=no]) -AM_CONDITIONAL(MONOLITHIC_TEX2LYX, test "$enable_monolithic_tex2lyx" = "yes") - -AC_ARG_ENABLE(monolithic-frontend-qt4, - AC_HELP_STRING([--enable-monolithic-frontend-qt4], - [Use monolithic compilation of the Qt 4 frontend. Only recommended with > 512 MB of RAM]),, - [enable_monolithic_frontend_qt4=no]) -AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT4, test "$enable_monolithic_frontend_qt4" = "yes") - MSYS_AC_CANONICAL_PATH(lyx_abs_top_srcdir, ${srcdir}) MSYS_AC_CANONICAL_PATH(lyx_abs_installed_localedir, ${real_localedir}) MSYS_AC_CANONICAL_PATH(lyx_abs_installed_datadir, ${real_pkgdatadir}) @@ -463,21 +348,31 @@ AC_DEFINE_UNQUOTED([PROGRAM_SUFFIX], AC_DEFINE_UNQUOTED([LYX_DATE],"$LYX_DATE",[Date of release]) AC_DEFINE_UNQUOTED([VERSION_INFO],"$VERSION_INFO",[Full version info]) +AC_DEFINE_UNQUOTED([LYX_DIR_VER],"$lyx_dir_ver",[Versioned env var for system dir]) +AC_DEFINE_UNQUOTED([LYX_USERDIR_VER],"$lyx_userdir_ver",[Versioned env var for user dir]) AC_DEFINE_UNQUOTED([LYX_MAJOR_VERSION],$lyx_major,[Major version number]) AC_DEFINE_UNQUOTED([LYX_MINOR_VERSION],$lyx_minor,[Minor version number]) AC_DEFINE_UNQUOTED([LYX_RELEASE_LEVEL],$lyx_release,[Release version number]) AC_DEFINE_UNQUOTED([LYX_RELEASE_PATCH],$lyx_patch,[Patch version number]) -AC_CONFIG_FILES([Makefile - boost/Makefile \ +AC_CONFIG_FILES([Makefile \ + lyx.1:lyx.1in \ + 3rdparty/Makefile \ + 3rdparty/boost/Makefile \ + 3rdparty/hunspell/Makefile \ + 3rdparty/libiconv/Makefile \ + 3rdparty/zlib/Makefile \ + autotests/Makefile \ config/Makefile \ development/Makefile \ development/MacOSX/Makefile \ development/MacOSX/Info.plist \ development/MacOSX/lyxrc.dist \ development/MacOSX/spotlight/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 \ lib/lyx2lyx/lyx2lyx_version.py \ @@ -487,8 +382,10 @@ AC_CONFIG_FILES([Makefile sourcedoc/Doxyfile \ sourcedoc/Makefile \ src/client/Makefile \ + src/client/lyxclient.1:src/client/lyxclient.1in \ src/Makefile \ src/tex2lyx/Makefile \ + src/tex2lyx/tex2lyx.1:src/tex2lyx/tex2lyx.1in \ src/support/Makefile \ src/frontends/Makefile \ src/frontends/qt4/Makefile @@ -497,34 +394,16 @@ AC_CONFIG_FILES([Makefile AC_OUTPUT -if test x$with_qmake = xyes ; then - echo "CONFIGURE WITH QMAKE ONLY" - if test x$srcdir = x ; then - echo "ONLY FOR OUT-OF-TREE-BUILDS POSSIBLE" - else - rm boost/Makefile - rm src/client/Makefile - rm src/Makefile - rm src/tex2lyx/Makefile - rm src/support/Makefile - rm src/frontends/Makefile - rm src/frontends/qt4/Makefile - rm -rf boost/.deps - rm -rf src/client/.deps - rm -rf src/.deps - rm -rf src/tex2lyx/.deps - rm -rf src/support/.deps - rm -rf src/frontends/.deps - rm -rf src/frontends/qt4/.deps - ${srcdir}/development/qmake/doit - fi -fi - - # show version information 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 <