* elmo-imap4.el (toplevel): Delete defun-maybe for sasl-*.

[elisp/wanderlust.git] / elmo / elmo-version.el

diff --git a/elmo/elmo-version.el b/elmo/elmo-version.el
index b376beb..2ef7746 100644 (file)
--- a/elmo/elmo-version.el
+++ b/elmo/elmo-version.el
@@ -1,8 +1,10 @@
 ;;; elmo-version.el -- Version information for ELMO.
 
-;; Copyright 2000 Yuuichi Teranishi <teranisi@gohome.org>
+;; Copyright (C) 2000 Yuuichi Teranishi <teranisi@gohome.org>
+;; Copyright (C) 2000 TAKAHASHI Kaoru <kaoru@kaisei.org>
 
 ;; Author: Yuuichi Teranishi <teranisi@gohome.org>
+;;     TAKAHASHI Kaoru <kaoru@kaisei.org>
 ;; Keywords: mail, net news
 
 ;; This file is part of ELMO (Elisp Library for Message Orchestration).
@@ -29,15 +31,28 @@
 ;;; Code:
 ;; 
 (require 'product)
-(provide 'elmo-version)                        ; have to declare in the top.
+(provide 'elmo-version)                        ; before product-provide
 
+;; product-define in the first place
 (product-provide 'elmo-version
-  (product-define "ELMO" nil '(2 3 92)))
+  (product-define "ELMO" nil '(2 5 2)))
+
+;; For APEL 10.2 or earlier.
+(defun-maybe product-version-as-string (product)
+  "Return version number of product as a string.
+PRODUCT is a product structure which returned by `product-define'.
+If optional argument UPDATE is non-nil, then regenerate
+`produce-version-string' from `product-version'."
+  (setq product (product-find product))
+  (or (product-version-string product)
+      (and (product-version product)
+           (product-set-version-string product
+                                       (mapconcat (function int-to-string)
+                                                  (product-version product)
+                                                  ".")))))
 
 ;; set version-string
-(if (fboundp 'product-version-as-string)
-    (product-version-as-string 'elmo-version)
-  (product-string-1 'elmo-version))    ; APEL 10.2 or earlier
+(product-version-as-string 'elmo-version)
 
 (defun elmo-version ()
   "Return ELMO version."