From 329d74bc1c29d86ed90919c4b0746a121ed5e80a Mon Sep 17 00:00:00 2001
From: shuhei <shuhei>
Date: Wed, 22 Dec 1999 21:31:25 +0000
Subject: [PATCH] product.el, apel-ver.el, time-stamp.el, and timezone.el are
 version-dependent.

---
 APEL-ELS |   28 ++--------------------------
 EMU-ELS  |   27 +++++++++++++++++++++++----
 2 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/APEL-ELS b/APEL-ELS
index 4d63740..98de7e6 100644
--- a/APEL-ELS
+++ b/APEL-ELS
@@ -6,8 +6,7 @@
 
 ;;; Code:
 
-(defvar apel-modules '(product apel-ver
-			       alist calist path-util filename install
+(defvar apel-modules '(alist calist path-util filename install
 			     ;; "mule-caesar" is version-dependent.
 			     ;; moved to EMU-ELS.
 			     ;; mule-caesar
@@ -15,29 +14,6 @@
 			     ;; [obsoleted modules] If you would like to
 			     ;; install following, please activate them.
 			     ;; atype file-detect
-			       ))
-
-(if (or (< emacs-major-version 19)
-	(and (eq emacs-major-version 19) (< emacs-minor-version 16)))
-    (setq apel-modules (cons 'time-stamp apel-modules))
-  )
-
-(condition-case nil
-    (let ((load-path (delete (expand-file-name ".")
-                             (copy-sequence load-path))))
-      ;; v18 does not have timezone.el.
-      (require 'timezone)
-      ;; Is timezone.el APEL version?
-      (if (product-find 'timezone)
-	  (error "timezone.el is APEL version. Install newer version."))
-      ;; Y2K test.
-      (or (string= (aref (timezone-parse-date "Sat, 1 Jan 00 00:00:00 GMT")
-                         0)
-                   "2000")
-	  (error "timezone.el has Y2K problem. Install fixed version."))
-      ;; another test here.
-      )
-  (error
-   (setq apel-modules (cons 'timezone apel-modules))))
+			     ))
 
 ;;; APEL-ELS ends here
diff --git a/EMU-ELS b/EMU-ELS
index 6865884..542d2ce 100644
--- a/EMU-ELS
+++ b/EMU-ELS
@@ -16,8 +16,9 @@
   (nconc
    ;; modules are sorted by compilation order.
    '(static broken)
-   ;; coming soon.
-   ;; '(product)
+
+   ;; product information.
+   '(product apel-ver)
 
    ;; poe modules; poe modules depend on static.
    '(pym)
@@ -148,10 +149,28 @@
 	    (or (< emacs-major-version 19)
 		(and (= emacs-major-version 19)
 		     (< emacs-minor-version 16))))
-       '(time-stamp))
+       '(time-stamp)
+     ;; no problem.
+     '())
 
    ;; timezone.el; Some versions have Y2K problem.
-   ;; coming soon.
+   (condition-case nil
+       (let ((load-path (delete (expand-file-name ".")
+				(copy-sequence load-path))))
+	 ;; v18 does not have timezone.el.
+	 (require 'timezone)
+	 ;; Is timezone.el APEL version?
+	 (if (product-find 'timezone)
+	     (error "timezone.el is APEL version. Install newer version."))
+	 ;; Y2K test.
+	 (or (string= (aref (timezone-parse-date "Sat, 1 Jan 00 00:00:00 GMT")
+			    0)
+		      "2000")
+	     (error "timezone.el has Y2K problem. Install fixed version."))
+	 ;; no problem.
+	 '())
+     (error
+      '(timezone)))
 
    ;; invisible modules; provided for backward compatibility with old "tm".
    (cond
-- 
1.7.10.4