X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=9ec41461e86ab2b4d5cdc9698e8b9e3e36f30d95;hb=6b5ce8a999028cefcf47a127ec5e8384f24d13dd;hp=fb948f84b127150e56ddd0eabe8273cc4b9eac12;hpb=00cd32985a090886790e8b8ab9407ca320d13cc5;p=lyx.git diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index fb948f84b1..9ec41461e8 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -10,14 +10,29 @@ 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*) lyx_prerelease=yes - echo "WARNING: This is a prerelease. Be careful and backup your documents.";; -esac +build_type=release +AC_MSG_CHECKING([for build type]) +AC_ARG_ENABLE(build-type, + AC_HELP_STRING([--enable-build-type=TYPE],[set build setting according to TYPE=dev(elopment), rel(ease) or pre(release)]), + [case $enableval in + dev*) lyx_devel_version=yes + build_type=development;; + pre*) lyx_prerelease=yes + build_type=prerelease;; + rel*) ;; + *) AC_ERROR([Bad build type specification \"$enableval\". Please use one of dev(elopment), rel(ease) or pre(release)]);; + esac], + [case AC_PACKAGE_VERSION in + *svn*) lyx_devel_version=yes + build_type=development;; + *pre*|*alpha*|*beta*|*rc*) lyx_prerelease=yes + build_type=prerelease;; + esac]) +AC_MSG_RESULT([$build_type]) +if test $lyx_devel_version == yes ; then + AC_DEFINE(DEVEL_VERSION, 1, [Define if you are building a development version of LyX]) + LYX_DATE="not released yet" +fi AC_SUBST(lyx_devel_version)]) @@ -33,9 +48,9 @@ AC_ARG_WITH(version-suffix, [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 - version_suffix=$withval + AC_SUBST(version_suffix,$withval) RPM_VERSION_SUFFIX="--with-version-suffix=$withval"]) AC_SUBST(RPM_VERSION_SUFFIX) AC_MSG_RESULT([$withval]) @@ -156,6 +171,7 @@ fi AC_MSG_RESULT($CXX) AC_PROG_CXX +AC_PROG_CXXCPP ### We might want to get or shut warnings. AC_ARG_ENABLE(warnings, @@ -167,9 +183,6 @@ AC_ARG_ENABLE(warnings, fi;]) if test x$enable_warnings = xyes ; then lyx_flags="warnings $lyx_flags" - AC_DEFINE(WITH_WARNINGS, 1, - [Define this if you want to see the warning directives put here and - there by the developpers to get attention]) fi ### We might want to disable debug @@ -218,7 +231,7 @@ esac AC_ARG_ENABLE(pch, AC_HELP_STRING([--enable-pch],[enable precompiled headers]),, - enable_pch=yes;) + enable_pch=no;) lyx_pch_comp=no # set the compiler options correctly. @@ -410,12 +423,13 @@ 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 boost included library]) AC_ARG_WITH(included-boost, - [ --with-included-boost use the boost lib supplied with LyX], - [lyx_cv_with_included_boost=$withval - AC_MSG_RESULT([$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], [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]) ]) @@ -471,7 +485,7 @@ dnl [default-yes-value]) dnl Adds a --with-'dir-name' option (described by 'desc') and puts the dnl resulting directory name in 'dir-var-name'. AC_DEFUN([LYX_WITH_DIR],[ - AC_ARG_WITH($1,[ --with-$1 specify $2]) + AC_ARG_WITH($1,[AC_HELP_STRING([--with-$1],[specify $2])]) AC_MSG_CHECKING([for $2]) if test -z "$with_$3"; then AC_CACHE_VAL(lyx_cv_$3, lyx_cv_$3=$4) @@ -588,16 +602,16 @@ case $lyx_use_packaging in 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' ;; posix) AC_DEFINE(USE_POSIX_PACKAGING, 1, [Define to 1 if LyX should use a POSIX-style file layout]) @@ -608,6 +622,9 @@ case $lyx_use_packaging in *) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;; esac AM_CONDITIONAL(INSTALL_MACOSX, $lyx_install_macosx) +dnl Next two lines are only for autoconf <= 2.59 +datadir='${datarootdir}' +AC_SUBST(datarootdir) AC_SUBST(pkgdatadir) AC_SUBST(program_suffix) ]) @@ -675,7 +692,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 @@ -717,3 +734,24 @@ do break], [AC_MSG_RESULT(no)]) done]) + +dnl Extract the single digits from PACKAGE_VERSION and make them available. +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/^.//'` + lyx_minor=`echo $lyx_patch | sed -e 's/[[.]].*//'` + lyx_patch=`echo $lyx_patch | sed -e "s/^$lyx_minor//" -e 's/^.//'` + 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") +])