Handle --version reasonably in CANNOT_DUMP configuration.

* src/emacs.c (emacs_version, emacs_copyright): New string
variables.
(Vemacs_version, Vemacs_copyright): New Lisp_Object variables.
(syms_of_emacs): Defvar them, and initialize them from the C
string variables.
(main): If initialization hasn't been done, print initial version
info from the C strings, instead of starting an interactive session.
* lisp/version.el (emacs-copyright, emacs-version): Don't define
here.
* configure.in: Look for version string in its new place.

2 files changed, 5 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 153b49b6851..c3dbf2c3224 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-15  Ken Raeburn  <raeburn@raeburn.org>
+
+        * version.el (emacs-copyright, emacs-version): Don't define here,
+        now that emacs.c defines it.
+
 2010-05-15  Eli Zaretskii  <eliz@gnu.org>
 
         * international/mule-cmds.el (mule-menu-keymap): Fix definition of
diff --git a/lisp/version.el b/lisp/version.el
index 5cd0cc8d634..770409b9487 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -29,12 +29,6 @@
 
 ;;; Code:
 
-(defconst emacs-copyright "Copyright (C) 2010 Free Software Foundation, Inc." "\
-Short copyright string for this version of Emacs.")
-
-(defconst emacs-version "24.0.50" "\
-Version numbers of this version of Emacs.")
-
 (defconst emacs-major-version (progn (string-match "^[0-9]+" emacs-version) (string-to-number (match-string 0 emacs-version))) "\
 Major version number of this version of Emacs.
 This variable first existed in version 19.23.")