From 82bd0c1b178169c5ee8d783eedc1a0d2e13687ff Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 8 Oct 2004 12:12:22 +0000 Subject: [PATCH] make maintainer mode automatic git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9065 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 5 +++++ INSTALL | 3 ++- config/ChangeLog | 4 ++++ config/lyxinclude.m4 | 8 ++------ configure.ac | 4 ++++ 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 760715b1c8..a3030ba6db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-10-07 Jean-Marc Lasgouttes + + * configure.ac: make maintainer mode active by default for + development releases + 2004-09-26 Lars Gullik Bjonnes * configure.ac: update for gtk 2.4 diff --git a/INSTALL b/INSTALL index 6735d1daeb..abd82bd7e7 100644 --- a/INSTALL +++ b/INSTALL @@ -227,7 +227,8 @@ Moreover, the following generic configure flags may be useful: o --enable-maintainer-mode enables some code that automatically rebuilds the configure script, makefiles templates and other useful - files when needed. This is off by default, to avoid surprises. + files when needed. This is off by default on releases, to avoid + surprises. Note that the --with-extra-* commands are not really robust when it comes to use of relative paths. If you really want to use a relative path diff --git a/config/ChangeLog b/config/ChangeLog index d8491f4de2..8993ad405f 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2004-10-07 Jean-Marc Lasgouttes + + * lyxinclude.m4 (LYX_CHECK_VERSION): simplify + 2004-09-23 John Spray * lyxinclude.m4 (LYX_USE_FRONTENDS): mention gtk as frontend diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index 519e512674..b2aa950555 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -7,10 +7,10 @@ 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" AC_DEFUN([LYX_CHECK_VERSION],[ -changequote(, ) dnl echo "configuring LyX version $VERSION" if echo "$VERSION" | grep 'cvs' >/dev/null ; then lyx_devel_version=yes + AC_DEFINE(DEVEL_VERSION, 1, [Define if you are building a development version of LyX]) echo "WARNING: This is a development version. Expect bugs." else lyx_devel_version=no @@ -21,11 +21,7 @@ if echo "$VERSION" | grep 'pre' > /dev/null ; then else lyx_prerelease=no fi -changequote([, ]) dnl -AC_SUBST(lyx_devel_version) -if test $lyx_devel_version = yes ; then - AC_DEFINE(DEVEL_VERSION, 1, [Define if you are building a development version of LyX]) -fi]) +AC_SUBST(lyx_devel_version)]) dnl Define the option to set a LyX version on installed executables and directories diff --git a/configure.ac b/configure.ac index f5458d0288..ed6b0acb14 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,10 @@ PACKAGE=lyx${program_suffix} VERSION="1.4.0cvs" LYX_CHECK_VERSION +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 AC_CANONICAL_TARGET -- 2.39.5