[Linedit-cvs] CVS src

[nsiivola]

Update of /project/linedit/cvsroot/src
In directory cl-net:/tmp/cvs-serv7154

Modified Files:
	linedit.asd packages.lisp 
Log Message:
fix SBCL build, work with modern Osicat

 * Oops, those linedit.asd changes broke the build on SBCL, and I
   didn't notice. *blush*

 * Current Osicat doesn't have *OSICAT-VERSION* anymore.

 * Missing dependency in linedit.asd.



--- /project/linedit/cvsroot/src/linedit.asd	2010/03/11 17:21:30	1.35
+++ /project/linedit/cvsroot/src/linedit.asd	2010/03/11 21:58:04	1.36
@@ -28,18 +28,16 @@
 
 (defvar *gcc* "/usr/bin/gcc")
 
-(defvar *gcc-options* '(#-(or darwin macosx) "-shared"
-			#+(or darwin macosx)  "-dynamic"
-			#+(or darwin macosx)  "-arch"
-			#+(or darwin macosx)  "x86_64"
-			#+(or darwin macosx)  "-arch"
-			#+(or darwin macosx)  "i386"
-			#+(or darwin macosx)  "-bundle"
-			#+(or darwin macosx)  "/usr/lib/bundle1.o"
-			#+(or darwin macosx)  "-flat_namespace"
-			#+(or darwin macosx)  "-undefined"
-			#+(or darwin macosx)  "suppress"
-			#-(or darwin macosx) "-fPIC"))
+(defvar *gcc-options*
+  #-(or darwin macosx)
+  (list "-shared" "-fPIC")
+  #+(or darwin macosx)
+  (append
+   (list "-dynamic"  "-bundle")
+   #+(or x86 x86-64)
+   (list "-arch" "x86_64" "-arch" "i386")
+   #-sbcl
+   (list "/usr/lib/bundle1.o" "-flat_namespace" "-undefined" "suppress")))
 
 ;;; Separate class so that we don't mess up other packages
 (defclass uffi-c-source-file (c-source-file) ())
@@ -63,13 +61,13 @@
     (error 'operation-error :component c :operation o)))
 
 (defsystem :linedit
-    :version "0.16.1"
+    :version "0.16.2"
     :depends-on (:uffi :terminfo :osicat)
     :components
   (;; Common
    (:file "packages")
-   (:file "utility-macros" :depends-on ("packages"))
    (:file "utility-functions" :depends-on ("packages"))
+   (:file "utility-macros" :depends-on ("packages" "utility-functions"))
    (:file "matcher" :depends-on ("packages"))
 
    ;; Backend
--- /project/linedit/cvsroot/src/packages.lisp	2004/04/25 14:43:02	1.18
+++ /project/linedit/cvsroot/src/packages.lisp	2010/03/11 21:58:04	1.19
@@ -19,18 +19,6 @@
 ;;;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;;;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;;;; Check requirements -- this might be best done in a separate file,
-;;;; or an asdf method.
-#.(cond 
-    ((stringp osicat:*osicat-version*) 
-     (error "This version of Linedit requires Osicat version 0.4.0 or later, 
-but current Osicat version is ~A." osicat:*osicat-version*))
-    ((consp osicat:*osicat-version*)
-     (unless (<= 4 (second osicat:*osicat-version*))
-       (error "This version of Linedit requires Osicat version 0.4.0 or later, 
-but current Osicat version is ~{~A~^.~}." osicat:*osicat-version*)))
-    (t (error "No Osicat version found.")))
-
 ;;;; Package
 
 (defpackage :linedit