X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=ead704b1665f17da4f7a3384aa3cb8bae184188c;hb=581634d86a916a233ee379dea01804838d2df4f0;hp=8287fb2f5d025ac4daa67a6a763d3971a75b0da6;hpb=8cb021b32fffb92003da7cef9ef3cb711f5901eb;p=lyx.git diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index 8287fb2f5d..ead704b166 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -3,6 +3,12 @@ dnl Author: Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr) dnl Lars Gullik Bjønnes (larsbj@lyx.org) dnl Allan Rae (rae@lyx.org) +dnl Compute the default build type from AC_PACKAGE_VERSION at autoconf time. +m4_define([LYX_BUILD_TYPE], [m4_bmatch(AC_PACKAGE_VERSION, + [dev], [development], + [pre\|alpha\|beta\|rc], [prerelease], + [release])]) + dnl Usage LYX_CHECK_VERSION Displays version of LyX being built and dnl sets variable "build_type" @@ -13,7 +19,7 @@ AC_MSG_CHECKING([for build type]) lyx_devel_version=no lyx_prerelease=no 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]), + AC_HELP_STRING([--enable-build-type=STR],[set build type to rel(ease), pre(release), dev(elopment), prof(iling), or gprof (default: LYX_BUILD_TYPE)]), [case $enableval in dev*) build_type=development;; pre*) build_type=prerelease;; @@ -22,16 +28,11 @@ AC_ARG_ENABLE(build-type, rel*) build_type=release;; *) AC_MSG_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 - *dev*) build_type=development;; - *pre*|*alpha*|*beta*|*rc*) build_type=prerelease;; - *) build_type=release ;; - esac]) + [build_type=LYX_BUILD_TYPE]) 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 @@ -48,7 +49,7 @@ 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, - [AC_HELP_STRING([--with-version-suffix@<:@=VERSION@:>@], install lyx files as lyxVERSION (VERSION=-AC_PACKAGE_VERSION))], + [AC_HELP_STRING([--with-version-suffix@<:@=STR@:>@], install lyx files as lyxSTR (default STR: -AC_PACKAGE_VERSION))], [if test "x$withval" = "xyes"; then withval="-"AC_PACKAGE_VERSION @@ -352,7 +353,7 @@ AC_ARG_ENABLE(stdlib-debug, ### set up optimization AC_ARG_ENABLE(optimization, - AC_HELP_STRING([--enable-optimization[=value]],[enable compiler optimisation]),, + AC_HELP_STRING([--enable-optimization@<:@=ARG@:>@],[enable compiler optimisation]),, enable_optimization=yes;) case $enable_optimization in yes) @@ -652,14 +653,16 @@ AC_DEFUN([LYX_USE_INCLUDED_MYTHES],[ break]) AC_LANG_POP(C++) fi - if test $use_included_mythes = no ; then - AC_DEFINE(USE_EXTERNAL_MYTHES, 1, [Define as 1 to use an external MyThes library]) - AC_DEFINE_UNQUOTED(MYTHES_H_LOCATION,$mythes_h_location,[Location of mythes.hxx]) - AC_SUBST(MYTHES_LIBS) - else + if test $use_included_mythes = yes ; then + mythes_h_location="" + MYTHES_INCLUDES='-I$(top_srcdir)/3rdparty/mythes/1.2.5/' + MYTHES_LIBS='$(top_builddir)/3rdparty/mythes/liblyxmythes.a' lyx_included_libs="$lyx_included_libs mythes" fi AM_CONDITIONAL(USE_INCLUDED_MYTHES, test x$use_included_mythes = xyes) + AC_DEFINE_UNQUOTED(MYTHES_H_LOCATION,$mythes_h_location,[Location of mythes.hxx]) + AC_SUBST(MYTHES_INCLUDES) + AC_SUBST(MYTHES_LIBS) AC_MSG_CHECKING([whether to use included MyThes library]) AC_MSG_RESULT([$use_included_mythes]) ]) @@ -753,8 +756,8 @@ rm -f conftest*]) AC_DEFUN([LYX_USE_PACKAGING], [AC_MSG_CHECKING([what packaging should be used]) AC_ARG_WITH(packaging, - [AC_HELP_STRING([--with-packaging=THIS], [use THIS packaging for installation: - Possible values: posix, windows, macosx, haiku])], + [AC_HELP_STRING([--with-packaging=STR], [set packaging for installation among: + posix, windows, macosx, haiku (default is autodetected)])], [lyx_use_packaging="$withval"], [ case $host in *-apple-darwin*) lyx_use_packaging=macosx ;; @@ -933,23 +936,3 @@ AC_DEFUN([LYX_SET_VERSION_INFO], 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])])