--- gforth/lib.fs	2005/12/31 15:46:09	1.15
+++ gforth/lib.fs	2008/07/15 16:11:49	1.26
@@ -1,12 +1,12 @@
 \ lib.fs	shared library support package 		11may97py
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003,2005 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,27 +15,50 @@
 \ 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" open-lib [if]
+        .( including libffi.fs )
 	include libffi.fs
     [ELSE]
+        .( Neither libffi nor ffcall are available ) cr
+        abort
+        .( Using oldlib.fs; incompatible with fflib.fs and libffi.fs) cr
 	include oldlib.fs
     [THEN]
 [THEN]
 
 \ testing stuff
 
+[IFUNDEF] libc
+    s" os-type" environment? [IF]
+	2dup s" linux-gnu" str= [IF]  2drop
+	    library libc libc.so.6
+	[ELSE] 2dup s" cygwin" str= [IF]  2drop
+		library libc cygwin1.dll
+	    [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]
+    [THEN]
+[THEN]
+
 [ifdef] testing
 
 library libc libc.so.6
                 
 libc sleep int (int) sleep
-libc open  int int ptr (int) open
+libc open  ptr int int (int) open
 libc lseek int llong int (llong) lseek64
 libc read  int ptr int (int) read
 libc close int (int) close