make maintainer mode automatic

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9065 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 760715b1c8445c7b994689fcab23f4ffb93a9d60..a3030ba6dbae5e5b3fb4e6c72a6b498f9f8e909c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-07  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * configure.ac: make maintainer mode active by default for
+       development releases
+
 2004-09-26  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
        * configure.ac: update for gtk 2.4

diff --git a/INSTALL b/INSTALL
index 6735d1daeb44ded358cd903543093bd130bf4ecf..abd82bd7e7d5de240e0f01ce1afefe9fb82eebd0 100644 (file)
--- 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 d8491f4de2b2608bdd48096577249d964f121f7f..8993ad405fe1269568062baa7b54deab649ec5cb 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-07  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * lyxinclude.m4 (LYX_CHECK_VERSION): simplify
+
 2004-09-23  John Spray  <jcs116@york.ac.uk>
 
        * lyxinclude.m4 (LYX_USE_FRONTENDS): mention gtk as frontend

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 519e512674b13b47e9d2fe3affe50d1a9f4e7e5a..b2aa950555bcaefae49ae320322322b4422868e5 100644 (file)
--- 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 f5458d0288678233880eade38900b6d405a188ec..ed6b0acb1411ef4005e3f6a0be5fffbe13f0c5b1 100644 (file)
--- 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