--- gforth/lib.fs	2007/06/01 16:27:37	1.19
+++ gforth/lib.fs	2008/07/26 20:57:05	1.27
@@ -1,12 +1,12 @@
 \ lib.fs	shared library support package 		11may97py
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003,2005,2006 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2005,2006,2007,2008 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,13 +15,15 @@
 \ GNU General Public License for more details.
 
 \ You should have received a copy of the GNU General Public License
-\ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
-[IFDEF] av-call-int
+s" libavcall.so"     open-lib 0<>
+s" libcallback.so"   open-lib 0<> and [if]
+    .( including fflib.fs [ffcall] )
     include fflib.fs
 [ELSE]
-    [IFDEF] ffi-call
+    s" libffi.so" open-lib [if]
+        .( including libffi.fs )
 	include libffi.fs
     [ELSE]
         .( Neither libffi nor ffcall are available ) cr
@@ -39,8 +41,12 @@
 	    library libc libc.so.6
 	[ELSE] 2dup s" cygwin" str= [IF]  2drop
 		library libc cygwin1.dll
-	    [ELSE]  s" bsd" search nip nip [IF]
+	    [ELSE]  2dup s" bsd" search nip nip [IF]  2drop
 		    library libc libc.so
+		[ELSE]  2dup s" darwin" string-prefix? [IF]  2drop
+			library libc libc.dylib
+		    [ELSE]  2drop \ or add your stuff here
+		    [THEN]
 		[THEN]
 	    [THEN]
 	[THEN]