X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=ed12f3d630566c6ee61bba20ff055665530f5f04;hb=488b9ae3a20395e66411329c4a5e262d30e0c771;hp=8793b3d3e5638a2300659feddf2841c72e8963ba;hpb=626a5b5f9681d11213ec035d1a0e9f6a1a715a1e;p=lyx.git diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index 8793b3d3e5..ed12f3d630 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -5,20 +5,38 @@ dnl Allan Rae (rae@lyx.org) dnl Usage LYX_CHECK_VERSION Displays version of LyX being built and -dnl sets variables "lyx_devel_version" and "lyx_prerelease" +dnl sets variable "build_type" AC_DEFUN([LYX_CHECK_VERSION],[ echo "configuring LyX version" AC_PACKAGE_VERSION lyx_devel_version=no lyx_prerelease=no -case AC_PACKAGE_VERSION in - *svn*) lyx_devel_version=yes - AC_DEFINE(DEVEL_VERSION, 1, [Define if you are building a development version of LyX]) - LYX_DATE="not released yet" - echo "WARNING: This is a development version. Expect bugs.";; - *pre*|*alpha*|*beta*|*rc*) lyx_prerelease=yes - echo "WARNING: This is a prerelease. Be careful and backup your documents.";; +AC_MSG_CHECKING([for build type]) +AC_ARG_ENABLE(build-type, + AC_HELP_STRING([--enable-build-type=TYPE],[set build setting according to TYPE=rel(ease), pre(release), dev(elopment), prof(iling), gprof]), + [case $enableval in + dev*) build_type=development;; + pre*) build_type=prerelease;; + prof*) build_type=profiling;; + gprof*) build_type=gprof;; + rel*) build_type=release;; + *) AC_ERROR([Bad build type specification \"$enableval\". Please use one of rel(ease), pre(release), dev(elopment), prof(iling), or gprof]);; + esac], + [case AC_PACKAGE_VERSION in + *svn*) build_type=development;; + *pre*|*alpha*|*beta*|*rc*) build_type=prerelease;; + *) build_type=release ;; + esac]) +AC_MSG_RESULT([$build_type]) +lyx_flags="$lyx_flags build=$build_type" +case $build_type in + development) lyx_devel_version=yes + AC_DEFINE(DEVEL_VERSION, 1, [Define if you are building a development version of LyX]) + LYX_DATE="not released yet" ;; + prerelease) lyx_prerelease=yes ;; esac -AC_SUBST(lyx_devel_version)]) + +AC_SUBST(lyx_devel_version) +]) dnl Define the option to set a LyX version on installed executables and directories @@ -29,11 +47,11 @@ AC_MSG_CHECKING([for version suffix]) dnl We need the literal double quotes in the rpm spec file RPM_VERSION_SUFFIX='""' AC_ARG_WITH(version-suffix, - [ --with-version-suffix[=] install lyx files as lyx], + [AC_HELP_STRING([--with-version-suffix@<:@=VERSION@:>@], install lyx files as lyxVERSION (VERSION=-AC_PACKAGE_VERSION))], [if test "x$withval" = "xyes"; then withval="-"AC_PACKAGE_VERSION - ac_configure_args=`echo $ac_configure_args | sed "s,--with-version-suffix,--with-version-suffix=$withval,"` + ac_configure_args=`echo "$ac_configure_args" | sed "s,--with-version-suffix,--with-version-suffix=$withval,"` fi AC_SUBST(version_suffix,$withval) RPM_VERSION_SUFFIX="--with-version-suffix=$withval"]) @@ -167,37 +185,31 @@ AC_ARG_ENABLE(warnings, enable_warnings=no; fi;]) if test x$enable_warnings = xyes ; then - lyx_flags="warnings $lyx_flags" + lyx_flags="$lyx_flags warnings" fi ### We might want to disable debug AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],[enable debug information]),, - [ if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then - enable_debug=yes; - else - enable_debug=no; - fi;]) + [AS_CASE([$build_type], [rel*], [enable_debug=no], [enable_debug=yes])] +) AC_ARG_ENABLE(stdlib-debug, AC_HELP_STRING([--enable-stdlib-debug],[enable debug mode in the standard library]),, - [ if test $lyx_devel_version = yes ; then - enable_stdlib_debug=yes; - else - enable_stdlib_debug=no; - fi;]) + [AS_CASE([$build_type], [dev*], [enable_stdlib_debug=yes], + [enable_stdlib_debug=no])] +) AC_ARG_ENABLE(concept-checks, AC_HELP_STRING([--enable-concept-checks],[enable concept checks]),, - [ if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then - enable_concept_checks=yes; - else - enable_concept_checks=no; - fi;]) + [AS_CASE([$build_type], [dev*|pre*], [enable_concept_checks=yes], + [enable_concept_checks=no])] +) -AC_ARG_ENABLE(profiling, - AC_HELP_STRING([--enable-profiling],[enable profiling]),, - enable_profiling=no;) +AC_ARG_ENABLE(gprof, + AC_HELP_STRING([--enable-gprof],[enable profiling using gprof]),, + [AS_CASE([$build_type], [gprof], [enable_gprof=yes], [enable_gprof=no])] +) ### set up optimization AC_ARG_ENABLE(optimization, @@ -216,9 +228,20 @@ esac AC_ARG_ENABLE(pch, AC_HELP_STRING([--enable-pch],[enable precompiled headers]),, - enable_pch=yes;) + enable_pch=no;) lyx_pch_comp=no +AC_ARG_ENABLE(assertions, + AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),, + [AS_CASE([$build_type], [dev*|pre*], [enable_assertions=yes], + [enable_assertions=no])] +) +if test "x$enable_assertions" = xyes ; then + lyx_flags="$lyx_flags assertions" + AC_DEFINE(ENABLE_ASSERTIONS,1, + [Define if you want assertions to be enabled in the code]) +fi + # set the compiler options correctly. if test x$GXX = xyes; then dnl Useful for global version info @@ -234,7 +257,7 @@ if test x$GXX = xyes; then CFLAGS="-g $CFLAGS" CXXFLAGS="-g $CXXFLAGS" fi - if test x$enable_profiling = xyes ; then + if test x$enable_gprof = xyes ; then CFLAGS="-pg $CFLAGS" CXXFLAGS="-pg $CXXFLAGS" LDFLAGS="-pg $LDFLAGS" @@ -264,7 +287,7 @@ if test x$GXX = xyes; then if test x$enable_stdlib_debug = xyes ; then case $gxx_version in 3.4*|4.*) - lyx_flags="stdlib-debug $lyx_flags" + lyx_flags="$lyx_flags stdlib-debug" AC_DEFINE(_GLIBCXX_DEBUG, 1, [libstdc++ debug mode]) AC_DEFINE(_GLIBCXX_DEBUG_PEDANTIC, 1, [libstdc++ pedantic debug mode]) ;; @@ -273,194 +296,84 @@ if test x$GXX = xyes; then if test x$enable_concept_checks = xyes ; then case $gxx_version in 3.3*) - lyx_flags="concept-checks $lyx_flags" + lyx_flags="$lyx_flags concept-checks" AC_DEFINE(_GLIBCPP_CONCEPT_CHECKS, 1, [libstdc++ concept checking]) ;; 3.4*|4.*) - lyx_flags="concept-checks $lyx_flags" + lyx_flags="$lyx_flags concept-checks" AC_DEFINE(_GLIBCXX_CONCEPT_CHECKS, 1, [libstdc++ concept checking]) ;; esac fi fi -test "$lyx_pch_comp" = yes && lyx_flags="pch $lyx_flags" +test "$lyx_pch_comp" = yes && lyx_flags="$lyx_flags pch" AM_CONDITIONAL(LYX_BUILD_PCH, test "$lyx_pch_comp" = yes) ])dnl - -dnl NOT USED CURRENTLY************************************* -dnl Usage: LYX_CXX_RTTI : checks whether the C++ compiler -dnl supports RTTI -AC_DEFUN([LYX_CXX_RTTI],[ -### Check whether the compiler supports runtime type information -AC_CACHE_CHECK(whether the C++ compiler supports RTTI,lyx_cv_rtti, - [AC_TRY_RUN([ -class rtti { -public: - virtual int tag() { return 0; } -}; -class derived1 : public rtti { -public: - int tag() { return 1; } -}; -class derived2 : public rtti { -public: - int tag() { return 2; } -}; -int main() { - derived1 * foo1 = new derived1(); - derived2 * foo2 = new derived2(); - rtti * bar = foo1; - derived1 * bar1 = dynamic_cast(bar); - if (bar1 == 0) - exit(1); - bar = foo2; - bar1 = dynamic_cast(bar); - if (bar1 != 0) - exit(1); - return 0; -} -],lyx_cv_rtti=yes,lyx_cv_rtti=no,lyx_cv_rtti=no) -]) -if test x$lyx_cv_rtti = xyes ; then - AC_DEFINE(HAVE_RTTI, 1, - [Define to 1 if your compiler supports runtime type information]) -fi]) - - -dnl Usage: LYX_CXX_EXPLICIT : checks whether the C++ compiler -dnl understands the "explicit" directive. -AC_DEFUN([LYX_CXX_EXPLICIT],[ -### Check whether the compiler understands the keyword `explicit' -AC_CACHE_CHECK(whether the C++ compiler understands explicit,lyx_cv_explicit, - [AC_TRY_COMPILE([ -class Expl { -public: - explicit Expl() {} -};],,lyx_cv_explicit=yes,lyx_cv_explicit=no) -]) -if test $lyx_cv_explicit = no ; then - AC_DEFINE(explicit,[ ], - [Define to nothing if your compiler does not understand the - 'explicit' directive]) -fi]) - - -dnl NOT USED CURRENTLY************************************* -dnl Usage: LYX_CXX_STL_STACK : checks whether the C++ compiler -dnl has a working stl stack template -AC_DEFUN([LYX_CXX_STL_STACK],[ -AC_CACHE_CHECK(for broken STL stack template,lyx_cv_broken_stack, - [AC_TRY_COMPILE([ -#include -using std::stack; -],[ - stack stakk; - stakk.push(0); -],lyx_cv_broken_stack=no,lyx_cv_broken_stack=yes) -]) -if test $lyx_cv_broken_stack = yes ; then - AC_DEFINE(BROKEN_STL_STACK, 1, - [Define if you have the STL from libg++ 2.7.x, where stack<> is not defined - correctly]) -fi]) - - -dnl Usage: LYX_STD_COUNT : checks wherer the C++ library have a conforming -dnl count template, if not the old HP version is assumed. -AC_DEFUN([LYX_STD_COUNT],[ -AC_CACHE_CHECK(for conforming std::count,lyx_cv_std_count, - [AC_TRY_COMPILE([ -#include -using std::count; -int countChar(char * b, char * e, char const c) -{ - return count(b, e, c); -} -],[ - char a[] = "hello"; - int i = countChar(a, a + 5, 'l'); -],lyx_cv_std_count=yes,lyx_cv_std_count=no) -]) -if test $lyx_cv_std_count = yes ; then - AC_DEFINE(HAVE_STD_COUNT, 1, - [Define if you have a conforming std::count template, otherwise HP version of count template is assumed.]) -fi]) - - -dnl Usage: LYX_CXX_STL_MODERN_STREAMS : checks whether the C++ compiler -dnl supports modern STL streams -AC_DEFUN([LYX_CXX_STL_MODERN_STREAMS],[ -AC_CACHE_CHECK(for modern STL streams,lyx_cv_modern_streams, - [AC_TRY_COMPILE([ -#include -],[ - std::streambuf * test = std::cerr.rdbuf(); - test->pubsync(); -],lyx_cv_modern_streams=yes,lyx_cv_modern_streams=no) -]) -if test $lyx_cv_modern_streams = yes ; then - AC_DEFINE(MODERN_STL_STREAMS, 1, - [Define if you have modern standard-compliant STL streams]) -fi]) - - dnl Usage: LYX_USE_INCLUDED_BOOST : select if the included boost should dnl be used. AC_DEFUN([LYX_USE_INCLUDED_BOOST],[ + AC_MSG_CHECKING([whether to use included boost library]) AC_ARG_WITH(included-boost, - [ --without-included-boost do not use the boost lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found], - [lyx_cv_with_included_boost=$withval - AC_MSG_RESULT([$with_included_boost])], + [AC_HELP_STRING([--without-included-boost], [do not use the boost lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found])], + [lyx_cv_with_included_boost=$withval], [lyx_cv_with_included_boost=yes]) AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes) + AC_MSG_RESULT([$lyx_cv_with_included_boost]) + if test x$lyx_cv_with_included_boost != xyes ; then + AC_LANG_PUSH(C++) + SAVED_LDFLAGS=$LDFLAGS + + LDFLAGS="$SAVED_LDFLAGS -lboost_signals -lm" + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], [boost::signal s;])], [lyx_boost_underscore=yes], []) + LDFLAGS="$SAVED_LDFLAGS -lboost_signals-mt -lm $LIBTHREAD" + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], [boost::signal s;])], [lyx_boost_underscore_mt=yes], []) + + LDFLAGS=$SAVED_LDFLAGS + AC_LANG_POP(C++) + + if test x$lyx_boost_underscore_mt = xyes ; then + BOOST_MT="-mt" + else + BOOST_MT="" + if test x$lyx_boost_plain != xyes -a x$lyx_boost_underscore != xyes ; then + LYX_ERROR([No suitable boost library found (do not use --without-included-boost)]) + fi + fi + AC_SUBST(BOOST_SEP) + AC_SUBST(BOOST_MT) + fi ]) -dnl NOT USED CURRENTLY************************************* -dnl LYX_CXX_PARTIAL -AC_DEFUN([LYX_CXX_PARTIAL], [ - AC_REQUIRE([AC_PROG_CXX]) - AC_CACHE_CHECK([if C++ compiler supports partial specialization], - [lyx_cv_cxx_partial_specialization], - [AC_TRY_COMPILE( - [ - template - class k { - public: - }; - template class k { }; - ],[ - k b; - k a; - ],[ - lyx_cv_cxx_partial_specialization=yes - ],[ - lyx_cv_cxx_partial_specialization=no - ]) - ]) - if test x$lyx_cv_cxx_partial_specialization = xyes ; then - AC_DEFINE(HAVE_PARTIAL_SPECIALIZATION, 1, - [Defined if your compiler supports partial specialization.]) - fi -]) - - -dnl Usage: LYX_CXX_GLOBAL_CSTD: checks whether C library functions -dnl are already in the global namespace -AC_DEFUN([LYX_CXX_GLOBAL_CSTD],[ - AC_CACHE_CHECK(whether C library functions are already in the global namespace, - lyx_cv_cxx_global_cstd, - [AC_TRY_COMPILE([ - #include - using std::tolower; - ],[ - return 0; - ],[lyx_cv_cxx_global_cstd=no],[lyx_cv_cxx_global_cstd=yes])]) - if test x$lyx_cv_cxx_global_cstd = xyes; then - AC_DEFINE(CXX_GLOBAL_CSTD,1, - [Define if your C++ compiler puts C library functions in the global namespace]) - fi +dnl Usage: LYX_USE_INCLUDED_MYTHES : select if the included MyThes should +dnl be used. +AC_DEFUN([LYX_USE_INCLUDED_MYTHES],[ + AC_MSG_CHECKING([whether to use included MyThes library]) + AC_ARG_WITH(included-mythes, + [AC_HELP_STRING([--without-included-mythes], [do not use the MyThes lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found])], + [lyx_cv_with_included_mythes=$withval], + [lyx_cv_with_included_mythes=yes]) + AM_CONDITIONAL(USE_INCLUDED_MYTHES, test x$lyx_cv_with_included_mythes = xyes) + AC_MSG_RESULT([$lyx_cv_with_included_mythes]) + if test x$lyx_cv_with_included_mythes != xyes ; then + AC_LANG_PUSH(C++) + AC_CHECK_HEADER(mythes.hxx,[ac_cv_header_mythes_h=yes lyx_cv_mythes_h_location=""]) + if test x$ac_cv_header_mythes_h != xyes; then + AC_CHECK_HEADER(mythes/mythes.hxx,[ac_cv_header_mythes_h=yes lyx_cv_mythes_h_location=""]) + fi + AC_CHECK_LIB(mythes, main, [MYTHES_LIBS="-lmythes" lyx_mythes=yes], [lyx_mythes=no], [-lm]) + if test x$lyx_mythes != xyes; then + AC_CHECK_LIB(mythes-1.2, main, [MYTHES_LIBS="-lmythes-1.2" lyx_mythes=yes], [lyx_mythes=no], [-lm]) + fi + AC_LANG_POP(C++) + if test x$lyx_mythes != xyes -o x$ac_cv_header_mythes_h != xyes; then + LYX_ERROR([No suitable MyThes library found (do not use --without-included-mythes)]) + fi + AC_DEFINE(USE_EXTERNAL_MYTHES, 1, [Define as 1 to use an external MyThes library]) + AC_DEFINE_UNQUOTED(MYTHES_H_LOCATION,$lyx_cv_mythes_h_location,[Location of mythes.hxx]) + AC_SUBST(MYTHES_LIBS) + fi ]) @@ -551,8 +464,8 @@ rm -f conftest*]) AC_DEFUN([LYX_USE_FRONTENDS], [AC_MSG_CHECKING([what frontend should be used for the GUI]) AC_ARG_WITH(frontend, - [ --with-frontend=THIS Use THIS frontend as main GUI: - Possible values: qt4], + [AC_HELP_STRING([--with-frontend=THIS], [use THIS frontend as main GUI: + Possible values: qt4])], [FRONTENDS="$withval"],[FRONTENDS="qt4"]) if test "x$FRONTENDS" = x ; then AC_MSG_RESULT(none) @@ -570,8 +483,8 @@ AC_SUBST(FRONTENDS_PROGS) AC_DEFUN([LYX_USE_PACKAGING], [AC_MSG_CHECKING([what packaging should be used]) AC_ARG_WITH(packaging, - [ --with-packaging=THIS Use THIS packaging for installation: - Possible values: posix, windows, macosx], + [AC_HELP_STRING([--with-packaging=THIS], [use THIS packaging for installation: + Possible values: posix, windows, macosx])], [lyx_use_packaging="$withval"], [ case $host in *-apple-darwin*) lyx_use_packaging=macosx ;; @@ -580,73 +493,51 @@ AC_ARG_WITH(packaging, esac]) AC_MSG_RESULT($lyx_use_packaging) lyx_install_macosx=false +lyx_install_cygwin=false +lyx_install_windows=false case $lyx_use_packaging in macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout]) PACKAGE=LyX${version_suffix} default_prefix="/Applications/${PACKAGE}.app" bindir='${prefix}/Contents/MacOS' libdir='${prefix}/Contents/Resources' - datadir='${prefix}/Contents/Resources' + datarootdir='${prefix}/Contents/Resources' pkgdatadir='${datadir}' - mandir='${datadir}/man' + mandir='${datadir}/man' lyx_install_macosx=true ;; windows) AC_DEFINE(USE_WINDOWS_PACKAGING, 1, [Define to 1 if LyX should use a Windows-style file layout]) PACKAGE=LyX${version_suffix} default_prefix="C:/Program Files/${PACKAGE}" bindir='${prefix}/bin' libdir='${prefix}/Resources' - datadir='${prefix}/Resources' + datarootdir='${prefix}/Resources' pkgdatadir='${datadir}' - mandir='${prefix}/Resources/man' ;; + mandir='${prefix}/Resources/man' + lyx_install_windows=true ;; posix) AC_DEFINE(USE_POSIX_PACKAGING, 1, [Define to 1 if LyX should use a POSIX-style file layout]) PACKAGE=lyx${version_suffix} program_suffix=$version_suffix pkgdatadir='${datadir}/${PACKAGE}' - default_prefix=$ac_default_prefix ;; + default_prefix=$ac_default_prefix + case ${host} in + *cygwin*) lyx_install_cygwin=true ;; + *apple-darwin*) lyx_install_macosx=true ;; + esac + lyx_install_posix=true ;; *) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;; esac AM_CONDITIONAL(INSTALL_MACOSX, $lyx_install_macosx) +AM_CONDITIONAL(INSTALL_WINDOWS, $lyx_install_windows) +AM_CONDITIONAL(INSTALL_CYGWIN, $lyx_install_cygwin) +AM_CONDITIONAL(INSTALL_POSIX, $lyx_install_posix) +dnl Next two lines are only for autoconf <= 2.59 +datadir='${datarootdir}' +AC_SUBST(datarootdir) AC_SUBST(pkgdatadir) AC_SUBST(program_suffix) ]) -## ------------------------------------------------------------------------ -## Find a file (or one of more files in a list of dirs) -## ------------------------------------------------------------------------ -## -AC_DEFUN([AC_FIND_FILE], -[ -$3=NO -for i in $2; -do - for j in $1; - do - if test -r "$i/$j"; then - $3=$i - break 2 - fi - done -done -]) - -dnl just a wrapper to clean up configure.in -AC_DEFUN([LYX_PROG_LIBTOOL], -[ -AC_REQUIRE([AC_ENABLE_SHARED]) -AC_REQUIRE([AC_ENABLE_STATIC]) -dnl libtool is only for C, so I must force him -dnl to find the correct flags for C++ -ac_save_cc=$CC -ac_save_cflags="$CFLAGS" -CC=$CXX -CFLAGS="$CXXFLAGS" -AC_PROG_LIBTOOL dnl for libraries -CC=$ac_save_cc -CFLAGS="$ac_save_cflags" -]) - - ## ------------------------------------------------------------------------ ## Check whether mkdir() is mkdir or _mkdir, and whether it takes ## one or two arguments. @@ -673,7 +564,7 @@ fi dnl Set VAR to the canonically resolved absolute equivalent of PATHNAME, -dnl (which may be a relative path, and need not refer to any existing +dnl (which may be a relative path, and need not refer to any existing dnl entity). dnl On Win32-MSYS build hosts, the returned path is resolved to its true @@ -716,9 +607,29 @@ do [AC_MSG_RESULT(no)]) done]) +dnl this is used by the macro below to generate a proper config.h.in entry +m4_define([LYX_AH_CHECK_DEF], +[AH_TEMPLATE(AS_TR_CPP(HAVE_DEF_$1), + [Define to 1 if `$1' is defined in `$2'])]) + +dnl Check whether name is defined in header by using it in codesnippet. +dnl Called like LYX_CHECK_DEF(name, header, codesnippet) +dnl Defines HAVE_DEF_{NAME} +AC_DEFUN([LYX_CHECK_DEF], +[LYX_AH_CHECK_DEF($1, $2) + AC_MSG_CHECKING([whether $1 is defined by header $2]) + AC_TRY_COMPILE([#include <$2>], [$3], + lyx_have_def_name=yes, + lyx_have_def_name=no) + AC_MSG_RESULT($lyx_have_def_name) + if test "x$lyx_have_def_name" = xyes; then + AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_DEF_$1)) + fi +]) + dnl Extract the single digits from PACKAGE_VERSION and make them available. -dnl Defines LYX_MAJOR_VERSION, LYX_MINOR_VERSION, LYX_RELEASE_LEVEL, and -dnl LYX_RELEASE_PATCH, the latter being possibly equal to 0. +dnl Defines LYX_MAJOR_VERSION, LYX_MINOR_VERSION, LYX_RELEASE_LEVEL, +dnl LYX_RELEASE_PATCH (possibly equal to 0), LYX_DIR_VER, and LYX_USERDIR_VER. AC_DEFUN([LYX_SET_VERSION_INFO], [lyx_major=`echo $PACKAGE_VERSION | sed -e 's/[[.]].*//'` lyx_patch=`echo $PACKAGE_VERSION | sed -e "s/^$lyx_major//" -e 's/^.//'` @@ -727,8 +638,33 @@ AC_DEFUN([LYX_SET_VERSION_INFO], lyx_release=`echo $lyx_patch | sed -e 's/[[^0-9]].*//'` lyx_patch=`echo $lyx_patch | sed -e "s/^$lyx_release//" -e 's/^[[.]]//' -e 's/[[^0-9]].*//'` test "x$lyx_patch" = "x" && lyx_patch=0 + lyx_dir_ver=LYX_DIR_${lyx_major}${lyx_minor}x + lyx_userdir_ver=LYX_USERDIR_${lyx_major}${lyx_minor}x AC_SUBST(LYX_MAJOR_VERSION,$lyx_major) AC_SUBST(LYX_MINOR_VERSION,$lyx_minor) AC_SUBST(LYX_RELEASE_LEVEL,$lyx_release) AC_SUBST(LYX_RELEASE_PATCH,$lyx_patch) + AC_SUBST(LYX_DIR_VER,"$lyx_dir_ver") + AC_SUBST(LYX_USERDIR_VER,"$lyx_userdir_ver") ]) + +# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# --------------------------------------------------------------------------- +# Copied from autoconf 2.68, added a check that python version is < 3.0 +# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION. +# Run ACTION-IF-FALSE otherwise. +# This test uses sys.hexversion instead of the string equivalent (first +# word of sys.version), in order to cope with versions such as 2.2c1. +# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000). +AC_DEFUN([AM_PYTHON_CHECK_VERSION], + [prog="import sys +# split strings by '.' and convert to numeric. Append some zeros +# because we need at least 4 digits for the hex conversion. +# map returns an iterator in Python 3.0 and a list in 2.x +minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]] +minverhex = 0 +maxverhex = 50331648 # = 3.0.0.0 +# xrange is not present in Python 3.0 and range returns an iterator +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] +sys.exit(sys.hexversion < minverhex or sys.hexversion >= maxverhex)" + AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])