--- gforth/lib.fs	2005/11/20 23:15:42	1.11
+++ gforth/lib.fs	2008/08/14 09:53:13	1.35
@@ -1,12 +1,12 @@
 \ lib.fs	shared library support package 		11may97py
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003 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,51 @@
 \ 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
-    include fflib.fs
-[ELSE]
-    [IFDEF] ffi-call
-	include libffi.fs
-    [ELSE]
-	include oldlib.fs
-    [THEN]
-[THEN]
+libffi-present [if]
+    require ./libffi.fs
+[else]
+    ffcall-present [if]
+	require ./fflib.fs
+    [else]
+	.( Neither libffi nor ffcall are configured ) cr
+	.( If you have installed one of them, you can use libffi.fs or fflib.fs directly ) cr
+	.( Or you can just use the new, documented and better, but different, libcc.fs ) cr
+	abort
+    [then]
+[then]
 
 \ testing stuff
 
-[ifdef] testing
+\ [IFUNDEF] libc
+\     s" os-type" environment? [IF]
+\ 	2dup s" linux-gnu" str= [IF]  2drop
+\ 	    cell 8 = [IF]
+\ 		library libc /lib64/libc.so.6 
+\ 	    [ELSE]
+\ 		library libc /lib/libc.so.6
+\ 	    [THEN]
+\ 	[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]
+
+0 [if]
 
 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
@@ -61,7 +85,9 @@ callback 2:1 (int) int int callback;
     cr ." result " + .s cr ;
 ' cb-test 2:1 c_plus
 
-: test  c_plus av-start-int >r >r av-int-r av-int-r av-call-int ;
+fptr 2:1call int int (int)
+
+: test  c_plus 2:1call ;
 
 \ 3 4 test