X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=acfa66338eff9d3da42f789ba704311c9ce4a6d7;hb=366b21d4d30e2d24fab763ff8bbd004218e98e33;hp=b677521dddd43ead5eab7887eb9e1acab0196cb1;hpb=bc72d3fc58ebdaa458367f7c6abb60be1ef1ddba;p=lyx.git diff --git a/configure.ac b/configure.ac index b677521ddd..acfa66338e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,8 @@ -vdnl Process with autoconf to generate configure script -*- sh -*- +dnl Process with autoconf to generate configure script -*- sh -*- -AC_INIT(LyX,1.6.0svn,[lyx-devel@lists.lyx.org],[lyx]) -AC_SUBST(LYX_DATE, ["Fri, Jul 11, 2008"]) +AC_INIT(LyX,2.1.0svn,[lyx-devel@lists.lyx.org],[lyx]) +# Use ISO format only. The frontend needs to parse this +AC_SUBST(LYX_DATE, ["2011-04-29"]) AC_PREREQ(2.52) AC_CONFIG_SRCDIR(src/main.cpp) AC_CONFIG_HEADERS([config.h]) @@ -18,41 +19,46 @@ 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]) +AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8]) +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]) +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_QT4, test "x$enable_monolithic_frontend_qt4" = "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 -### Check for programs -AC_PROG_MAKE_SET -AC_PROG_INSTALL - # 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 -AC_GNU_SOURCE - -### check for special systems -AC_ISC_POSIX -AC_AIX +AM_PATH_PYTHON(2.4.0,, :) ### we need to know the byte order for unicode conversions AC_C_BIGENDIAN @@ -62,40 +68,11 @@ LYX_USE_FRONTENDS ### Check for a C++ compiler LYX_PROG_CXX -### Some checks on what the C++ compiler can(not) do -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)) @@ -115,45 +92,16 @@ LYX_ADD_INC_DIR(CPPFLAGS,$dir/include) ### 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) -### 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],[]) - -AC_DISABLE_SHARED -#AC_DISABLE_STATIC -AC_LIBTOOL_WIN32_DLL -#AM_PROG_LIBTOOL -LYX_PROG_LIBTOOL - ### We need iconv for unicode support (Qt4 frontend requires it too) AM_ICONV if test "$am_cv_func_iconv" = no; then @@ -167,23 +115,21 @@ 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 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 + 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.])]) -### 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 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. +dnl problems with the AC_REQUIRE contained in QT4_DO_IT_ALL. for frontend in $FRONTENDS ; do case "$frontend" in qt4) @@ -194,7 +140,7 @@ for frontend in $FRONTENDS ; do 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 +dnl qt 4 build will fail without moc, uic, or bc if test -z "$MOC4"; then LYX_ERROR([moc 4 binary not found !]) fi @@ -204,6 +150,9 @@ dnl qt 4 build will fail without moc or uic 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');; @@ -224,14 +173,17 @@ fi ### Setup GNU gettext dnl GNU gettext is written in C AC_LANG_PUSH(C) -AM_GNU_GETTEXT +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) # 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) +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 @@ -245,20 +197,12 @@ AC_TYPE_SIGNAL AC_TYPE_SIZE_T AC_TYPE_UID_T -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 lstat mkfifo open _open pclose _pclose popen _popen readlink strerror) # 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 @@ -285,7 +229,6 @@ 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}\"\`"` @@ -293,7 +236,7 @@ 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\ + 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\ @@ -313,6 +256,7 @@ AC_SUBST(AM_CPPFLAGS) AC_SUBST(AM_CXXFLAGS) AC_SUBST(AM_CFLAGS) AC_SUBST(AM_LDFLAGS) +AC_SUBST(real_pkgdatadir) ## Some config.h stuff @@ -361,16 +305,20 @@ char * strerror(int n); #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 + #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 -#endif - /* * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t * support compiled in: @@ -388,54 +336,6 @@ char * strerror(int n); #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}) @@ -458,7 +358,8 @@ 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 +AC_CONFIG_FILES([Makefile \ + lyx.1:lyx.1in \ boost/Makefile \ config/Makefile \ development/Makefile \ @@ -466,8 +367,11 @@ AC_CONFIG_FILES([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 \ @@ -477,8 +381,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 @@ -487,30 +393,6 @@ 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"