* scm/slib.scm.in: version information is set a build time.

* scm/*.scm: don't choke on -lib- variables that aren't needed.


git-svn-id: svn://svn.zoy.org/elk/trunk@47 55e467fa-43c5-0310-a8a2-de718669efc6

scm/slib.scm.in

@@ -41,13 +41,13 @@
 ;;; (scheme-implementation-version) should return a string describing
 ;;; the version the scheme implementation loading this file.
 
-(define (scheme-implementation-version) "3.0")
+(define (scheme-implementation-version) "@VERSION@")
 
 ;;; (implementation-vicinity) should be defined to be the pathname of
 ;;; the directory where any auxillary files to your Scheme
 ;;; implementation reside.
 
-(define (implementation-vicinity) "/usr/share/elk")
+(define (implementation-vicinity) "@prefix@/share/elk")
 
 ;;; (library-vicinity) should be defined to be the pathname of the
 ;;; directory where files of Scheme library functions reside.
@@ -62,7 +62,7 @@
 ;	       ((MS-DOS) "C:\\SLIB\\")
 ;	       (else "")))))
 ;    (lambda () library-path)))
-(define (library-vicinity) "/usr/lib/slib/")
+(define (library-vicinity) "@prefix@/lib/slib/")
 
 ;;; *features* should be set to a list of symbols describing features
 ;;; of this implementation.  Suggestions for features are:

scm/xlib.scm

@@ -2,6 +2,9 @@
 ;;;
 ;;; The Scheme part of the Xlib extension.
 
+; kludge
+(define site-lib-xlib "")
+
 (fluid-let ((load-libraries (string-append site-lib-xlib " " load-libraries)))
   (require 'xlib.so))
 

scm/xt.scm

@@ -2,6 +2,9 @@
 ;;;
 ;;; The Scheme part of the Xt extension.
 
+;; kludge
+(define site-lib-xt "")
+
 (if (feature? 'motif)
     (fluid-let ((load-libraries
 		  (string-append site-force-load-xm " " site-lib-xmotif " "

scm/xwidgets.scm

@@ -2,6 +2,9 @@
 ;;;
 ;;; The Scheme part of the X11 widget interface.
 
+; kludge
+(define site-lib-xaw "")
+
 (require 'xt)
 
 (define widget-subdirectory 'xaw)
@@ -40,7 +43,8 @@
 	      (if alias (set! file (cdr alias)))
 	      (if autoload-notify?
 		  (format #t "~a~a" file (if (null? (cdr f)) "" " ")))
-	      (set! wl (cons (format #f "~a/~a.so" widget-subdirectory file)
+	      ;;(set! wl (cons (format #f "~a/~a.so" widget-subdirectory file)
+	      (set! wl (cons (format #f "~a/~a.so" widget-subdirectory "xaw")
 			     wl))))
 	  (if autoload-notify? (format #t "]~%"))
 	  `(fluid-let ((load-libraries