[Merging changes with catalog changes
atsmyles@earthlink.net**20091107174513
 Ignore-this: 2e66db98e1766e3829576ba2fa4d178
] hunk ./primitives.scm 124
-    
-(define (ex:compile-native-library native-files library-form . options)
- (define to-file (library->filename (cadr library-form)))
- (define (library-filename library) (path-strip-directory (path-strip-extension (library->filename (cadr library))))) 
+(define (ex:compile-library library-form output-file . rest)
+  (if (null? rest)
+     (ex:compile-native-library library-form output-file '() '())
+	;native files can be either a list, the empty list, or #f which will call the compile-native-library with the empty list
+     (ex:compile-native-library library-form output-file (or (car rest) '()) (cdr rest))
+    ))
+  
+(define (ex:compile-native-library library-form output-file native-files compiler-options)
+ (define (library-filename library) (path-strip-directory (path-strip-extension output-file))) 
hunk ./primitives.scm 146
-	      (apply compile-file-to-c file output: tmp-dir options)) files))
+	      (apply compile-file-to-c file output: tmp-dir compiler-options)) files))
hunk ./primitives.scm 151
-   (let ((file (string-append (library-filename library) "_.scm"))
-	 (library-declarations '(declare (standard-bindings)(extended-bindings)(block))))
+  (let ((file (string-append (library-filename library) "_.scm"))
+	(library-declarations '(declare (standard-bindings)(extended-bindings)(block))))